diff options
| author | okan <okan> | 2014-02-02 16:29:04 +0000 |
|---|---|---|
| committer | okan <okan> | 2014-02-02 16:29:04 +0000 |
| commit | ad1b78c6d1b466fbc2c11eec92ad5ce75bb44515 (patch) | |
| tree | 91d65e39a19d7e601855d32779b62bac76b0a6f9 /conf.c | |
| parent | 5f9c7a21c71d8386ae7eb7b03bdfb9c58dbe1b19 (diff) | |
| download | cwm-ad1b78c6d1b466fbc2c11eec92ad5ce75bb44515.tar.gz cwm-ad1b78c6d1b466fbc2c11eec92ad5ce75bb44515.tar.xz cwm-ad1b78c6d1b466fbc2c11eec92ad5ce75bb44515.zip | |
No need to store screen colormap and visual; rather just use the X
macros in the one place they are needed.
Diffstat (limited to 'conf.c')
| -rw-r--r-- | conf.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/conf.c b/conf.c index 4ab762f..2177930 100644 --- a/conf.c +++ b/conf.c @@ -125,6 +125,8 @@ conf_screen(struct screen_ctx *sc) { unsigned int i; XftColor xc; + Colormap colormap = DefaultColormap(X_Dpy, sc->which); + Visual *visual = DefaultVisual(X_Dpy, sc->which); sc->gap = Conf.gap; sc->snapdist = Conf.snapdist; @@ -141,18 +143,18 @@ conf_screen(struct screen_ctx *sc) 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, + if (!XftColorAllocValue(X_Dpy, visual, 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, + if (XftColorAllocName(X_Dpy, visual, colormap, Conf.color[i], &xc)) { sc->xftcolor[i] = xc; - XftColorFree(X_Dpy, sc->visual, sc->colormap, &xc); + XftColorFree(X_Dpy, visual, colormap, &xc); } else { warnx("XftColorAllocName: %s", Conf.color[i]); - XftColorAllocName(X_Dpy, sc->visual, sc->colormap, + XftColorAllocName(X_Dpy, visual, colormap, color_binds[i], &sc->xftcolor[i]); } } @@ -162,8 +164,7 @@ conf_screen(struct screen_ctx *sc) sc->xftcolor[CWM_COLOR_MENU_FG].pixel, sc->xftcolor[CWM_COLOR_MENU_BG].pixel); - sc->xftdraw = XftDrawCreate(X_Dpy, sc->menuwin, - sc->visual, sc->colormap); + sc->xftdraw = XftDrawCreate(X_Dpy, sc->menuwin, visual, colormap); if (sc->xftdraw == NULL) errx(1, "XftDrawCreate"); |