X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=main.c;h=224d298ff002e7c87b6fbbd2bdc8d4e070e7c058;hb=2bac5599b3e7629875d692b65a336915ecfee49d;hp=0263948964f5afc6a7986305917dea016ddb2dd1;hpb=4bd34662153f0b2cabac485d01ac2e1300c254c1;p=dmenu.git diff --git a/main.c b/main.c index 0263948..224d298 100644 --- a/main.c +++ b/main.c @@ -1,5 +1,5 @@ -/* (C)opyright MMVI Anselm R. Garbe - * (C)opyright MMVI Sander van Dijk +/* (C)opyright MMVI-MMVII Anselm R. Garbe + * (C)opyright MMVI-MMVII Sander van Dijk * See LICENSE file for license details. */ #include "dmenu.h" @@ -15,6 +15,8 @@ #include #include +#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask)) + typedef struct Item Item; struct Item { Item *next; /* traverses all items */ @@ -25,10 +27,13 @@ struct Item { /* static */ static char text[4096]; -static int mx, my, mw, mh; +static char *prompt = NULL; +static int mw, mh; static int ret = 0; static int nitem = 0; static unsigned int cmdw = 0; +static unsigned int promptw = 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 */ @@ -45,7 +50,7 @@ calcoffsets(void) { 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) @@ -54,7 +59,7 @@ calcoffsets(void) { 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) @@ -74,6 +79,13 @@ drawmenu(void) { 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; @@ -155,17 +167,49 @@ kpress(XKeyEvent * e) { switch (ksym) { default: /* ignore other control sequences */ return; + case XK_bracketleft: + ksym = XK_Escape; break; case XK_h: case XK_H: ksym = XK_BackSpace; break; + case XK_i: + case XK_I: + ksym = XK_Tab; + break; + case XK_j: + case XK_J: + ksym = XK_Return; + break; case XK_u: case XK_U: text[0] = 0; match(text); drawmenu(); return; + } + } + if(CLEANMASK(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; } } @@ -191,11 +235,13 @@ kpress(XKeyEvent * e) { } break; case XK_End: + if(!item) + return; while(next) { sel = curr = next; calcoffsets(); } - while(sel->right) + while(sel && sel->right) sel = sel->right; break; case XK_Escape: @@ -203,6 +249,8 @@ kpress(XKeyEvent * e) { running = False; break; case XK_Home: + if(!item) + return; sel = curr = item; calcoffsets(); break; @@ -216,16 +264,16 @@ kpress(XKeyEvent * e) { } break; case XK_Next: - if(next) { - sel = curr = next; - calcoffsets(); - } + if(!next) + return; + sel = curr = next; + calcoffsets(); break; case XK_Prior: - if(prev) { - sel = curr = prev; - calcoffsets(); - } + if(!prev) + return; + sel = curr = prev; + calcoffsets(); break; case XK_Return: if((e->state & ShiftMask) && text) @@ -301,40 +349,45 @@ main(int argc, char *argv[]) { char *selbg = SELBGCOLOR; char *selfg = SELFGCOLOR; fd_set rd; - int i; + int i, j; struct timeval timeout; Item *itm; XEvent ev; + XModifierKeymap *modmap; XSetWindowAttributes wa; timeout.tv_usec = 0; timeout.tv_sec = 3; /* command line args */ for(i = 1; i < argc; i++) - if(!strncmp(argv[i], "-font", 6)) { + if(!strncmp(argv[i], "-fn", 4)) { if(++i < argc) font = argv[i]; } - else if(!strncmp(argv[i], "-normbg", 8)) { + else if(!strncmp(argv[i], "-nb", 4)) { if(++i < argc) normbg = argv[i]; } - else if(!strncmp(argv[i], "-normfg", 8)) { + else if(!strncmp(argv[i], "-nf", 4)) { if(++i < argc) normfg = argv[i]; } - else if(!strncmp(argv[i], "-selbg", 7)) { + 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], "-selfg", 7)) { + 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); + fputs("dmenu-"VERSION", (C)opyright MMVI-MMVII Anselm R. Garbe\n", stdout); exit(EXIT_SUCCESS); } else - eprint("usage: dmenu [-font ] [-{norm,sel}{bg,fg} ] [-t ] [-v]\n", stdout); + eprint("usage: dmenu [-fn ] [-nb ] [-nf ] [-p ]\n" + " [-sb ] [-sf ] [-t ] [-v]\n", stdout); setlocale(LC_CTYPE, ""); dpy = XOpenDisplay(0); if(!dpy) @@ -355,6 +408,15 @@ main(int argc, char *argv[]) { if(select(ConnectionNumber(dpy) + 1, &rd, NULL, NULL, &timeout) < 1) goto UninitializedEnd; maxname = readstdin(); + /* 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); /* style */ dc.norm[ColBG] = getcolor(normbg); dc.norm[ColFG] = getcolor(normfg); @@ -365,10 +427,10 @@ main(int argc, char *argv[]) { 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; - win = XCreateWindow(dpy, root, mx, my, mw, mh, 0, + win = XCreateWindow(dpy, root, 0, + DisplayHeight(dpy, screen) - mh, mw, mh, 0, DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen), CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa); @@ -380,6 +442,10 @@ main(int argc, char *argv[]) { 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);