diff options
author | okan <okan> | 2012-12-17 02:28:45 +0000 |
---|---|---|
committer | okan <okan> | 2012-12-17 02:28:45 +0000 |
commit | 6900cd36121062f81f29ec3651aa1ee8807edbe1 (patch) | |
tree | bbbf15f9401923e29d45105572ce8727e74c3267 /conf.c | |
parent | a3aaad2c187278b7ac1cf75cb03882dd3d20f29b (diff) | |
download | cwm-6900cd36121062f81f29ec3651aa1ee8807edbe1.tar.gz cwm-6900cd36121062f81f29ec3651aa1ee8807edbe1.tar.xz cwm-6900cd36121062f81f29ec3651aa1ee8807edbe1.zip |
non-trivial menu drawing rewrite, moving to Xft and solving various
font/color drawing issues; from Alexander Polakov
Diffstat (limited to 'conf.c')
-rw-r--r-- | conf.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/conf.c b/conf.c index 2fe7363..a42be91 100644 --- a/conf.c +++ b/conf.c @@ -62,17 +62,21 @@ conf_gap(struct conf *c, struct screen_ctx *sc) void conf_font(struct conf *c, struct screen_ctx *sc) { - font_init(sc, c->font, c->color[CWM_COLOR_FONT].name); + font_init(sc, c->font, (const char**)c->menucolor); } -static struct color color_binds[] = { +static char *menu_color_binds[CWM_COLOR_MENU_MAX] = { + "black", /* CWM_COLOR_MENU_FG */ + "white", /* CWM_COLOR_MENU_BG */ + "black", /* CWM_COLOR_MENU_FONT */ + "", /* CWM_COLOR_MENU_FONT_SEL */ +}; + +static struct color color_binds[CWM_COLOR_MAX] = { { "#CCCCCC", 0 }, /* CWM_COLOR_BORDER_ACTIVE */ { "#666666", 0 }, /* CWM_COLOR_BORDER_INACTIVE */ { "blue", 0 }, /* CWM_COLOR_BORDER_GROUP */ { "red", 0 }, /* CWM_COLOR_BORDER_UNGROUP */ - { "black", 0 }, /* CWM_COLOR_FG_MENU */ - { "white", 0 }, /* CWM_COLOR_BG_MENU */ - { "black", 0 }, /* CWM_COLOR_FONT */ }; void @@ -182,6 +186,9 @@ conf_init(struct conf *c) for (i = 0; i < nitems(color_binds); i++) c->color[i].name = xstrdup(color_binds[i].name); + for (i = 0; i < nitems(menu_color_binds); i++) + c->menucolor[i] = xstrdup(menu_color_binds[i]); + /* Default term/lock */ (void)strlcpy(c->termpath, "xterm", sizeof(c->termpath)); (void)strlcpy(c->lockpath, "xlock", sizeof(c->lockpath)); |