diff options
| author | okan <okan> | 2013-05-20 20:21:04 +0000 |
|---|---|---|
| committer | okan <okan> | 2013-05-20 20:21:04 +0000 |
| commit | 270df196ac17363536c44fe342b4e71e1c8450e3 (patch) | |
| tree | 73f285a3f099b8b96d5d7e8b8e9b297c01613842 /menu.c | |
| parent | e14123210a7773a0fda562eb367d71482c872e60 (diff) | |
| download | cwm-270df196ac17363536c44fe342b4e71e1c8450e3.tar.gz cwm-270df196ac17363536c44fe342b4e71e1c8450e3.tar.xz cwm-270df196ac17363536c44fe342b4e71e1c8450e3.zip | |
- configure menuwin with the screen, then create the xft drawable using
the menu window since that's the only place on which we draw - elminate the need to change the drawable on every font draw
Diffstat (limited to 'menu.c')
| -rw-r--r-- | menu.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/menu.c b/menu.c index e743ad2..5313efb 100644 --- a/menu.c +++ b/menu.c @@ -76,15 +76,6 @@ static int menu_calc_entry(struct menu_ctx *, int, int); static struct menu *menu_complete_path(struct menu_ctx *); static int menu_keycode(XKeyEvent *, enum ctltype *, char *); -void -menu_init(struct screen_ctx *sc) -{ - sc->menuwin = XCreateSimpleWindow(X_Dpy, sc->rootwin, 0, 0, 1, 1, - Conf.bwidth, - sc->xftcolor[CWM_COLOR_MENU_FG].pixel, - sc->xftcolor[CWM_COLOR_MENU_BG].pixel); -} - struct menu * menu_filter(struct screen_ctx *sc, struct menu_q *menuq, char *prompt, char *initial, int flags, @@ -417,7 +408,7 @@ menu_draw(struct menu_ctx *mc, struct menu_q *menuq, struct menu_q *resultq) mc->width, mc->height); if (mc->hasprompt) { - xu_xft_draw(sc, mc->dispstr, sc->menuwin, CWM_COLOR_MENU_FONT, + xu_xft_draw(sc, mc->dispstr, CWM_COLOR_MENU_FONT, 0, sc->xftfont->ascent); n = 1; } else @@ -432,7 +423,7 @@ menu_draw(struct menu_ctx *mc, struct menu_q *menuq, struct menu_q *resultq) if (mc->y + y > xine.h) break; - xu_xft_draw(sc, text, sc->menuwin, CWM_COLOR_MENU_FONT, 0, y); + xu_xft_draw(sc, text, CWM_COLOR_MENU_FONT, 0, y); n++; } if (mc->hasprompt && n > 1 && (mc->searchstr[0] != '\0')) { @@ -465,7 +456,7 @@ menu_draw_entry(struct menu_ctx *mc, struct menu_q *resultq, (sc->xftfont->height + 1) * entry, mc->width, (sc->xftfont->height + 1) + sc->xftfont->descent); color = active ? CWM_COLOR_MENU_FONT_SEL : CWM_COLOR_MENU_FONT; - xu_xft_draw(sc, text, sc->menuwin, color, + xu_xft_draw(sc, text, color, 0, (sc->xftfont->height + 1) * entry + sc->xftfont->ascent + 1); } |