diff options
Diffstat (limited to '')
| -rw-r--r-- | dmenu/dmenu.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/dmenu/dmenu.c b/dmenu/dmenu.c index 9ff0211..d8540f2 100644 --- a/dmenu/dmenu.c +++ b/dmenu/dmenu.c @@ -36,7 +36,7 @@ #define OPAQUE 0xffu /* enums */ -enum { SchemeNorm, SchemeSel, SchemeOut, SchemeLast }; /* color schemes */ +enum { SchemeNorm, SchemeSel, SchemeOut, SchemePrompt, SchemeLast }; /* color schemes */ struct item { char *text; @@ -170,21 +170,23 @@ static void drawmenu(void) { drw_setscheme(drw, scheme[SchemeNorm]); drw_rect(drw, 0, 0, mw, mh, 1, 1); - if (prompt && *prompt) { - drw_setscheme(drw, scheme[SchemeSel]); - x = drw_text(drw, x, 0, promptw, bh, lrpad / 2, prompt, 0); - } - /* draw input field */ w = (lines > 0 || !matches) ? mw - x : inputw; - drw_setscheme(drw, scheme[SchemeNorm]); - drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0); - - curpos = TEXTW(text) - TEXTW(&text[cursor]); - if ((curpos += lrpad / 2 - 1) < w) { + if (text[0] == '\0' && prompt && *prompt) { + drw_setscheme(drw, scheme[SchemePrompt]); + /* If vertical list: use full width (w), else just promptw */ + drw_text(drw, x, 0, (lines > 0 ? w : promptw), bh, lrpad / 2, prompt, 0); + } else { drw_setscheme(drw, scheme[SchemeNorm]); - drw_rect(drw, x + curpos, 2, 2, bh - 4, 1, 0); + drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0); } + if (text[0] != '\0') { + curpos = TEXTW(text) - TEXTW(&text[cursor]); + if ((curpos += lrpad / 2 - 1) < w) { + drw_setscheme(drw, scheme[SchemeNorm]); + drw_rect(drw, x + curpos, 1, 2, bh - 4, 1, 0); + } + } if (lines > 0) { /* draw grid */ int i = 0; |