diff options
| author | okan <okan> | 2012-12-17 02:53:29 +0000 |
|---|---|---|
| committer | okan <okan> | 2012-12-17 02:53:29 +0000 |
| commit | 96cd288a2a34e90eb617e2225615eeba2ba690fb (patch) | |
| tree | c14ff5cb6cea06c7a53085dbe70a5f4351be2ddd /menu.c | |
| parent | 6900cd36121062f81f29ec3651aa1ee8807edbe1 (diff) | |
| download | cwm-96cd288a2a34e90eb617e2225615eeba2ba690fb.tar.gz cwm-96cd288a2a34e90eb617e2225615eeba2ba690fb.tar.xz cwm-96cd288a2a34e90eb617e2225615eeba2ba690fb.zip | |
knf
Diffstat (limited to 'menu.c')
| -rw-r--r-- | menu.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/menu.c b/menu.c index 8a0ce26..dd6de18 100644 --- a/menu.c +++ b/menu.c @@ -473,17 +473,16 @@ menu_draw_entry(struct screen_ctx *sc, struct menu_ctx *mc, TAILQ_FOREACH(mi, resultq, resultentry) if (entry == i++) break; - if (mi == NULL) return; + color = active ? CWM_COLOR_MENU_FG : CWM_COLOR_MENU_BG; - text = mi->print[0] != '\0' ? - mi->print : mi->text; + text = mi->print[0] != '\0' ? mi->print : mi->text; XftDrawRect(sc->xftdraw, &sc->xftcolor[color], 0, - font_height(sc) * entry, mc->width, - font_height(sc) + font_descent(sc)); + font_height(sc) * entry, mc->width, + font_height(sc) + font_descent(sc)); font_draw(sc, text, strlen(text), sc->menuwin, active, - 0, font_height(sc) * entry + font_ascent(sc) + 1); + 0, font_height(sc) * entry + font_ascent(sc) + 1); } static void @@ -503,6 +502,7 @@ menu_handle_move(XEvent *e, struct menu_ctx *mc, struct screen_ctx *sc, menu_draw_entry(sc, mc, resultq, mc->entry, 1); } else (void)xu_ptr_regrab(MENUGRABMASK, Cursor_default); + if (mc->hasprompt) menu_draw_entry(sc, mc, resultq, 1, 1); } |