X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=dmenu.c;h=384def6167bbcad650a25b424637faeb939ce38b;hb=caf524626894bdee3756c4065bca44152d0efe9a;hp=a1d0ed2cee64063a51c8975ba77eb96acbc676e4;hpb=0b8072a5a93cfa6869983748932f9e5679fbfe2d;p=dmenu.git diff --git a/dmenu.c b/dmenu.c index a1d0ed2..384def6 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,7 +39,7 @@ 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 *prompt = NULL; static const char *normbgcolor = "#cccccc"; @@ -73,23 +74,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) - break; - for(i = 0; prev && prev->left; prev = prev->left) - if((i += (lines > 0) ? h : MIN(textw(dc, prev->left->text), mw/3)) > n) - break; + for(i = 0, next = curr; i <= n && next; next = next->right) + i += (lines > 0) ? LINEH : MIN(textw(dc, next->text), mw/3); + + for(i = 0, prev = curr; i <= n && prev && prev->left; prev = prev->left) + i += (lines > 0) ? LINEH : MIN(textw(dc, prev->left->text), mw/3); } char * @@ -104,36 +101,32 @@ 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 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, 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) @@ -173,15 +166,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; @@ -235,13 +228,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: @@ -289,8 +281,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(); } @@ -309,7 +300,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: @@ -322,8 +313,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(); } @@ -404,7 +394,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) @@ -457,7 +447,7 @@ setup(void) { selcol[ColFG] = getcolor(dc, selfgcolor); /* menu geometry */ - mh = (dc->font.height + 2) * (lines + 1); + mh = (lines + 1) * LINEH; #ifdef XINERAMA if((info = XineramaQueryScreens(dc->dpy, &n))) { int i, di; @@ -485,9 +475,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);