X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=dmenu.c;h=da6270583fa31765817228279ad7aea3e65ae71e;hb=bb3e33def3e5156594ac59b75dc52798accbebcd;hp=d0ed966a3e0d12e10753a1e00f34bbbd3b80a860;hpb=4776d6dc6148498a1eab11dd3a15c03736f15d42;p=dmenu.git diff --git a/dmenu.c b/dmenu.c index d0ed966..da62705 100644 --- a/dmenu.c +++ b/dmenu.c @@ -3,6 +3,7 @@ #include #include #include +#include #include #include #include @@ -27,21 +28,20 @@ static void calcoffsets(void); static void drawmenu(void); static char *fstrstr(const char *s, const char *sub); static void grabkeyboard(void); -static void insert(const char *s, ssize_t n); +static void insert(const char *str, ssize_t n); static void keypress(XKeyEvent *ev); -static void match(void); -static size_t nextrune(int incr); +static void match(Bool sub); +static size_t nextrune(int inc); static void paste(void); static void readstdin(void); static void run(void); static void setup(void); +static void usage(void); static char text[BUFSIZ] = ""; static int bh, mw, mh; -static int inputw; +static int inputw, promptw; static int lines = 0; -static int monitor = -1; -static int promptw; static size_t cursor = 0; static const char *font = NULL; static const char *prompt = NULL; @@ -69,7 +69,7 @@ main(int argc, char *argv[]) { for(i = 1; i < argc; i++) /* single flags */ if(!strcmp(argv[i], "-v")) { - fputs("dmenu-"VERSION", © 2006-2011 dmenu engineers, see LICENSE for details\n", stdout); + puts("dmenu-"VERSION", © 2006-2011 dmenu engineers, see LICENSE for details"); exit(EXIT_SUCCESS); } else if(!strcmp(argv[i], "-b")) @@ -79,12 +79,10 @@ main(int argc, char *argv[]) { else if(!strcmp(argv[i], "-i")) fstrncmp = strncasecmp; else if(i+1 == argc) - goto usage; + usage(); /* double flags */ else if(!strcmp(argv[i], "-l")) lines = atoi(argv[++i]); - else if(!strcmp(argv[i], "-m")) - monitor = atoi(argv[++i]); else if(!strcmp(argv[i], "-p")) prompt = argv[++i]; else if(!strcmp(argv[i], "-fn")) @@ -98,7 +96,7 @@ main(int argc, char *argv[]) { else if(!strcmp(argv[i], "-sf")) selfgcolor = argv[++i]; else - goto usage; + usage(); dc = initdc(); initfont(dc, font); @@ -113,12 +111,8 @@ main(int argc, char *argv[]) { } setup(); run(); - return EXIT_FAILURE; -usage: - fputs("usage: dmenu [-b] [-f] [-i] [-l lines] [-m monitor] [-p prompt] [-fn font]\n" - " [-nb color] [-nf color] [-sb color] [-sf color] [-v]\n", stderr); - return EXIT_FAILURE; + return EXIT_FAILURE; /* should not reach */ } void @@ -134,7 +128,7 @@ appenditem(Item *item, Item **list, Item **last) { void calcoffsets(void) { - unsigned int i, n; + int i, n; if(lines > 0) n = lines * bh; @@ -218,26 +212,27 @@ grabkeyboard(void) { } void -insert(const char *s, ssize_t n) { +insert(const char *str, ssize_t n) { if(strlen(text) + n > sizeof text - 1) return; memmove(&text[cursor + n], &text[cursor], sizeof text - cursor - MAX(n, 0)); if(n > 0) - memcpy(&text[cursor], s, n); + memcpy(&text[cursor], str, n); cursor += n; - match(); + match(n > 0); } void keypress(XKeyEvent *ev) { char buf[32]; - size_t len; KeySym ksym; - len = strlen(text); XLookupString(ev, buf, sizeof buf, &ksym, NULL); - if(ev->state & ControlMask) - switch(tolower(ksym)) { + if(ev->state & ControlMask) { + KeySym lower, upper; + + XConvertCase(ksym, &lower, &upper); + switch(lower) { default: return; case XK_a: @@ -269,7 +264,7 @@ keypress(XKeyEvent *ev) { break; case XK_k: /* delete right */ text[cursor] = '\0'; - match(); + match(False); break; case XK_n: ksym = XK_Down; @@ -290,13 +285,14 @@ keypress(XKeyEvent *ev) { XConvertSelection(dc->dpy, XA_PRIMARY, utf8, utf8, win, CurrentTime); return; } + } switch(ksym) { default: if(!iscntrl(*buf)) insert(buf, strlen(buf)); break; case XK_Delete: - if(cursor == len) + if(text[cursor] == '\0') return; cursor = nextrune(+1); case XK_BackSpace: @@ -304,8 +300,8 @@ keypress(XKeyEvent *ev) { insert(NULL, nextrune(-1) - cursor); break; case XK_End: - if(cursor < len) { - cursor = len; + if(text[cursor] != '\0') { + cursor = strlen(text); break; } if(next) { @@ -358,7 +354,7 @@ keypress(XKeyEvent *ev) { fputs((sel && !(ev->state & ShiftMask)) ? sel->text : text, stdout); exit(EXIT_SUCCESS); case XK_Right: - if(cursor < len) { + if(text[cursor] != '\0') { cursor = nextrune(+1); break; } @@ -375,30 +371,31 @@ keypress(XKeyEvent *ev) { return; strncpy(text, sel->text, sizeof text); cursor = strlen(text); - match(); + match(True); break; } drawmenu(); } void -match(void) { +match(Bool sub) { size_t len = strlen(text); - Item *item, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend; + Item *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend; + Item *item, *lnext; - matches = lexact = lprefix = lsubstr = matchend = exactend = prefixend = substrend = NULL; - for(item = items; item && item->text; item++) + lexact = lprefix = lsubstr = exactend = prefixend = substrend = NULL; + for(item = sub ? matches : items; item && item->text; item = lnext) { + lnext = sub ? item->right : item + 1; if(!fstrncmp(text, item->text, len + 1)) appenditem(item, &lexact, &exactend); else if(!fstrncmp(text, item->text, len)) appenditem(item, &lprefix, &prefixend); else if(fstrstr(item->text, text)) appenditem(item, &lsubstr, &substrend); - - if(lexact) { - matches = lexact; - matchend = exactend; } + matches = lexact; + matchend = exactend; + if(lprefix) { if(matchend) { matchend->right = lprefix; @@ -422,10 +419,10 @@ match(void) { } size_t -nextrune(int incr) { - size_t n, len = strlen(text); +nextrune(int inc) { + ssize_t n; - for(n = cursor + incr; n >= 0 && n < len && (text[n] & 0xc0) == 0x80; n += incr); + for(n = cursor + inc; n + inc >= 0 && (text[n] & 0xc0) == 0x80; n += inc); return n; } @@ -438,7 +435,7 @@ paste(void) { 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 : strlen(p)); + insert(p, (q = strchr(p, '\n')) ? q-p : (ssize_t)strlen(p)); XFree(p); drawmenu(); } @@ -448,7 +445,7 @@ readstdin(void) { char buf[sizeof text], *p, *maxstr = NULL; size_t i, max = 0, size = 0; - for(i = 0; fgets(buf, sizeof buf, stdin); items[++i].text = NULL) { + for(i = 0; fgets(buf, sizeof buf, stdin); i++) { if(i+1 >= size / sizeof *items) if(!(items = realloc(items, (size += BUFSIZ)))) eprintf("cannot realloc %u bytes:", size); @@ -459,6 +456,8 @@ readstdin(void) { if(strlen(items[i].text) > max) max = strlen(maxstr = items[i].text); } + if(items) + items[i].text = NULL; inputw = maxstr ? textw(dc, maxstr) : 0; } @@ -498,8 +497,8 @@ setup(void) { normcol[ColBG] = getcolor(dc, normbgcolor); normcol[ColFG] = getcolor(dc, normfgcolor); - selcol[ColBG] = getcolor(dc, selbgcolor); - selcol[ColFG] = getcolor(dc, selfgcolor); + selcol[ColBG] = getcolor(dc, selbgcolor); + selcol[ColFG] = getcolor(dc, selfgcolor); utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False); @@ -515,8 +514,7 @@ setup(void) { XQueryPointer(dc->dpy, root, &dw, &dw, &x, &y, &di, &di, &du); for(i = 0; i < n-1; i++) - if((monitor == info[i].screen_number) - || (monitor < 0 && INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height))) + if(INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height)) break; x = info[i].x_org; y = info[i].y_org + (topbar ? 0 : info[i].height - mh); @@ -530,9 +528,9 @@ setup(void) { y = topbar ? 0 : DisplayHeight(dc->dpy, screen) - mh; mw = DisplayWidth(dc->dpy, screen); } - inputw = MIN(inputw, mw/3); promptw = prompt ? textw(dc, prompt) : 0; - match(); + inputw = MIN(inputw, mw/3); + match(False); /* menu window */ wa.override_redirect = True; @@ -547,3 +545,10 @@ setup(void) { resizedc(dc, mw, mh); drawmenu(); } + +void +usage(void) { + fputs("usage: dmenu [-b] [-f] [-i] [-l lines] [-p prompt] [-fn font]\n" + " [-nb color] [-nf color] [-sb color] [-sf color] [-v]\n", stderr); + exit(EXIT_FAILURE); +}