X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=dmenu.c;h=a06ae1572672deba09e4a36537369a8e457e4601;hb=14f72a276334de4a46543cf648a4922bc54f1e9f;hp=841af4ac9f31f24cdff359e5f404ff24c8b391c3;hpb=dd29c5d48084ae0f61a43bfbd5119fb480d83fb7;p=dmenu.git diff --git a/dmenu.c b/dmenu.c index 841af4a..a06ae15 100644 --- a/dmenu.c +++ b/dmenu.c @@ -22,6 +22,7 @@ typedef struct Item Item; struct Item { char *text; Item *left, *right; + Bool out; }; static void appenditem(Item *item, Item **list, Item **last); @@ -43,17 +44,10 @@ static char text[BUFSIZ] = ""; static int bh, mw, mh; static int inputw, promptw; static size_t cursor = 0; -static const char *font = NULL; -static const char *prompt = NULL; -static const char *normbgcolor = "#cccccc"; -static const char *normfgcolor = "#000000"; -static const char *selbgcolor = "#0066ff"; -static const char *selfgcolor = "#ffffff"; -static unsigned int lines = 0; static unsigned long normcol[ColLast]; static unsigned long selcol[ColLast]; -static Atom utf8; -static Bool topbar = True; +static unsigned long outcol[ColLast]; +static Atom clip, utf8; static DC *dc; static Item *items = NULL; static Item *matches, *matchend; @@ -61,6 +55,8 @@ static Item *prev, *curr, *next, *sel; static Window win; static XIC xic; +#include "config.h" + static int (*fstrncmp)(const char *, const char *, size_t) = strncmp; static char *(*fstrstr)(const char *, const char *) = strstr; @@ -70,35 +66,35 @@ main(int argc, char *argv[]) { int i; for(i = 1; i < argc; i++) - /* single flags */ - if(!strcmp(argv[i], "-v")) { - puts("dmenu-"VERSION", © 2006-2011 dmenu engineers, see LICENSE for details"); + /* these options take no arguments */ + if(!strcmp(argv[i], "-v")) { /* prints version information */ + puts("dmenu-"VERSION", © 2006-2012 dmenu engineers, see LICENSE for details"); exit(EXIT_SUCCESS); } - else if(!strcmp(argv[i], "-b")) + else if(!strcmp(argv[i], "-b")) /* appears at the bottom of the screen */ topbar = False; - else if(!strcmp(argv[i], "-f")) + else if(!strcmp(argv[i], "-f")) /* grabs keyboard before reading stdin */ fast = True; - else if(!strcmp(argv[i], "-i")) { + else if(!strcmp(argv[i], "-i")) { /* case-insensitive item matching */ fstrncmp = strncasecmp; fstrstr = cistrstr; } else if(i+1 == argc) usage(); - /* double flags */ - else if(!strcmp(argv[i], "-l")) + /* these options take one argument */ + else if(!strcmp(argv[i], "-l")) /* number of lines in vertical list */ lines = atoi(argv[++i]); - else if(!strcmp(argv[i], "-p")) + else if(!strcmp(argv[i], "-p")) /* adds prompt to left of input field */ prompt = argv[++i]; - else if(!strcmp(argv[i], "-fn")) + else if(!strcmp(argv[i], "-fn")) /* font or font set */ font = argv[++i]; - else if(!strcmp(argv[i], "-nb")) + else if(!strcmp(argv[i], "-nb")) /* normal background color */ normbgcolor = argv[++i]; - else if(!strcmp(argv[i], "-nf")) + else if(!strcmp(argv[i], "-nf")) /* normal foreground color */ normfgcolor = argv[++i]; - else if(!strcmp(argv[i], "-sb")) + else if(!strcmp(argv[i], "-sb")) /* selected background color */ selbgcolor = argv[++i]; - else if(!strcmp(argv[i], "-sf")) + else if(!strcmp(argv[i], "-sf")) /* selected foreground color */ selfgcolor = argv[++i]; else usage(); @@ -117,7 +113,7 @@ main(int argc, char *argv[]) { setup(); run(); - return EXIT_FAILURE; /* unreachable */ + return 1; /* unreachable */ } void @@ -140,7 +136,7 @@ calcoffsets(void) { n = lines * bh; else n = mw - (promptw + inputw + textw(dc, "<") + textw(dc, ">")); - + /* calculate which items will begin the next page and previous page */ for(i = 0, next = curr; next; next = next->right) if((i += (lines > 0) ? bh : MIN(textw(dc, next->text), n)) > n) break; @@ -169,24 +165,28 @@ drawmenu(void) { dc->h = bh; drawrect(dc, 0, 0, mw, mh, True, BG(dc, normcol)); - if(prompt) { + if(prompt && *prompt) { dc->w = promptw; drawtext(dc, prompt, selcol); dc->x = dc->w; } + /* draw input field */ dc->w = (lines > 0 || !matches) ? mw - dc->x : inputw; drawtext(dc, text, normcol); if((curpos = textnw(dc, text, cursor) + dc->h/2 - 2) < dc->w) drawrect(dc, curpos, 2, 1, dc->h - 4, True, FG(dc, normcol)); if(lines > 0) { + /* draw vertical list */ dc->w = mw - dc->x; for(item = curr; item != next; item = item->right) { dc->y += dc->h; - drawtext(dc, item->text, (item == sel) ? selcol : normcol); + drawtext(dc, item->text, (item == sel) ? selcol : + (item->out) ? outcol : normcol); } } else if(matches) { + /* draw horizontal list */ dc->x += inputw; dc->w = textw(dc, "<"); if(curr->left) @@ -194,7 +194,8 @@ drawmenu(void) { for(item = curr; item != next; item = item->right) { dc->x += dc->w; dc->w = MIN(textw(dc, item->text), mw - dc->x - textw(dc, ">")); - drawtext(dc, item->text, (item == sel) ? selcol : normcol); + drawtext(dc, item->text, (item == sel) ? selcol : + (item->out) ? outcol : normcol); } dc->w = textw(dc, ">"); dc->x = mw - dc->w; @@ -208,6 +209,7 @@ void grabkeyboard(void) { int i; + /* try to grab keyboard, we may have to wait for another process to ungrab */ for(i = 0; i < 1000; i++) { if(XGrabKeyboard(dc->dpy, DefaultRootWindow(dc->dpy), True, GrabModeAsync, GrabModeAsync, CurrentTime) == GrabSuccess) @@ -221,6 +223,7 @@ void insert(const char *str, ssize_t n) { if(strlen(text) + n > sizeof text - 1) return; + /* move existing text out of the way, insert new text, and update cursor */ memmove(&text[cursor + n], &text[cursor], sizeof text - cursor - MAX(n, 0)); if(n > 0) memcpy(&text[cursor], str, n); @@ -238,23 +241,23 @@ keypress(XKeyEvent *ev) { len = XmbLookupString(xic, ev, buf, sizeof buf, &ksym, &status); if(status == XBufferOverflow) return; - if(ev->state & ControlMask) { - KeySym lower, upper; - - XConvertCase(ksym, &lower, &upper); - switch(lower) { + if(ev->state & ControlMask) + switch(ksym) { case XK_a: ksym = XK_Home; break; case XK_b: ksym = XK_Left; break; case XK_c: ksym = XK_Escape; break; case XK_d: ksym = XK_Delete; break; case XK_e: ksym = XK_End; break; case XK_f: ksym = XK_Right; break; + case XK_g: ksym = XK_Escape; break; case XK_h: ksym = XK_BackSpace; break; case XK_i: ksym = XK_Tab; break; - case XK_j: ksym = XK_Return; break; - case XK_m: ksym = XK_Return; break; - case XK_n: ksym = XK_Up; break; - case XK_p: ksym = XK_Down; break; + case XK_j: /* fallthrough */ + case XK_J: ksym = XK_Return; break; + case XK_m: /* fallthrough */ + case XK_M: ksym = XK_Return; break; + case XK_n: ksym = XK_Down; break; + case XK_p: ksym = XK_Up; break; case XK_k: /* delete right */ text[cursor] = '\0'; @@ -270,12 +273,26 @@ keypress(XKeyEvent *ev) { insert(NULL, nextrune(-1) - cursor); break; case XK_y: /* paste selection */ - XConvertSelection(dc->dpy, XA_PRIMARY, utf8, utf8, win, CurrentTime); + XConvertSelection(dc->dpy, (ev->state & ShiftMask) ? clip : XA_PRIMARY, + utf8, utf8, win, CurrentTime); return; + case XK_Return: + case XK_KP_Enter: + break; + default: + return; + } + else if(ev->state & Mod1Mask) + switch(ksym) { + case XK_g: ksym = XK_Home; break; + case XK_G: ksym = XK_End; break; + case XK_h: ksym = XK_Up; break; + case XK_j: ksym = XK_Next; break; + case XK_k: ksym = XK_Prior; break; + case XK_l: ksym = XK_Down; break; default: return; } - } switch(ksym) { default: if(!iscntrl(*buf)) @@ -297,6 +314,7 @@ keypress(XKeyEvent *ev) { break; } if(next) { + /* jump to end of list and position items in reverse */ curr = matchend; calcoffsets(); curr = prev; @@ -321,6 +339,8 @@ keypress(XKeyEvent *ev) { cursor = nextrune(-1); break; } + if(lines > 0) + return; /* fallthrough */ case XK_Up: if(sel && sel->left && (sel = sel->left)->right == curr) { @@ -343,12 +363,17 @@ keypress(XKeyEvent *ev) { case XK_Return: case XK_KP_Enter: puts((sel && !(ev->state & ShiftMask)) ? sel->text : text); - exit(EXIT_SUCCESS); + if(!(ev->state & ControlMask)) + exit(EXIT_SUCCESS); + sel->out = True; + break; case XK_Right: if(text[cursor] != '\0') { cursor = nextrune(+1); break; } + if(lines > 0) + return; /* fallthrough */ case XK_Down: if(sel && sel->right && (sel = sel->right) == next) { @@ -359,7 +384,8 @@ keypress(XKeyEvent *ev) { case XK_Tab: if(!sel) return; - strncpy(text, sel->text, sizeof text); + strncpy(text, sel->text, sizeof text - 1); + text[sizeof text - 1] = '\0'; cursor = strlen(text); match(); break; @@ -378,6 +404,7 @@ match(void) { Item *item, *lprefix, *lsubstr, *prefixend, *substrend; strcpy(buf, text); + /* separate input text into tokens to be matched individually */ for(s = strtok(buf, " "); s; tokv[tokc-1] = s, s = strtok(NULL, " ")) if(++tokc > tokn && !(tokv = realloc(tokv, ++tokn * sizeof *tokv))) eprintf("cannot realloc %u bytes\n", tokn * sizeof *tokv); @@ -388,8 +415,9 @@ match(void) { for(i = 0; i < tokc; i++) if(!fstrstr(item->text, tokv[i])) break; - if(i != tokc) + if(i != tokc) /* not all tokens match */ continue; + /* exact matches go first, then prefixes, then substrings */ if(!tokc || !fstrncmp(tokv[0], item->text, len+1)) appenditem(item, &matches, &matchend); else if(!fstrncmp(tokv[0], item->text, len)) @@ -423,6 +451,7 @@ size_t nextrune(int inc) { ssize_t n; + /* return location of next utf8 rune in the given direction (+1 or -1) */ for(n = cursor + inc; n + inc >= 0 && (text[n] & 0xc0) == 0x80; n += inc); return n; } @@ -434,6 +463,7 @@ paste(void) { unsigned long dl; Atom da; + /* we have been given the current selection, now insert it into input */ XGetWindowProperty(dc->dpy, win, utf8, 0, (sizeof text / 4) + 1, False, utf8, &da, &di, &dl, &dl, (unsigned char **)&p); insert(p, (q = strchr(p, '\n')) ? q-p : (ssize_t)strlen(p)); @@ -446,6 +476,7 @@ readstdin(void) { char buf[sizeof text], *p, *maxstr = NULL; size_t i, max = 0, size = 0; + /* read each line from stdin and add it to the item list */ for(i = 0; fgets(buf, sizeof buf, stdin); i++) { if(i+1 >= size / sizeof *items) if(!(items = realloc(items, (size += BUFSIZ)))) @@ -454,6 +485,7 @@ readstdin(void) { *p = '\0'; if(!(items[i].text = strdup(buf))) eprintf("cannot strdup %u bytes:", strlen(buf)+1); + items[i].out = False; if(strlen(items[i].text) > max) max = strlen(maxstr = items[i].text); } @@ -505,10 +537,13 @@ setup(void) { normcol[ColFG] = getcolor(dc, normfgcolor); selcol[ColBG] = getcolor(dc, selbgcolor); selcol[ColFG] = getcolor(dc, selfgcolor); + outcol[ColBG] = getcolor(dc, outbgcolor); + outcol[ColFG] = getcolor(dc, outfgcolor); + clip = XInternAtom(dc->dpy, "CLIPBOARD", False); utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False); - /* menu geometry */ + /* calculate menu geometry */ bh = dc->font.height + 2; lines = MAX(lines, 0); mh = (lines + 1) * bh; @@ -521,10 +556,12 @@ setup(void) { XGetInputFocus(dc->dpy, &w, &di); if(w != root && w != PointerRoot && w != None) { + /* find top-level window containing current input focus */ do { if(XQueryTree(dc->dpy, (pw = w), &dw, &w, &dws, &du) && dws) XFree(dws); } while(w != root && w != pw); + /* find xinerama screen with which the window intersects most */ if(XGetWindowAttributes(dc->dpy, pw, &wa)) for(j = 0; j < n; j++) if((a = INTERSECT(wa.x, wa.y, wa.width, wa.height, info[j])) > area) { @@ -532,10 +569,12 @@ setup(void) { i = j; } } + /* no focused window is on screen, so use pointer location instead */ if(!area && XQueryPointer(dc->dpy, root, &dw, &dw, &x, &y, &di, &di, &du)) for(i = 0; i < n; i++) if(INTERSECT(x, y, 1, 1, info[i])) break; + x = info[i].x_org; y = info[i].y_org + (topbar ? 0 : info[i].height - mh); mw = info[i].width; @@ -548,20 +587,20 @@ setup(void) { y = topbar ? 0 : DisplayHeight(dc->dpy, screen) - mh; mw = DisplayWidth(dc->dpy, screen); } - promptw = prompt ? textw(dc, prompt) : 0; + promptw = (prompt && *prompt) ? textw(dc, prompt) : 0; inputw = MIN(inputw, mw/3); match(); - /* menu window */ + /* create menu window */ swa.override_redirect = True; - swa.background_pixmap = ParentRelative; + swa.background_pixel = normcol[ColBG]; swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask; win = XCreateWindow(dc->dpy, root, x, y, mw, mh, 0, DefaultDepth(dc->dpy, screen), CopyFromParent, DefaultVisual(dc->dpy, screen), - CWOverrideRedirect | CWBackPixmap | CWEventMask, &swa); + CWOverrideRedirect | CWBackPixel | CWEventMask, &swa); - /* input methods */ + /* open input methods */ xim = XOpenIM(dc->dpy, NULL, NULL, NULL); xic = XCreateIC(xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing, XNClientWindow, win, XNFocusWindow, win, NULL);