X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;ds=inline;f=dmenu.c;h=680b4e705767e2834f0a17ca974b4f2f9e4375d8;hb=6ba5103df4552a330ba29fdac88ae3a2897b94cf;hp=8059f296c4c760836024f7433a947c666a603b16;hpb=18dcf738967a45208e880b72ce273afdd93ee6c7;p=dmenu.git diff --git a/dmenu.c b/dmenu.c index 8059f29..680b4e7 100644 --- a/dmenu.c +++ b/dmenu.c @@ -1,11 +1,9 @@ /* See LICENSE file for copyright and license details. */ #include #include -#include #include #include #include -#include #include #include #include @@ -13,9 +11,9 @@ #ifdef XINERAMA #include #endif +#include /* macros */ -#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask)) #define INRECT(X,Y,RX,RY,RW,RH) ((X) >= (RX) && (X) < (RX) + (RW) && (Y) >= (RY) && (Y) < (RY) + (RH)) #define MIN(a, b) ((a) < (b) ? (a) : (b)) #define MAX(a, b) ((a) > (b) ? (a) : (b)) @@ -43,12 +41,12 @@ static void kpress(XKeyEvent *e); static void match(char *pattern); static void readstdin(void); static void run(void); -static void setup(Bool topbar); +static void setup(void); #include "config.h" -#include "draw.h" /* variables */ +static char **argp = NULL; static char *maxname = NULL; static char *prompt = NULL; static char text[4096]; @@ -62,6 +60,7 @@ static unsigned int mw, mh; static unsigned long normcol[ColLast]; static unsigned long selcol[ColLast]; static Bool running = True; +static Bool topbar = True; static DC dc; static Display *dpy; static Item *allitems = NULL; /* first of all items */ @@ -70,7 +69,7 @@ static Item *sel = NULL; static Item *next = NULL; static Item *prev = NULL; static Item *curr = NULL; -static Window win, parent; +static Window win, root; static int (*fstrncmp)(const char *, const char *, size_t) = strncmp; static char *(*fstrstr)(const char *, const char *) = strstr; static void (*calcoffsets)(void) = calcoffsetsh; @@ -107,6 +106,7 @@ calcoffsetsv(void) { next = prev = curr; for(i = 0; i < lines && next; i++) next = next->right; + mh = (dc.font.height + 2) * (i + 1); for(i = 0; i < lines && prev && prev->left; i++) prev = prev->left; } @@ -151,7 +151,9 @@ cleanup(void) { void dinput(void) { cleanup(); - execlp("dinput", "dinput", text, NULL); /* todo: argv */ + argp[0] = "dinput"; + argp[1] = text; + execvp("dinput", argp); eprint("cannot exec dinput\n"); } @@ -162,6 +164,8 @@ drawmenu(void) { dc.w = mw; dc.h = mh; drawtext(&dc, NULL, normcol, False); + dc.h = dc.font.height + 2; + dc.y = topbar ? 0 : mh - dc.h; /* print prompt? */ if(prompt) { dc.w = promptw; @@ -173,12 +177,10 @@ drawmenu(void) { if(cmdw && item && lines == 0) dc.w = cmdw; drawtext(&dc, *text ? text : NULL, normcol, False); - if(curr) { - if(lines > 0) - drawmenuv(); - else - drawmenuh(); - } + if(lines > 0) + drawmenuv(); + else if(curr) + drawmenuh(); XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0); XFlush(dpy); } @@ -204,16 +206,17 @@ drawmenuh(void) { void drawmenuv(void) { Item *i; + XWindowAttributes wa; + dc.y = topbar ? dc.h : 0; dc.w = mw - dc.x; - dc.h = dc.font.height + 2; - dc.y = dc.h; for(i = curr; i != next; i = i->right) { drawtext(&dc, i->text, (sel == i) ? selcol : normcol, False); dc.y += dc.h; } - dc.h = mh - dc.y; - drawtext(&dc, NULL, normcol, False); + if(!XGetWindowAttributes(dpy, win, &wa)) + eprint("cannot get window attributes"); + XMoveResizeWindow(dpy, win, wa.x, wa.y + (topbar ? 0 : wa.height - mh), mw, mh); } Bool @@ -221,7 +224,7 @@ grabkeyboard(void) { unsigned int len; for(len = 1000; len; len--) { - if(XGrabKeyboard(dpy, parent, True, GrabModeAsync, GrabModeAsync, CurrentTime) + if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime) == GrabSuccess) break; usleep(1000); @@ -295,9 +298,6 @@ kpress(XKeyEvent *e) { text[++i] = '\0'; match(text); break; - case XK_x: - dinput(); - break; } } switch(ksym) { @@ -356,10 +356,9 @@ kpress(XKeyEvent *e) { calcoffsets(); break; case XK_Return: - if((e->state & ShiftMask) || !sel) - fprintf(stdout, "%s", text); - else - fprintf(stdout, "%s", sel->text); + if(e->state & ShiftMask) + dinput(); + fprintf(stdout, "%s", sel ? sel->text : text); fflush(stdout); running = False; return; @@ -472,7 +471,7 @@ run(void) { } void -setup(Bool topbar) { +setup(void) { int i, j, x, y; #if XINERAMA int n; @@ -480,7 +479,6 @@ setup(Bool topbar) { #endif XModifierKeymap *modmap; XSetWindowAttributes wa; - XWindowAttributes pwa; /* init modifier map */ modmap = XGetModifierMapping(dpy); @@ -507,13 +505,13 @@ setup(Bool topbar) { /* menu window geometry */ mh = (dc.font.height + 2) * (lines + 1); #if XINERAMA - if(parent == RootWindow(dpy, screen) && XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) { + if(XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) { i = 0; if(n > 1) { int di; unsigned int dui; Window dummy; - if(XQueryPointer(dpy, parent, &dummy, &dummy, &x, &y, &di, &di, &dui)) + if(XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui)) for(i = 0; i < n; i++) if(INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height)) break; @@ -526,13 +524,12 @@ setup(Bool topbar) { else #endif { - XGetWindowAttributes(dpy, parent, &pwa); x = 0; - y = topbar ? 0 : pwa.height - mh; - mw = pwa.width; + y = topbar ? 0 : mh - DisplayHeight(dpy, screen); + mw = DisplayWidth(dpy, screen); } - win = XCreateWindow(dpy, parent, x, y, mw, mh, 0, + win = XCreateWindow(dpy, root, x, y, mw, mh, 0, DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen), CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa); @@ -550,10 +547,9 @@ setup(Bool topbar) { int main(int argc, char *argv[]) { unsigned int i; - Bool topbar = True; /* command line args */ - progname = argv[0]; + progname = "dmenu"; for(i = 1; i < argc; i++) if(!strcmp(argv[i], "-i")) { fstrncmp = strncasecmp; @@ -561,9 +557,6 @@ main(int argc, char *argv[]) { } else if(!strcmp(argv[i], "-b")) topbar = False; - else if(!strcmp(argv[i], "-e")) { - if(++i < argc) parent = atoi(argv[i]); - } else if(!strcmp(argv[i], "-l")) { if(++i < argc) lines = atoi(argv[i]); if(lines > 0) @@ -587,23 +580,29 @@ main(int argc, char *argv[]) { else if(!strcmp(argv[i], "-sf")) { if(++i < argc) selfgcolor = argv[i]; } - else if(!strcmp(argv[i], "-v")) - eprint("dmenu-"VERSION", © 2006-2010 dmenu engineers, see LICENSE for details\n"); - else - eprint("usage: dmenu [-i] [-b] [-e ] [-l ] [-fn ] [-nb ]\n" - " [-nf ] [-p ] [-sb ] [-sf ] [-v]\n"); + else if(!strcmp(argv[i], "-v")) { + printf("dmenu-"VERSION", © 2006-2010 dmenu engineers, see LICENSE for details\n"); + exit(EXIT_SUCCESS); + } + else { + fputs("usage: dmenu [-i] [-b] [-l ] [-fn ] [-nb ]\n" + " [-nf ] [-p ] [-sb ] [-sf ] [-v]\n", stderr); + exit(EXIT_FAILURE); + } if(!setlocale(LC_CTYPE, "") || !XSupportsLocale()) fprintf(stderr, "dmenu: warning: no locale support\n"); if(!(dpy = XOpenDisplay(NULL))) eprint("cannot open display\n"); screen = DefaultScreen(dpy); - if(!parent) - parent = RootWindow(dpy, screen); + root = RootWindow(dpy, screen); + if(!(argp = malloc(sizeof *argp * (argc+2)))) + eprint("cannot malloc %u bytes\n", sizeof *argp * (argc+2)); + memcpy(argp + 2, argv + 1, sizeof *argp * argc); readstdin(); running = grabkeyboard(); - setup(topbar); + setup(); drawmenu(); XSync(dpy, False); run();