X-Git-Url: https://git.xinqibao.xyz/dmenu.git/blobdiff_plain/b7695fa98cb75c1f2ac342227bbebf4e648f37e7..e149c531b876e666a42870816834723d97a656f4:/dmenu.c diff --git a/dmenu.c b/dmenu.c index f19e798..a8bdcb9 100644 --- a/dmenu.c +++ b/dmenu.c @@ -4,8 +4,8 @@ #include #include #include -#include #include +#include #include #ifdef XINERAMA #include @@ -13,6 +13,7 @@ #include #define INRECT(x,y,rx,ry,rw,rh) ((x) >= (rx) && (x) < (rx)+(rw) && (y) >= (ry) && (y) < (ry)+(rh)) +#define LINEH (dc->font.height + 2) #define MIN(a,b) ((a) < (b) ? (a) : (b)) #define MAX(a,b) ((a) > (b) ? (a) : (b)) #define UTF8_CODEPOINT(c) (((c) & 0xc0) != 0x80) @@ -30,7 +31,7 @@ static char *cistrstr(const char *s, const char *sub); static void drawmenu(void); 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,8 +39,9 @@ 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"; @@ -73,22 +75,19 @@ 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 * LINEH; 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) ? LINEH : 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) ? LINEH : MIN(textw(dc, prev->left->text), mw/3)) > n) break; } @@ -104,38 +103,35 @@ cistrstr(const char *s, const char *sub) { void drawmenu(void) { + int curpos; Item *item; dc->x = 0; dc->y = 0; + dc->h = LINEH; drawrect(dc, 0, 0, mw, mh, 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 area */ - 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, 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(prev) + if(curr->left) drawtext(dc, "<", normcol); for(item = curr; item != next; item = item->right) { dc->x += dc->w; @@ -172,15 +168,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; @@ -193,6 +189,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; @@ -206,7 +205,6 @@ keypress(XKeyEvent *e) { ksym = XK_Tab; break; case XK_j: - case XK_m: ksym = XK_Return; break; case XK_k: /* delete right */ @@ -232,13 +230,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: @@ -286,8 +283,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(); } @@ -306,7 +302,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: @@ -319,8 +315,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(); } @@ -338,7 +333,7 @@ keypress(XKeyEvent *e) { void match(void) { - unsigned int len; + size_t len; Item *item, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend; len = strlen(text); @@ -401,7 +396,7 @@ readstdin(void) { 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)); + eprintf("cannot strdup %u bytes\n", strlen(buf)+1); inputw = MAX(inputw, textw(dc, new->text)); new->next = new->left = new->right = NULL; if(item) @@ -453,8 +448,8 @@ setup(void) { selcol[ColBG] = getcolor(dc, selbgcolor); selcol[ColFG] = getcolor(dc, selfgcolor); - /* input window geometry */ - mh = (dc->font.height + 2) * (lines + 1); + /* menu geometry */ + mh = (lines + 1) * LINEH; #ifdef XINERAMA if((info = XineramaQueryScreens(dc->dpy, &n))) { int i, di; @@ -477,17 +472,17 @@ setup(void) { y = topbar ? 0 : DisplayHeight(dc->dpy, screen) - mh; mw = DisplayWidth(dc->dpy, screen); } - /* input window */ + /* menu window */ wa.override_redirect = True; 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, win, mw, mh); + setcanvas(dc, mw, mh); inputw = MIN(inputw, mw/3); promptw = prompt ? MIN(textw(dc, prompt), mw/5) : 0; XMapRaised(dc->dpy, win); @@ -507,8 +502,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")) { @@ -524,13 +517,12 @@ main(int argc, char *argv[]) { else if(i == argc-1) usage(); /* double flags */ - else if(!strcmp(argv[i], "-l")) { + else if(!strcmp(argv[i], "-l")) lines = atoi(argv[++i]); - } 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 +534,8 @@ main(int argc, char *argv[]) { else usage(); + dc = initdraw(); + initfont(dc, font); readstdin(); setup(); run();