From: Connor Lane Smith Date: Fri, 30 Jul 2010 08:18:35 +0000 (+0100) Subject: fixed vlist select X-Git-Url: https://git.danieliu.xyz/?a=commitdiff_plain;h=d77340ed53ab7b04e289569b00cb46bd6f3ec06b;p=dmenu.git fixed vlist select --- diff --git a/dmenu.c b/dmenu.c index b460701..2c1867c 100644 --- a/dmenu.c +++ b/dmenu.c @@ -24,6 +24,7 @@ static void calcoffsetsv(void); static char *cistrstr(const char *s, const char *sub); static void cleanup(void); static void dinput(void); +static void drawitem(char *s, unsigned long col[ColLast]); static void drawmenuh(void); static void drawmenuv(void); static void match(void); @@ -154,9 +155,14 @@ drawbar(void) { commitdraw(&dc, win); } +void +drawitem(char *s, unsigned long col[ColLast]) { + drawbox(&dc, col); + drawtext(&dc, s, col); +} + void drawmenuh(void) { - unsigned long *col; Item *i; dc.x += cmdw; @@ -165,9 +171,7 @@ drawmenuh(void) { dc.x += dc.w; for(i = curr; i != next; i = i->right) { dc.w = MIN(textw(&dc, i->text), mw / 3); - col = (sel == i) ? selcol : normcol; - drawbox(&dc, col); - drawtext(&dc, i->text, col); + drawitem(i->text, (sel == i) ? selcol : normcol); dc.x += dc.w; } dc.w = textw(&dc, ">"); @@ -183,7 +187,7 @@ drawmenuv(void) { dc.y = topbar ? dc.h : 0; dc.w = mw - dc.x; for(i = curr; i != next; i = i->right) { - drawtext(&dc, i->text, (sel == i) ? selcol : normcol); + drawitem(i->text, (sel == i) ? selcol : normcol); dc.y += dc.h; } if(!XGetWindowAttributes(dpy, win, &wa))