X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=dmenu.c;h=f5d2bd1f7b390f041332c1cd84133f09b1ff7f18;hb=31ffcd3b9a2beccb8b8830055748e52e07b3b258;hp=7dfc2d3481077b1777da9cda319872d7d82f7268;hpb=a7aee433ccfd2590e0785a7b93a89d8d0593a234;p=dmenu.git diff --git a/dmenu.c b/dmenu.c index 7dfc2d3..f5d2bd1 100644 --- a/dmenu.c +++ b/dmenu.c @@ -25,12 +25,9 @@ struct Item { }; static void appenditem(Item *item, Item **list, Item **last); -static void calcoffsetsh(void); -static void calcoffsetsv(void); +static void calcoffsets(void); static char *cistrstr(const char *s, const char *sub); static void drawmenu(void); -static void drawmenuh(void); -static void drawmenuv(void); static void grabkeyboard(void); static void insert(const char *s, ssize_t n); static void keypress(XKeyEvent *e); @@ -51,6 +48,7 @@ static const char *selfgcolor = "#ffffff"; 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; @@ -62,7 +60,6 @@ static Window root, win; static int (*fstrncmp)(const char *, const char *, size_t) = strncmp; static char *(*fstrstr)(const char *, const char *) = strstr; -static void (*calcoffsets)(void) = calcoffsetsh; void appenditem(Item *item, Item **list, Item **last) { @@ -76,29 +73,25 @@ appenditem(Item *item, Item **list, Item **last) { } void -calcoffsetsh(void) { - unsigned int w, x; +calcoffsets(void) +{ + unsigned int h, i, n; - w = (prompt ? textw(dc, prompt) : 0) + inputw + textw(dc, "<") + textw(dc, ">"); - for(x = w, next = curr; next; next = next->right) - if((x += MIN(textw(dc, next->text), mw / 3)) > mw) + h = dc->font.height+2; + if(lines > 0) + n = lines * h; + 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(x = w, prev = curr; prev && prev->left; prev = prev->left) - if((x += MIN(textw(dc, prev->left->text), mw / 3)) > mw) + for(i = 0; prev && prev->left; prev = prev->left) + if((i += (lines > 0) ? h : MIN(textw(dc, prev->left->text), mw/3)) > n) break; } -void -calcoffsetsv(void) { - unsigned int i; - - next = prev = curr; - for(i = 0; i < lines && next; i++) - next = next->right; - for(i = 0; i < lines && prev && prev->left; i++) - prev = prev->left; -} - char * cistrstr(const char *s, const char *sub) { size_t len; @@ -111,59 +104,51 @@ cistrstr(const char *s, const char *sub) { void drawmenu(void) { + Item *item; + dc->x = 0; dc->y = 0; 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 = textw(dc, prompt); + dc->w = promptw; drawtext(dc, prompt, selcol); dc->x = dc->w; } dc->w = mw - dc->x; - /* print input area */ + /* print input field */ if(matches && lines == 0 && textw(dc, text) <= inputw) dc->w = inputw; drawtext(dc, text, normcol); drawrect(dc, textnw(dc, text, cursor) + dc->h/2 - 2, 2, 1, dc->h - 4, FG(dc, normcol)); - if(lines > 0) - drawmenuv(); - else if(curr && (dc->w == inputw || curr->next)) - drawmenuh(); - commitdraw(dc, win); -} -void -drawmenuh(void) { - Item *item; - - dc->x += inputw; - dc->w = textw(dc, "<"); - if(curr->left) - drawtext(dc, "<", normcol); - for(item = curr; item != next; item = item->right) { - dc->x += dc->w; - dc->w = MIN(textw(dc, item->text), mw / 3); - drawtext(dc, item->text, (item == sel) ? selcol : 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; + } } - dc->w = textw(dc, ">"); - dc->x = mw - dc->w; - if(next) - drawtext(dc, ">", normcol); -} - -void -drawmenuv(void) { - Item *item; - - 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; + else if(curr && (dc->w == inputw || curr->next)) { + dc->x += inputw; + dc->w = textw(dc, "<"); + if(curr->left) + drawtext(dc, "<", normcol); + for(item = curr; item != next; item = item->right) { + dc->x += dc->w; + dc->w = MIN(textw(dc, item->text), mw/3); + drawtext(dc, item->text, (item == sel) ? selcol : normcol); + } + dc->w = textw(dc, ">"); + dc->x = mw - dc->w; + if(next) + drawtext(dc, ">", normcol); } + commitdraw(dc, win); } void @@ -354,7 +339,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); @@ -469,7 +454,7 @@ setup(void) { selcol[ColBG] = getcolor(dc, selbgcolor); selcol[ColFG] = getcolor(dc, selfgcolor); - /* input window geometry */ + /* menu geometry */ mh = (dc->font.height + 2) * (lines + 1); #ifdef XINERAMA if((info = XineramaQueryScreens(dc->dpy, &n))) { @@ -493,8 +478,7 @@ 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; @@ -504,9 +488,11 @@ setup(void) { 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); + text[0] = '\0'; match(); } @@ -539,14 +525,12 @@ main(int argc, char *argv[]) { else if(i == argc-1) usage(); /* double flags */ - else if(!strcmp(argv[i], "-l")) { - if((lines = atoi(argv[++i])) > 0) - calcoffsets = calcoffsetsv; - } + 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++]); + initfont(dc, argv[++i]); else if(!strcmp(argv[i], "-nb")) normbgcolor = argv[++i]; else if(!strcmp(argv[i], "-nf"))