|
|
@@ -11,7 +11,6 @@
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <sys/select.h>
|
|
|
|
#include <sys/select.h>
|
|
|
|
#include <sys/time.h>
|
|
|
|
#include <sys/time.h>
|
|
|
|
#include <X11/cursorfont.h>
|
|
|
|
|
|
|
|
#include <X11/Xutil.h>
|
|
|
|
#include <X11/Xutil.h>
|
|
|
|
#include <X11/keysym.h>
|
|
|
|
#include <X11/keysym.h>
|
|
|
|
|
|
|
|
|
|
|
@@ -286,18 +285,24 @@ main(int argc, char *argv[]) {
|
|
|
|
timeout.tv_sec = 3;
|
|
|
|
timeout.tv_sec = 3;
|
|
|
|
/* command line args */
|
|
|
|
/* command line args */
|
|
|
|
for(i = 1; i < argc; i++)
|
|
|
|
for(i = 1; i < argc; i++)
|
|
|
|
if(!strncmp(argv[i], "-font", 6))
|
|
|
|
if(!strncmp(argv[i], "-font", 6)) {
|
|
|
|
font = argv[++i];
|
|
|
|
if(++i < argc) font = argv[i];
|
|
|
|
else if(!strncmp(argv[i], "-normbg", 8))
|
|
|
|
}
|
|
|
|
normbg = argv[++i];
|
|
|
|
else if(!strncmp(argv[i], "-normbg", 8)) {
|
|
|
|
else if(!strncmp(argv[i], "-normfg", 8))
|
|
|
|
if(++i < argc) normbg = argv[i];
|
|
|
|
normfg = argv[++i];
|
|
|
|
}
|
|
|
|
else if(!strncmp(argv[i], "-selbg", 7))
|
|
|
|
else if(!strncmp(argv[i], "-normfg", 8)) {
|
|
|
|
selbg = argv[++i];
|
|
|
|
if(++i < argc) normfg = argv[i];
|
|
|
|
else if(!strncmp(argv[i], "-selfg", 7))
|
|
|
|
}
|
|
|
|
selfg = argv[++i];
|
|
|
|
else if(!strncmp(argv[i], "-selbg", 7)) {
|
|
|
|
else if(!strncmp(argv[i], "-t", 3))
|
|
|
|
if(++i < argc) selbg = argv[i];
|
|
|
|
timeout.tv_sec = atoi(argv[++i]);
|
|
|
|
}
|
|
|
|
|
|
|
|
else if(!strncmp(argv[i], "-selfg", 7)) {
|
|
|
|
|
|
|
|
if(++i < argc) selfg = argv[i];
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else if(!strncmp(argv[i], "-t", 3)) {
|
|
|
|
|
|
|
|
if(++i < argc) timeout.tv_sec = atoi(argv[i]);
|
|
|
|
|
|
|
|
}
|
|
|
|
else if(!strncmp(argv[i], "-v", 3)) {
|
|
|
|
else if(!strncmp(argv[i], "-v", 3)) {
|
|
|
|
fputs("dmenu-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
|
|
|
|
fputs("dmenu-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
|
|
|
|
exit(EXIT_SUCCESS);
|
|
|
|
exit(EXIT_SUCCESS);
|
|
|
@@ -340,7 +345,6 @@ main(int argc, char *argv[]) {
|
|
|
|
DefaultDepth(dpy, screen), CopyFromParent,
|
|
|
|
DefaultDepth(dpy, screen), CopyFromParent,
|
|
|
|
DefaultVisual(dpy, screen),
|
|
|
|
DefaultVisual(dpy, screen),
|
|
|
|
CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
|
|
|
|
CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
|
|
|
|
XDefineCursor(dpy, win, XCreateFontCursor(dpy, XC_xterm));
|
|
|
|
|
|
|
|
/* pixmap */
|
|
|
|
/* pixmap */
|
|
|
|
dc.drawable = XCreatePixmap(dpy, root, mw, mh, DefaultDepth(dpy, screen));
|
|
|
|
dc.drawable = XCreatePixmap(dpy, root, mw, mh, DefaultDepth(dpy, screen));
|
|
|
|
dc.gc = XCreateGC(dpy, root, 0, 0);
|
|
|
|
dc.gc = XCreateGC(dpy, root, 0, 0);
|
|
|
|