X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=dmenu.c;h=2c1867ca714ce351d40c637806d6244935253ac0;hb=d77340ed53ab7b04e289569b00cb46bd6f3ec06b;hp=878bc9595785f7618be697d54033ccfad56d64b4;hpb=6c1d0e4d60b239e9533def6feaf8eb2138858c3e;p=dmenu.git diff --git a/dmenu.c b/dmenu.c index 878bc95..2c1867c 100644 --- a/dmenu.c +++ b/dmenu.c @@ -1,25 +1,14 @@ /* See LICENSE file for copyright and license details. */ #include #include -#include #include #include #include -#include #include #include #include #include -#ifdef XINERAMA -#include -#endif - -/* 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)) -#define IS_UTF8_1ST_CHAR(c) ((((c) & 0xc0) == 0xc0) || !((c) & 0x80)) +#include "dmenu.h" typedef struct Item Item; struct Item { @@ -35,46 +24,27 @@ static void calcoffsetsv(void); static char *cistrstr(const char *s, const char *sub); static void cleanup(void); static void dinput(void); -static void drawmenu(void); +static void drawitem(char *s, unsigned long col[ColLast]); static void drawmenuh(void); static void drawmenuv(void); -static Bool grabkeyboard(void); -static void kpress(XKeyEvent * e); -static void match(char *pattern); +static void match(void); static void readstdin(void); -static void run(void); -static void setup(Bool topbar); - -#include "config.h" -#include "draw.h" /* variables */ +static char **argp = NULL; static char *maxname = NULL; -static char *prompt = NULL; -static char text[4096]; -static int cmdw = 0; -static int promptw = 0; -static int ret = 0; +static unsigned int cmdw = 0; static unsigned int lines = 0; -static unsigned int numlockmask = 0; -static Bool running = True; static Item *allitems = NULL; /* first of all items */ static Item *item = NULL; /* first of pattern matching items */ static Item *sel = NULL; static Item *next = NULL; static Item *prev = NULL; static Item *curr = NULL; -static Window win; static int (*fstrncmp)(const char *, const char *, size_t) = strncmp; static char *(*fstrstr)(const char *, const char *) = strstr; static void (*calcoffsets)(void) = calcoffsetsh; -Display *dpy; -DC dc; -int screen; -unsigned int mw, mh; -Window parent; - void appenditem(Item *i, Item **list, Item **last) { if(!(*last)) @@ -88,15 +58,14 @@ appenditem(Item *i, Item **list, Item **last) { void calcoffsetsh(void) { - unsigned int w; + unsigned int w, x; - w = promptw + cmdw + (2 * spaceitem); - for(next = curr; next; next = next->right) - if((w += MIN(textw(next->text), mw / 3)) > mw) + w = promptw + cmdw + textw(&dc, "<") + textw(&dc, ">"); + for(x = w, next = curr; next; next = next->right) + if((x += MIN(textw(&dc, next->text), mw / 3)) > mw) break; - w = promptw + cmdw + (2 * spaceitem); - for(prev = curr; prev && prev->left; prev = prev->left) - if((w += MIN(textw(prev->left->text), mw / 3)) > mw) + for(x = w, prev = curr; prev && prev->left; prev = prev->left) + if((x += MIN(textw(&dc, prev->left->text), mw / 3)) > mw) break; } @@ -107,6 +76,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; } @@ -143,44 +113,52 @@ cleanup(void) { free(allitems); allitems = itm; } - drawcleanup(); + cleanupdraw(&dc); XDestroyWindow(dpy, win); XUngrabKeyboard(dpy, CurrentTime); + XCloseDisplay(dpy); } 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"); } void -drawmenu(void) { +drawbar(void) { dc.x = 0; dc.y = 0; dc.w = mw; dc.h = mh; - drawtext(NULL, dc.norm); + drawbox(&dc, normcol); + dc.h = dc.font.height + 2; + dc.y = topbar ? 0 : mh - dc.h; /* print prompt? */ if(prompt) { dc.w = promptw; - drawtext(prompt, dc.sel); + drawtext(&dc, prompt, selcol); dc.x += dc.w; } dc.w = mw - dc.x; /* print command */ if(cmdw && item && lines == 0) dc.w = cmdw; - drawtext(*text ? text : NULL, dc.norm); - if(curr) { - if(lines > 0) - drawmenuv(); - else - drawmenuh(); - } - XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0); - XFlush(dpy); + drawtext(&dc, text, normcol); + if(lines > 0) + drawmenuv(); + else if(curr) + drawmenuh(); + commitdraw(&dc, win); +} + +void +drawitem(char *s, unsigned long col[ColLast]) { + drawbox(&dc, col); + drawtext(&dc, s, col); } void @@ -188,49 +166,37 @@ drawmenuh(void) { Item *i; dc.x += cmdw; - dc.w = spaceitem; - drawtext(curr->left ? "<" : NULL, dc.norm); + dc.w = textw(&dc, "<"); + drawtext(&dc, curr->left ? "<" : NULL, normcol); dc.x += dc.w; - for(i = curr; i != next; i=i->right) { - dc.w = MIN(textw(i->text), mw / 3); - drawtext(i->text, (sel == i) ? dc.sel : dc.norm); + for(i = curr; i != next; i = i->right) { + dc.w = MIN(textw(&dc, i->text), mw / 3); + drawitem(i->text, (sel == i) ? selcol : normcol); dc.x += dc.w; } - dc.w = spaceitem; + dc.w = textw(&dc, ">"); dc.x = mw - dc.w; - drawtext(next ? ">" : NULL, dc.norm); + drawtext(&dc, next ? ">" : NULL, normcol); } 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(i->text, (sel == i) ? dc.sel : dc.norm); + for(i = curr; i != next; i = i->right) { + drawitem(i->text, (sel == i) ? selcol : normcol); dc.y += dc.h; } - dc.h = mh - dc.y; - drawtext(NULL, dc.norm); -} - -Bool -grabkeyboard(void) { - unsigned int len; - - for(len = 1000; len; len--) { - if(XGrabKeyboard(dpy, parent, True, GrabModeAsync, GrabModeAsync, CurrentTime) - == GrabSuccess) - break; - usleep(1000); - } - return len > 0; + if(!XGetWindowAttributes(dpy, win, &wa)) + eprint("cannot get window attributes"); + XMoveResizeWindow(dpy, win, wa.x, wa.y + (topbar ? 0 : wa.height - mh), mw, mh); } void -kpress(XKeyEvent * e) { +kpress(XKeyEvent *e) { char buf[sizeof text]; int num; unsigned int i, len; @@ -273,6 +239,7 @@ kpress(XKeyEvent * e) { ksym = XK_Tab; break; case XK_j: + case XK_m: ksym = XK_Return; break; case XK_n: @@ -283,7 +250,7 @@ kpress(XKeyEvent * e) { break; case XK_u: text[0] = '\0'; - match(text); + match(); break; case XK_w: if(len == 0) @@ -292,10 +259,7 @@ kpress(XKeyEvent * e) { while(i-- > 0 && text[i] == ' '); while(i-- > 0 && text[i] != ' '); text[++i] = '\0'; - match(text); - break; - case XK_x: - dinput(); + match(); break; } } @@ -305,7 +269,7 @@ kpress(XKeyEvent * e) { if(num && !iscntrl((int) buf[0])) { memcpy(text + len, buf, num + 1); len += num; - match(text); + match(); } break; case XK_BackSpace: @@ -314,7 +278,7 @@ kpress(XKeyEvent * e) { for(i = 1; len - i > 0 && !IS_UTF8_1ST_CHAR(text[len - i]); i++); len -= i; text[len] = '\0'; - match(text); + match(); break; case XK_End: while(next) { @@ -325,9 +289,7 @@ kpress(XKeyEvent * e) { sel = sel->right; break; case XK_Escape: - ret = 1; - running = False; - return; + exit(EXIT_FAILURE); case XK_Home: sel = curr = item; calcoffsets(); @@ -355,13 +317,11 @@ 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; + exit(EXIT_SUCCESS); case XK_Right: case XK_Down: if(!sel || !sel->right) @@ -378,24 +338,22 @@ kpress(XKeyEvent * e) { dinput(); break; } - drawmenu(); + drawbar(); } void -match(char *pattern) { - unsigned int plen; +match(void) { + unsigned int len; Item *i, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend; - if(!pattern) - return; - plen = strlen(pattern); + len = strlen(text); item = lexact = lprefix = lsubstr = itemend = exactend = prefixend = substrend = NULL; for(i = allitems; i; i = i->next) - if(!fstrncmp(pattern, i->text, plen + 1)) + if(!fstrncmp(text, i->text, len + 1)) appenditem(i, &lexact, &exactend); - else if(!fstrncmp(pattern, i->text, plen)) + else if(!fstrncmp(text, i->text, len)) appenditem(i, &lprefix, &prefixend); - else if(fstrstr(i->text, pattern)) + else if(fstrstr(i->text, text)) appenditem(i, &lsubstr, &substrend); if(lexact) { item = lexact; @@ -449,105 +407,12 @@ readstdin(void) { } } -void -run(void) { - XEvent ev; - - /* main event loop */ - while(running && !XNextEvent(dpy, &ev)) - switch (ev.type) { - case KeyPress: - kpress(&ev.xkey); - break; - case Expose: - if(ev.xexpose.count == 0) - drawmenu(); - break; - case VisibilityNotify: - if (ev.xvisibility.state != VisibilityUnobscured) - XRaiseWindow(dpy, win); - break; - } -} - -void -setup(Bool topbar) { - int i, j, x, y; -#if XINERAMA - int n; - XineramaScreenInfo *info = NULL; -#endif - XModifierKeymap *modmap; - XSetWindowAttributes wa; - XWindowAttributes pwa; - - /* init modifier map */ - modmap = XGetModifierMapping(dpy); - for(i = 0; i < 8; i++) - for(j = 0; j < modmap->max_keypermod; j++) { - if(modmap->modifiermap[i * modmap->max_keypermod + j] - == XKeysymToKeycode(dpy, XK_Num_Lock)) - numlockmask = (1 << i); - } - XFreeModifiermap(modmap); - - initfont(font); - - /* menu window */ - wa.override_redirect = True; - wa.background_pixmap = ParentRelative; - wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask | VisibilityChangeMask; - - /* menu window geometry */ - mh = (dc.font.height + 2) * (lines + 1); -#if XINERAMA - if(parent == RootWindow(dpy, screen) && 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)) - 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; - } - x = info[i].x_org; - y = topbar ? info[i].y_org : info[i].y_org + info[i].height - mh; - mw = info[i].width; - XFree(info); - } - else -#endif - { - XGetWindowAttributes(dpy, parent, &pwa); - x = 0; - y = topbar ? 0 : pwa.height - mh; - mw = pwa.width; - } - - win = XCreateWindow(dpy, parent, x, y, mw, mh, 0, - DefaultDepth(dpy, screen), CopyFromParent, - DefaultVisual(dpy, screen), - CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa); - - drawsetup(); - if(maxname) - cmdw = MIN(textw(maxname), mw / 3); - if(prompt) - promptw = MIN(textw(prompt), mw / 5); - text[0] = '\0'; - match(text); - XMapRaised(dpy, win); -} - 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; @@ -555,9 +420,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) @@ -581,27 +443,33 @@ 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"); + if(atexit(&cleanup) != 0) + eprint("cannot register cleanup\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); - drawmenu(); - XSync(dpy, False); + grabkeyboard(); + setup(lines); + if(maxname) + cmdw = MIN(textw(&dc, maxname), mw / 3); + match(); run(); - cleanup(); - XCloseDisplay(dpy); - return ret; + return 0; }