X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=dmenu.c;h=42022e946408ecc80d4696ff3eb05d0c87867b4d;hb=00a60cb7b28b671ae0ba5302e3fb1cbaea6695ec;hp=f5d2bd1f7b390f041332c1cd84133f09b1ff7f18;hpb=31ffcd3b9a2beccb8b8830055748e52e07b3b258;p=dmenu.git diff --git a/dmenu.c b/dmenu.c index f5d2bd1..42022e9 100644 --- a/dmenu.c +++ b/dmenu.c @@ -4,8 +4,8 @@ #include #include #include -#include #include +#include #include #ifdef XINERAMA #include @@ -26,11 +26,11 @@ struct Item { static void appenditem(Item *item, Item **list, Item **last); static void calcoffsets(void); -static char *cistrstr(const char *s, const char *sub); 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 keypress(XKeyEvent *e); +static void keypress(XKeyEvent *ev); static void match(void); static void paste(void); static void readstdin(void); @@ -38,28 +38,29 @@ static void run(void); static void setup(void); static void usage(void); -static char text[4096]; +static char text[BUFSIZ]; 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 bh, mw, mh; static unsigned int inputw = 0; static unsigned int lines = 0; -static unsigned int mw, mh; static unsigned int promptw; static unsigned long normcol[ColLast]; static unsigned long selcol[ColLast]; static Atom utf8; static Bool topbar = True; static DC *dc; -static Item *allitems, *matches; -static Item *curr, *prev, *next, *sel; +static Item *items = NULL; +static Item *matches, *sel; +static Item *prev, *curr, *next; static Window root, win; static int (*fstrncmp)(const char *, const char *, size_t) = strncmp; -static char *(*fstrstr)(const char *, const char *) = strstr; void appenditem(Item *item, Item **list, Item **last) { @@ -73,67 +74,50 @@ appenditem(Item *item, Item **list, Item **last) { } void -calcoffsets(void) -{ - unsigned int h, i, n; +calcoffsets(void) { + unsigned int i, n; - h = dc->font.height+2; if(lines > 0) - n = lines * h; + n = lines * bh; else n = mw - (promptw + inputw + textw(dc, "<") + textw(dc, ">")); - prev = next = curr; - for(i = 0; next; next = next->right) - if((i += (lines > 0) ? h : MIN(textw(dc, next->text), mw/3)) > n) + for(i = 0, next = curr; next; next = next->right) + if((i += (lines > 0) ? bh : MIN(textw(dc, next->text), mw/3)) > n) break; - for(i = 0; prev && prev->left; prev = prev->left) - if((i += (lines > 0) ? h : MIN(textw(dc, prev->left->text), mw/3)) > n) + for(i = 0, prev = curr; prev && prev->left; prev = prev->left) + if((i += (lines > 0) ? bh : MIN(textw(dc, prev->left->text), mw/3)) > n) break; } -char * -cistrstr(const char *s, const char *sub) { - size_t len; - - for(len = strlen(sub); *s; s++) - if(!strncasecmp(s, sub, len)) - return (char *)s; - return NULL; -} - void drawmenu(void) { + int curpos; Item *item; dc->x = 0; dc->y = 0; - drawrect(dc, 0, 0, mw, mh, BG(dc, normcol)); + dc->h = bh; + drawrect(dc, 0, 0, mw, mh, True, BG(dc, normcol)); - dc->h = dc->font.height + 2; - dc->y = topbar ? 0 : mh - dc->h; - /* print prompt? */ if(prompt) { dc->w = promptw; drawtext(dc, prompt, selcol); dc->x = dc->w; } - dc->w = mw - dc->x; - /* print input field */ - if(matches && lines == 0 && textw(dc, text) <= inputw) - dc->w = inputw; + dc->w = (lines > 0 || !matches) ? mw - dc->x : inputw; drawtext(dc, text, normcol); - drawrect(dc, textnw(dc, text, cursor) + dc->h/2 - 2, 2, 1, dc->h - 4, FG(dc, 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) { - dc->y = topbar ? dc->h : 0; dc->w = mw - dc->x; for(item = curr; item != next; item = item->right) { - drawtext(dc, item->text, (item == sel) ? selcol : normcol); dc->y += dc->h; + drawtext(dc, item->text, (item == sel) ? selcol : normcol); } } - else if(curr && (dc->w == inputw || curr->next)) { + else if(matches) { dc->x += inputw; dc->w = textw(dc, "<"); if(curr->left) @@ -148,7 +132,17 @@ drawmenu(void) { if(next) drawtext(dc, ">", normcol); } - commitdraw(dc, win); + commitdraw(dc, win, mw, mh); +} + +char * +fstrstr(const char *s, const char *sub) { + size_t len; + + for(len = strlen(sub); *s; s++) + if(!fstrncmp(s, sub, len)) + return (char *)s; + return NULL; } void @@ -173,15 +167,15 @@ insert(const char *s, ssize_t n) { } void -keypress(XKeyEvent *e) { - char buf[sizeof text]; +keypress(XKeyEvent *ev) { + char buf[32]; int n; size_t len; KeySym ksym; len = strlen(text); - XLookupString(e, buf, sizeof buf, &ksym, NULL); - if(e->state & ControlMask) { + XLookupString(ev, buf, sizeof buf, &ksym, NULL); + if(ev->state & ControlMask) { switch(tolower(ksym)) { default: return; @@ -194,6 +188,9 @@ keypress(XKeyEvent *e) { case XK_c: ksym = XK_Escape; break; + case XK_d: + ksym = XK_Delete; + break; case XK_e: ksym = XK_End; break; @@ -207,7 +204,6 @@ keypress(XKeyEvent *e) { ksym = XK_Tab; break; case XK_j: - case XK_m: ksym = XK_Return; break; case XK_k: /* delete right */ @@ -233,13 +229,12 @@ keypress(XKeyEvent *e) { break; case XK_y: /* paste selection */ XConvertSelection(dc->dpy, XA_PRIMARY, utf8, None, win, CurrentTime); - /* causes SelectionNotify event */ return; } } switch(ksym) { default: - if(!iscntrl((int)*buf)) + if(isprint(*buf)) insert(buf, MIN(strlen(buf), sizeof text - cursor)); break; case XK_BackSpace: @@ -287,8 +282,7 @@ keypress(XKeyEvent *e) { case XK_Up: if(!sel || !sel->left) return; - sel = sel->left; - if(sel->right == curr) { + if((sel = sel->left)->right == curr) { curr = prev; calcoffsets(); } @@ -307,7 +301,7 @@ keypress(XKeyEvent *e) { break; case XK_Return: case XK_KP_Enter: - fputs((sel && !(e->state & ShiftMask)) ? sel->text : text, stdout); + fputs((sel && !(ev->state & ShiftMask)) ? sel->text : text, stdout); fflush(stdout); exit(EXIT_SUCCESS); case XK_Right: @@ -320,8 +314,7 @@ keypress(XKeyEvent *e) { case XK_Down: if(!sel || !sel->right) return; - sel = sel->right; - if(sel == next) { + if((sel = sel->right) == next) { curr = next; calcoffsets(); } @@ -344,13 +337,14 @@ match(void) { len = strlen(text); matches = lexact = lprefix = lsubstr = itemend = exactend = prefixend = substrend = NULL; - for(item = allitems; item; item = item->next) + for(item = items; item; item = item->next) 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; itemend = exactend; @@ -393,22 +387,17 @@ paste(void) { void readstdin(void) { char buf[sizeof text], *p; - Item *item, *new; + Item *item, **end; - allitems = NULL; - for(item = NULL; fgets(buf, sizeof buf, stdin); item = new) { + for(end = &items; fgets(buf, sizeof buf, stdin); *end = item, end = &item->next) { if((p = strchr(buf, '\n'))) *p = '\0'; - if(!(new = malloc(sizeof *new))) - eprintf("cannot malloc %u bytes\n", sizeof *new); - if(!(new->text = strdup(buf))) - eprintf("cannot strdup %u bytes\n", strlen(buf)); - inputw = MAX(inputw, textw(dc, new->text)); - new->next = new->left = new->right = NULL; - if(item) - item->next = new; - else - allitems = new; + if(!(item = malloc(sizeof *item))) + eprintf("cannot malloc %u bytes\n", sizeof *item); + if(!(item->text = strdup(buf))) + eprintf("cannot strdup %u bytes\n", strlen(buf)+1); + inputw = MAX(inputw, textw(dc, item->text)); + item->next = item->left = item->right = NULL; } } @@ -455,7 +444,8 @@ setup(void) { selcol[ColFG] = getcolor(dc, selfgcolor); /* menu geometry */ - mh = (dc->font.height + 2) * (lines + 1); + bh = dc->font.height + 2; + mh = (lines + 1) * bh; #ifdef XINERAMA if((info = XineramaQueryScreens(dc->dpy, &n))) { int i, di; @@ -483,9 +473,9 @@ setup(void) { wa.background_pixmap = ParentRelative; wa.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, &wa); + DefaultDepth(dc->dpy, screen), CopyFromParent, + DefaultVisual(dc->dpy, screen), + CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa); grabkeyboard(); setcanvas(dc, mw, mh); @@ -508,8 +498,6 @@ main(int argc, char *argv[]) { int i; progname = "dmenu"; - dc = initdraw(); - for(i = 1; i < argc; i++) /* single flags */ if(!strcmp(argv[i], "-v")) { @@ -518,10 +506,8 @@ main(int argc, char *argv[]) { } else if(!strcmp(argv[i], "-b")) topbar = False; - else if(!strcmp(argv[i], "-i")) { + else if(!strcmp(argv[i], "-i")) fstrncmp = strncasecmp; - fstrstr = cistrstr; - } else if(i == argc-1) usage(); /* double flags */ @@ -530,7 +516,7 @@ main(int argc, char *argv[]) { else if(!strcmp(argv[i], "-p")) prompt = argv[++i]; else if(!strcmp(argv[i], "-fn")) - initfont(dc, argv[++i]); + font = argv[++i]; else if(!strcmp(argv[i], "-nb")) normbgcolor = argv[++i]; else if(!strcmp(argv[i], "-nf")) @@ -542,6 +528,8 @@ main(int argc, char *argv[]) { else usage(); + dc = initdraw(); + initfont(dc, font); readstdin(); setup(); run();