diff options
| author | okan <okan> | 2013-06-23 17:57:50 +0000 |
|---|---|---|
| committer | okan <okan> | 2013-06-23 17:57:50 +0000 |
| commit | fbcdce6be90df22da222192f4c54b170e945f36f (patch) | |
| tree | 55b0238f10df878cec77df8767b50982d88df99b | |
| parent | 7004700ce0b216f4ea4bb84043acb311928c9a6d (diff) | |
| download | cwm-fbcdce6be90df22da222192f4c54b170e945f36f.tar.gz cwm-fbcdce6be90df22da222192f4c54b170e945f36f.tar.xz cwm-fbcdce6be90df22da222192f4c54b170e945f36f.zip | |
properly fix (and re-organize) selfont selection.
| -rw-r--r-- | conf.c | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/conf.c b/conf.c index 4ee5b3f..a771963 100644 --- a/conf.c +++ b/conf.c @@ -84,7 +84,7 @@ conf_ignore(struct conf *c, char *val) TAILQ_INSERT_TAIL(&c->ignoreq, wm, entry); } -static char *color_binds[CWM_COLOR_MAX] = { +static char *color_binds[] = { "#CCCCCC", /* CWM_COLOR_BORDER_ACTIVE */ "#666666", /* CWM_COLOR_BORDER_INACTIVE */ "blue", /* CWM_COLOR_BORDER_GROUP */ @@ -107,9 +107,16 @@ conf_screen(struct screen_ctx *sc) if (sc->xftfont == NULL) errx(1, "XftFontOpenName"); - for (i = 0; i < CWM_COLOR_MAX; i++) { - if (*Conf.color[i] == '\0') + for (i = 0; i < nitems(color_binds); i++) { + if (i == CWM_COLOR_MENU_FONT_SEL && *Conf.color[i] == '\0') { + xu_xorcolor(sc->xftcolor[CWM_COLOR_MENU_BG], + sc->xftcolor[CWM_COLOR_MENU_FG], &xc); + xu_xorcolor(sc->xftcolor[CWM_COLOR_MENU_FONT], xc, &xc); + if (!XftColorAllocValue(X_Dpy, sc->visual, sc->colormap, + &xc.color, &sc->xftcolor[CWM_COLOR_MENU_FONT_SEL])) + warnx("XftColorAllocValue: '%s'", Conf.color[i]); break; + } if (XftColorAllocName(X_Dpy, sc->visual, sc->colormap, Conf.color[i], &xc)) { sc->xftcolor[i] = xc; @@ -120,16 +127,7 @@ conf_screen(struct screen_ctx *sc) color_binds[i], &sc->xftcolor[i]); } } - if (i == CWM_COLOR_MAX) - goto out; - - xu_xorcolor(sc->xftcolor[CWM_COLOR_MENU_BG], - sc->xftcolor[CWM_COLOR_MENU_FG], &xc); - xu_xorcolor(sc->xftcolor[CWM_COLOR_MENU_FONT], xc, &xc); - if (!XftColorAllocValue(X_Dpy, sc->visual, sc->colormap, - &xc.color, &sc->xftcolor[CWM_COLOR_MENU_FONT_SEL])) - warnx("XftColorAllocValue: '%s'", Conf.color[i]); -out: + sc->menuwin = XCreateSimpleWindow(X_Dpy, sc->rootwin, 0, 0, 1, 1, Conf.bwidth, sc->xftcolor[CWM_COLOR_MENU_FG].pixel, |