X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=main.c;h=27b28afa7f5a12081ef7153b62837b59b7fd0aa7;hb=5c0d28e4ff9909059ac1247aa71f9b1e906fea3a;hp=32b08b9b9586f85b2ffb1a28c4a11b14d82b0ee6;hpb=2535072fd81839326621851b9052375d11d11de5;p=dmenu.git diff --git a/main.c b/main.c index 32b08b9..27b28af 100644 --- a/main.c +++ b/main.c @@ -11,6 +11,8 @@ #include #include #include +#include +#include #include #include #include @@ -24,14 +26,12 @@ struct Item { /* static */ -static char *title, text[4096]; +static char text[4096]; static int mx, my, mw, mh; static int ret = 0; static int nitem = 0; static unsigned int cmdw = 0; -static unsigned int tw = 0; -static unsigned int cw = 0; -static Bool done = False; +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; @@ -42,8 +42,7 @@ static Window root; static Window win; static void -calcoffsets() -{ +calcoffsets(void) { unsigned int tw, w; if(!curr) @@ -71,67 +70,51 @@ calcoffsets() } static void -drawmenu() -{ +drawmenu(void) { Item *i; dc.x = 0; dc.y = 0; dc.w = mw; dc.h = mh; - drawtext(NULL, False, False); + drawtext(NULL, dc.norm); /* print command */ - if(!title || text[0]) { - cmdw = cw; - if(cmdw && item) - dc.w = cmdw; - drawtext(text, False, False); - } - else { - cmdw = tw; + if(cmdw && item) dc.w = cmdw; - drawtext(title, False, False); - } - dc.x += dc.w; + drawtext(text[0] ? text : NULL, dc.norm); + dc.x += cmdw; if(curr) { dc.w = SPACE; - drawtext((curr && curr->left) ? "<" : NULL, False, False); + drawtext((curr && curr->left) ? "<" : NULL, dc.norm); dc.x += dc.w; /* determine maximum items */ for(i = curr; i != next; i=i->right) { - dc.border = False; dc.w = textw(i->text); if(dc.w > mw / 3) dc.w = mw / 3; - drawtext(i->text, sel == i, sel == i); + drawtext(i->text, (sel == i) ? dc.sel : dc.norm); dc.x += dc.w; } dc.x = mw - SPACE; dc.w = SPACE; - drawtext(next ? ">" : NULL, False, False); + drawtext(next ? ">" : NULL, dc.norm); } XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0); XFlush(dpy); } static void -input(char *pattern) -{ +match(char *pattern) { unsigned int plen; Item *i, *j; if(!pattern) return; - if(!title || *pattern) - cmdw = cw; - else - cmdw = tw; - plen = strlen(pattern); item = j = NULL; nitem = 0; @@ -165,8 +148,7 @@ input(char *pattern) } static void -kpress(XKeyEvent * e) -{ +kpress(XKeyEvent * e) { char buf[32]; int num, prev_nitem; unsigned int i, len; @@ -188,18 +170,16 @@ kpress(XKeyEvent * e) return; break; case XK_h: + case XK_H: ksym = XK_BackSpace; break; - case XK_U: case XK_u: + case XK_U: text[0] = 0; - input(text); + match(text); drawmenu(); return; break; - case XK_bracketleft: - ksym = XK_Escape; - break; } } switch(ksym) { @@ -216,7 +196,7 @@ kpress(XKeyEvent * e) if(!sel) return; strncpy(text, sel->text, sizeof(text)); - input(text); + match(text); break; case XK_Right: if(!(sel && sel->right)) @@ -228,29 +208,27 @@ kpress(XKeyEvent * e) } break; case XK_Return: - if(e->state & ShiftMask) { - if(text) - fprintf(stdout, "%s", text); - } + if((e->state & ShiftMask) && text) + fprintf(stdout, "%s", text); else if(sel) fprintf(stdout, "%s", sel->text); else if(text) fprintf(stdout, "%s", text); fflush(stdout); - done = True; + running = False; break; case XK_Escape: ret = 1; - done = True; + running = False; break; case XK_BackSpace: if((i = len)) { prev_nitem = nitem; do { text[--i] = 0; - input(text); + match(text); } while(i && nitem && prev_nitem == nitem); - input(text); + match(text); } break; default: @@ -260,15 +238,14 @@ kpress(XKeyEvent * e) strncat(text, buf, sizeof(text)); else strncpy(text, buf, sizeof(text)); - input(text); + match(text); } } drawmenu(); } static char * -readinput() -{ +readstdin(void) { static char *maxname = NULL; char *p, buf[1024]; unsigned int len = 0, max = 0; @@ -305,33 +282,42 @@ Display *dpy; DC dc = {0}; int -main(int argc, char *argv[]) -{ +main(int argc, char *argv[]) { + char *font = FONT; char *maxname; + char *normbg = NORMBGCOLOR; + char *normfg = NORMFGCOLOR; + char *selbg = SELBGCOLOR; + char *selfg = SELFGCOLOR; + fd_set rd; int i; + struct timeval timeout; + Item *itm; XEvent ev; XSetWindowAttributes wa; + timeout.tv_usec = 0; + timeout.tv_sec = 3; /* command line args */ - for(i = 1; i < argc; i++) { - if (argv[i][0] == '-') - switch (argv[i][1]) { - case 'v': - fputs("dmenu-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout); - exit(EXIT_SUCCESS); - break; - case 't': - if(++i < argc) { - title = argv[i]; - break; - } - default: - eprint("usage: dmenu [-v] [-t ]\n"); - break; - } + for(i = 1; i < argc; i++) + if(!strncmp(argv[i], "-font", 6)) + font = argv[++i]; + else if(!strncmp(argv[i], "-normbg", 8)) + normbg = argv[++i]; + else if(!strncmp(argv[i], "-normfg", 8)) + normfg = argv[++i]; + else if(!strncmp(argv[i], "-selbg", 7)) + selbg = argv[++i]; + else if(!strncmp(argv[i], "-selfg", 7)) + selfg = argv[++i]; + else if(!strncmp(argv[i], "-t", 3)) + timeout.tv_sec = atoi(argv[++i]); + else if(!strncmp(argv[i], "-v", 3)) { + fputs("dmenu-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout); + exit(EXIT_SUCCESS); + } else - eprint("usage: dmenu [-v] [-t <title>]\n"); - } + eprint("usage: dmenu [-font <name>] [-{norm,sel}{bg,fg} <color>] [-t <seconds>] [-v]\n", stdout); dpy = XOpenDisplay(0); if(!dpy) @@ -339,18 +325,27 @@ main(int argc, char *argv[]) screen = DefaultScreen(dpy); root = RootWindow(dpy, screen); - maxname = readinput(); - - /* grab as early as possible, but after reading all items!!! */ + /* Note, the select() construction allows to grab all keypresses as + * early as possible, to not loose them. But if there is no standard + * input supplied, we will make sure to exit after MAX_WAIT_STDIN + * seconds. This is convenience behavior for rapid typers. + */ while(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime) != GrabSuccess) usleep(1000); + FD_ZERO(&rd); + FD_SET(STDIN_FILENO, &rd); + if(select(ConnectionNumber(dpy) + 1, &rd, NULL, NULL, &timeout) < 1) + goto UninitializedEnd; + maxname = readstdin(); + /* style */ - dc.bg = getcolor(BGCOLOR); - dc.fg = getcolor(FGCOLOR); - dc.border = getcolor(BORDERCOLOR); - setfont(FONT); + dc.sel[ColBG] = getcolor(selbg); + dc.sel[ColFG] = getcolor(selfg); + dc.norm[ColBG] = getcolor(normbg); + dc.norm[ColFG] = getcolor(normfg); + setfont(font); wa.override_redirect = 1; wa.background_pixmap = ParentRelative; @@ -358,7 +353,7 @@ main(int argc, char *argv[]) mx = my = 0; mw = DisplayWidth(dpy, screen); - mh = dc.font.height + 4; + mh = dc.font.height + 2; win = XCreateWindow(dpy, root, mx, my, mw, mh, 0, DefaultDepth(dpy, screen), CopyFromParent, @@ -369,29 +364,24 @@ main(int argc, char *argv[]) /* pixmap */ dc.drawable = XCreatePixmap(dpy, root, mw, mh, DefaultDepth(dpy, screen)); dc.gc = XCreateGC(dpy, root, 0, 0); + XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter); if(maxname) - cw = textw(maxname); - if(cw > mw / 3) - cw = mw / 3; - - if(title) { - tw = textw(title); - if(tw > mw / 3) - tw = mw / 3; - } - - cmdw = title ? tw : cw; + cmdw = textw(maxname); + if(cmdw > mw / 3) + cmdw = mw / 3; text[0] = 0; - input(text); + match(text); XMapRaised(dpy, win); drawmenu(); XSync(dpy, False); /* main event loop */ - while(!done && !XNextEvent(dpy, &ev)) { + while(running && !XNextEvent(dpy, &ev)) { switch (ev.type) { + default: /* ignore all crap */ + break; case KeyPress: kpress(&ev.xkey); break; @@ -399,15 +389,24 @@ main(int argc, char *argv[]) if(ev.xexpose.count == 0) drawmenu(); break; - default: - break; } } - XUngrabKeyboard(dpy, CurrentTime); + while(allitems) { + itm = allitems->next; + free(allitems->text); + free(allitems); + allitems = itm; + } + if(dc.font.set) + XFreeFontSet(dpy, dc.font.set); + else + XFreeFont(dpy, dc.font.xfont); XFreePixmap(dpy, dc.drawable); XFreeGC(dpy, dc.gc); XDestroyWindow(dpy, win); +UninitializedEnd: + XUngrabKeyboard(dpy, CurrentTime); XCloseDisplay(dpy); return ret;