diff options
| author | okan <okan> | 2012-12-17 18:34:06 +0000 |
|---|---|---|
| committer | okan <okan> | 2012-12-17 18:34:06 +0000 |
| commit | af13c081080574a036565e2fa7c761b6e6233068 (patch) | |
| tree | 4611b48a70693b368c7f843d991ed1ea38432609 /font.c | |
| parent | 82e8ec4245f44bd10c0fc5ed27640dafbb7beb44 (diff) | |
| download | cwm-af13c081080574a036565e2fa7c761b6e6233068.tar.gz cwm-af13c081080574a036565e2fa7c761b6e6233068.tar.xz cwm-af13c081080574a036565e2fa7c761b6e6233068.zip | |
stash the default screen visual and colormap in screen_ctx
Diffstat (limited to 'font.c')
| -rw-r--r-- | font.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/font.c b/font.c index 6aecf97..44d4666 100644 --- a/font.c +++ b/font.c @@ -55,7 +55,7 @@ font_init(struct screen_ctx *sc, const char *name, const char **color) XRenderColor c; sc->xftdraw = XftDrawCreate(X_Dpy, sc->rootwin, - DefaultVisual(X_Dpy, sc->which), DefaultColormap(X_Dpy, sc->which)); + sc->visual, sc->colormap); if (sc->xftdraw == NULL) errx(1, "XftDrawCreate"); @@ -66,9 +66,8 @@ font_init(struct screen_ctx *sc, const char *name, const char **color) for (i = 0; i < CWM_COLOR_MENU_MAX; i++) { if (*color[i] == '\0') break; - if (!XftColorAllocName(X_Dpy, DefaultVisual(X_Dpy, sc->which), - DefaultColormap(X_Dpy, sc->which), color[i], - &sc->xftcolor[i])) + if (!XftColorAllocName(X_Dpy, sc->visual, sc->colormap, + color[i], &sc->xftcolor[i])) errx(1, "XftColorAllocName"); } if (i == CWM_COLOR_MENU_MAX) @@ -77,9 +76,8 @@ font_init(struct screen_ctx *sc, const char *name, const char **color) xu_xorcolor(sc->xftcolor[CWM_COLOR_MENU_BG].color, sc->xftcolor[CWM_COLOR_MENU_FG].color, &c); xu_xorcolor(sc->xftcolor[CWM_COLOR_MENU_FONT].color, c, &c); - if (!XftColorAllocValue(X_Dpy, DefaultVisual(X_Dpy, sc->which), - DefaultColormap(X_Dpy, sc->which), &c, - &sc->xftcolor[CWM_COLOR_MENU_FONT_SEL])) + if (!XftColorAllocValue(X_Dpy, sc->visual, sc->colormap, + &c, &sc->xftcolor[CWM_COLOR_MENU_FONT_SEL])) errx(1, "XftColorAllocValue"); } |