From 4d5dc5d9ea24d1b856c8b8c13c36a16daa396a4d Mon Sep 17 00:00:00 2001 From: okan Date: Sun, 17 May 2009 23:40:57 +0000 Subject: a long time coming - re-work the way we deal with colors: since we're using Xft(3), use it to select the font color as well instead of trying to build one; properly allocate and free colors at-will, e.g. we now have configurable colors. feedback and ok's todd@ and oga@ --- menu.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'menu.c') diff --git a/menu.c b/menu.c index 7d0e1d8..f8c8abc 100644 --- a/menu.c +++ b/menu.c @@ -58,8 +58,19 @@ static int menu_calc_entry(struct screen_ctx *, struct menu_ctx *, void menu_init(struct screen_ctx *sc) { - sc->menuwin = XCreateSimpleWindow(X_Dpy, sc->rootwin, 0, 0, - 1, 1, 1, sc->blackpixl, sc->whitepixl); + XGCValues gv; + + sc->menuwin = XCreateSimpleWindow(X_Dpy, sc->rootwin, 0, 0, 1, 1, 0, + sc->color[CWM_COLOR_BG_MENU].pixel, + sc->color[CWM_COLOR_BG_MENU].pixel); + + gv.foreground = + sc->color[CWM_COLOR_FG_MENU].pixel^sc->color[CWM_COLOR_BG_MENU].pixel; + gv.background = sc->color[CWM_COLOR_BG_MENU].pixel; + gv.function = GXxor; + + sc->gc = XCreateGC(X_Dpy, sc->menuwin, + GCForeground|GCBackground|GCFunction, &gv); } struct menu * -- cgit 1.4.1