X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=main.c;h=69214dd5e7c54434edb0056360add8377f9b9b68;hb=0e96ae6f4842b4ef4c79eaea821658e24bc03d5e;hp=6ca043d685441b46f5ff1de4d12b33d8f2683d79;hpb=04eade6a767a4145388585f666c6d1628285e96d;p=dmenu.git diff --git a/main.c b/main.c index 6ca043d..69214dd 100644 --- a/main.c +++ b/main.c @@ -1,17 +1,17 @@ -/* - * (C)opyright MMVI Anselm R. Garbe +/* (C)opyright MMVI Anselm R. Garbe * (C)opyright MMVI Sander van Dijk * See LICENSE file for license details. */ - #include "dmenu.h" #include +#include #include #include #include #include -#include +#include +#include #include #include @@ -25,10 +25,12 @@ struct Item { /* static */ static char text[4096]; +static char *prompt = NULL; static int mx, my, mw, mh; static int ret = 0; static int nitem = 0; static unsigned int cmdw = 0; +static unsigned int promptw = 0; static Bool running = True; static Item *allitems = NULL; /* first of all items */ static Item *item = NULL; /* first of pattern matching items */ @@ -40,14 +42,12 @@ static Window root; static Window win; static void -calcoffsets() -{ +calcoffsets(void) { unsigned int tw, w; if(!curr) return; - - w = cmdw + 2 * SPACE; + w = promptw + cmdw + 2 * SPACE; for(next = curr; next; next=next->right) { tw = textw(next->text); if(tw > mw / 3) @@ -56,8 +56,7 @@ calcoffsets() if(w > mw) break; } - - w = cmdw + 2 * SPACE; + w = promptw + cmdw + 2 * SPACE; for(prev = curr; prev && prev->left; prev=prev->left) { tw = textw(prev->left->text); if(tw > mw / 3) @@ -69,8 +68,7 @@ calcoffsets() } static void -drawmenu() -{ +drawmenu(void) { Item *i; dc.x = 0; @@ -78,18 +76,22 @@ drawmenu() dc.w = mw; dc.h = mh; drawtext(NULL, dc.norm); - + /* print prompt? */ + if(promptw) { + dc.w = promptw; + drawtext(prompt, dc.sel); + } + dc.x += promptw; + dc.w = mw - promptw; /* print command */ if(cmdw && item) dc.w = cmdw; drawtext(text[0] ? text : NULL, dc.norm); dc.x += cmdw; - if(curr) { dc.w = SPACE; drawtext((curr && curr->left) ? "<" : NULL, dc.norm); dc.x += dc.w; - /* determine maximum items */ for(i = curr; i != next; i=i->right) { dc.w = textw(i->text); @@ -98,7 +100,6 @@ drawmenu() drawtext(i->text, (sel == i) ? dc.sel : dc.norm); dc.x += dc.w; } - dc.x = mw - SPACE; dc.w = SPACE; drawtext(next ? ">" : NULL, dc.norm); @@ -108,18 +109,15 @@ drawmenu() } static void -match(char *pattern) -{ +match(char *pattern) { unsigned int plen; Item *i, *j; if(!pattern) return; - plen = strlen(pattern); item = j = NULL; nitem = 0; - for(i = allitems; i; i=i->next) if(!plen || !strncmp(pattern, i->text, plen)) { if(!j) @@ -143,14 +141,12 @@ match(char *pattern) j = i; nitem++; } - curr = prev = next = sel = item; calcoffsets(); } static void -kpress(XKeyEvent * e) -{ +kpress(XKeyEvent * e) { char buf[32]; int num, prev_nitem; unsigned int i, len; @@ -158,13 +154,11 @@ kpress(XKeyEvent * e) len = strlen(text); buf[0] = 0; - num = XLookupString(e, buf, sizeof(buf), &ksym, 0); - + num = XLookupString(e, buf, sizeof buf, &ksym, 0); if(IsFunctionKey(ksym) || IsKeypadKey(ksym) || IsMiscFunctionKey(ksym) || IsPFKey(ksym) || IsPrivateKeypadKey(ksym)) return; - /* first check if a control mask is omitted */ if(e->state & ControlMask) { switch (ksym) { @@ -184,7 +178,70 @@ kpress(XKeyEvent * e) break; } } + if(e->state & Mod1Mask) { + switch(ksym) { + default: return; + case XK_h: + ksym = XK_Left; + break; + case XK_l: + ksym = XK_Right; + break; + case XK_j: + ksym = XK_Next; + break; + case XK_k: + ksym = XK_Prior; + break; + case XK_g: + ksym = XK_Home; + break; + case XK_G: + ksym = XK_End; + break; + } + } switch(ksym) { + default: + if(num && !iscntrl((int) buf[0])) { + buf[num] = 0; + if(len > 0) + strncat(text, buf, sizeof text); + else + strncpy(text, buf, sizeof text); + match(text); + } + break; + case XK_BackSpace: + if((i = len)) { + prev_nitem = nitem; + do { + text[--i] = 0; + match(text); + } while(i && nitem && prev_nitem == nitem); + match(text); + } + break; + case XK_End: + if(!item) + return; + while(next) { + sel = curr = next; + calcoffsets(); + } + while(sel && sel->right) + sel = sel->right; + break; + case XK_Escape: + ret = 1; + running = False; + break; + case XK_Home: + if(!item) + return; + sel = curr = item; + calcoffsets(); + break; case XK_Left: if(!(sel && sel->left)) return; @@ -194,26 +251,21 @@ kpress(XKeyEvent * e) calcoffsets(); } break; - case XK_Tab: - if(!sel) + case XK_Next: + if(!next) return; - strncpy(text, sel->text, sizeof(text)); - match(text); + sel = curr = next; + calcoffsets(); break; - case XK_Right: - if(!(sel && sel->right)) + case XK_Prior: + if(!prev) return; - sel=sel->right; - if(sel == next) { - curr = next; - calcoffsets(); - } + sel = curr = prev; + calcoffsets(); 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) @@ -221,43 +273,34 @@ kpress(XKeyEvent * e) fflush(stdout); running = False; break; - case XK_Escape: - ret = 1; - running = False; - break; - case XK_BackSpace: - if((i = len)) { - prev_nitem = nitem; - do { - text[--i] = 0; - match(text); - } while(i && nitem && prev_nitem == nitem); - match(text); + case XK_Right: + if(!(sel && sel->right)) + return; + sel=sel->right; + if(sel == next) { + curr = next; + calcoffsets(); } break; - default: - if(num && !iscntrl((int) buf[0])) { - buf[num] = 0; - if(len > 0) - strncat(text, buf, sizeof(text)); - else - strncpy(text, buf, sizeof(text)); - match(text); - } + case XK_Tab: + if(!sel) + return; + strncpy(text, sel->text, sizeof text); + match(text); + break; } drawmenu(); } static char * -readstdin() -{ +readstdin(void) { static char *maxname = NULL; char *p, buf[1024]; unsigned int len = 0, max = 0; Item *i, *new; i = 0; - while(fgets(buf, sizeof(buf), stdin)) { + while(fgets(buf, sizeof buf, stdin)) { len = strlen(buf); if (buf[len - 1] == '\n') buf[len - 1] = 0; @@ -266,7 +309,6 @@ readstdin() maxname = p; max = len; } - new = emalloc(sizeof(Item)); new->next = new->left = new->right = NULL; new->text = p; @@ -287,64 +329,107 @@ Display *dpy; DC dc = {0}; int -main(int argc, char *argv[]) -{ +main(int argc, char *argv[]) { + Bool bottom = False; + char *font = FONT; char *maxname; - Item *i; + 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; - 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"); - + timeout.tv_usec = 0; + timeout.tv_sec = 3; + /* command line args */ + for(i = 1; i < argc; i++) + if(!strncmp(argv[i], "-b", 3)) { + bottom = True; + } + else if(!strncmp(argv[i], "-fn", 4)) { + if(++i < argc) font = argv[i]; + } + else if(!strncmp(argv[i], "-nb", 4)) { + if(++i < argc) normbg = argv[i]; + } + else if(!strncmp(argv[i], "-nf", 4)) { + if(++i < argc) normfg = argv[i]; + } + else if(!strncmp(argv[i], "-p", 3)) { + if(++i < argc) prompt = argv[i]; + } + else if(!strncmp(argv[i], "-sb", 4)) { + if(++i < argc) selbg = argv[i]; + } + else if(!strncmp(argv[i], "-sf", 4)) { + 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)) { + fputs("dmenu-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout); + exit(EXIT_SUCCESS); + } + else + eprint("usage: dmenu [-b] [-fn ] [-nb ] [-nf ] [-p ]\n" + " [-sb ] [-sf ] [-t ] [-v]\n", stdout); + setlocale(LC_CTYPE, ""); dpy = XOpenDisplay(0); if(!dpy) eprint("dmenu: cannot open display\n"); screen = DefaultScreen(dpy); root = RootWindow(dpy, screen); - maxname = readstdin(); - - /* 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.sel[ColBG] = getcolor(SELBGCOLOR); - dc.sel[ColFG] = getcolor(SELFGCOLOR); - dc.norm[ColBG] = getcolor(NORMBGCOLOR); - dc.norm[ColFG] = getcolor(NORMFGCOLOR); - setfont(FONT); - + dc.norm[ColBG] = getcolor(normbg); + dc.norm[ColFG] = getcolor(normfg); + dc.sel[ColBG] = getcolor(selbg); + dc.sel[ColFG] = getcolor(selfg); + setfont(font); + /* menu window */ wa.override_redirect = 1; wa.background_pixmap = ParentRelative; wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask; - mx = my = 0; mw = DisplayWidth(dpy, screen); mh = dc.font.height + 2; - + if(bottom) + my += DisplayHeight(dpy, screen) - mh; win = XCreateWindow(dpy, root, mx, my, mw, mh, 0, DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen), CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa); - XDefineCursor(dpy, win, XCreateFontCursor(dpy, XC_xterm)); - /* 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) cmdw = textw(maxname); if(cmdw > mw / 3) cmdw = mw / 3; - + if(prompt) + promptw = textw(prompt); + if(promptw > mw / 5) + promptw = mw / 5; text[0] = 0; match(text); XMapRaised(dpy, win); @@ -352,7 +437,7 @@ main(int argc, char *argv[]) XSync(dpy, False); /* main event loop */ - while(running && !XNextEvent(dpy, &ev)) { + while(running && !XNextEvent(dpy, &ev)) switch (ev.type) { default: /* ignore all crap */ break; @@ -364,14 +449,13 @@ main(int argc, char *argv[]) drawmenu(); break; } - } - XUngrabKeyboard(dpy, CurrentTime); + /* cleanup */ while(allitems) { - i = allitems->next; + itm = allitems->next; free(allitems->text); free(allitems); - allitems = i; + allitems = itm; } if(dc.font.set) XFreeFontSet(dpy, dc.font.set); @@ -380,7 +464,8 @@ main(int argc, char *argv[]) XFreePixmap(dpy, dc.drawable); XFreeGC(dpy, dc.gc); XDestroyWindow(dpy, win); +UninitializedEnd: + XUngrabKeyboard(dpy, CurrentTime); XCloseDisplay(dpy); - return ret; }