X-Git-Url: https://git.xinqibao.xyz/dmenu.git/blobdiff_plain/2535072fd81839326621851b9052375d11d11de5..49ce444d3228ef00f1ad3b2deab9e133b3495b6b:/main.c?ds=inline diff --git a/main.c b/main.c index 32b08b9..51fa20f 100644 --- a/main.c +++ b/main.c @@ -24,14 +24,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; @@ -79,47 +77,38 @@ drawmenu() 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; @@ -127,11 +116,6 @@ input(char *pattern) if(!pattern) return; - if(!title || *pattern) - cmdw = cw; - else - cmdw = tw; - plen = strlen(pattern); item = j = NULL; nitem = 0; @@ -188,18 +172,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 +198,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)) @@ -237,20 +219,20 @@ kpress(XKeyEvent * e) 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,14 +242,14 @@ kpress(XKeyEvent * e) strncat(text, buf, sizeof(text)); else strncpy(text, buf, sizeof(text)); - input(text); + match(text); } } drawmenu(); } static char * -readinput() +readstdin() { static char *maxname = NULL; char *p, buf[1024]; @@ -308,30 +290,16 @@ int main(int argc, char *argv[]) { char *maxname; - int i; + Item *i; XEvent ev; XSetWindowAttributes wa; - /* 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; - } - else - eprint("usage: dmenu [-v] [-t <title>]\n"); + if(argc == 2 && !strncmp("-v", argv[1], 3)) { + fputs("dmenu-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout); + exit(EXIT_SUCCESS); } + else if(argc != 1) + eprint("usage: dmenu [-v]\n"); dpy = XOpenDisplay(0); if(!dpy) @@ -339,7 +307,7 @@ main(int argc, char *argv[]) screen = DefaultScreen(dpy); root = RootWindow(dpy, screen); - maxname = readinput(); + maxname = readstdin(); /* grab as early as possible, but after reading all items!!! */ while(XGrabKeyboard(dpy, root, True, GrabModeAsync, @@ -347,9 +315,10 @@ main(int argc, char *argv[]) usleep(1000); /* style */ - dc.bg = getcolor(BGCOLOR); - dc.fg = getcolor(FGCOLOR); - dc.border = getcolor(BORDERCOLOR); + dc.sel[ColBG] = getcolor(SELBGCOLOR); + dc.sel[ColFG] = getcolor(SELFGCOLOR); + dc.norm[ColBG] = getcolor(NORMBGCOLOR); + dc.norm[ColFG] = getcolor(NORMFGCOLOR); setfont(FONT); wa.override_redirect = 1; @@ -358,7 +327,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,28 +338,21 @@ 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) { case KeyPress: kpress(&ev.xkey); @@ -405,6 +367,16 @@ main(int argc, char *argv[]) } XUngrabKeyboard(dpy, CurrentTime); + while(allitems) { + i = allitems->next; + free(allitems->text); + free(allitems); + allitems = i; + } + 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);