diff options
Diffstat (limited to '')
| -rw-r--r-- | calmwm.c | 5 | ||||
| -rw-r--r-- | calmwm.h | 4 | ||||
| -rw-r--r-- | conf.c | 15 | ||||
| -rw-r--r-- | screen.c | 4 |
4 files changed, 13 insertions, 15 deletions
@@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: calmwm.c,v 1.88 2014/02/01 00:25:04 okan Exp $ + * $OpenBSD: calmwm.c,v 1.89 2014/02/02 16:29:04 okan Exp $ */ #include <sys/param.h> @@ -162,7 +162,8 @@ x_teardown(void) TAILQ_FOREACH(sc, &Screenq, entry) { for (i = 0; i < CWM_COLOR_NITEMS; i++) - XftColorFree(X_Dpy, sc->visual, sc->colormap, + XftColorFree(X_Dpy, DefaultVisual(X_Dpy, sc->which), + DefaultColormap(X_Dpy, sc->which), &sc->xftcolor[i]); XftDrawDestroy(sc->xftdraw); XftFontClose(X_Dpy, sc->xftfont); @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: calmwm.h,v 1.255 2014/02/02 15:46:05 okan Exp $ + * $OpenBSD: calmwm.h,v 1.256 2014/02/02 16:29:04 okan Exp $ */ #ifndef _CALMWM_H_ @@ -221,8 +221,6 @@ TAILQ_HEAD(autogroupwin_q, autogroupwin); struct screen_ctx { TAILQ_ENTRY(screen_ctx) entry; int which; - Visual *visual; - Colormap colormap; Window rootwin; Window menuwin; int cycling; @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: conf.c,v 1.171 2014/02/02 15:46:05 okan Exp $ + * $OpenBSD: conf.c,v 1.172 2014/02/02 16:29:04 okan Exp $ */ #include <sys/param.h> @@ -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"); @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: screen.c,v 1.56 2014/02/02 16:13:50 okan Exp $ + * $OpenBSD: screen.c,v 1.57 2014/02/02 16:29:04 okan Exp $ */ #include <sys/param.h> @@ -44,8 +44,6 @@ screen_init(int which) TAILQ_INIT(&sc->mruq); sc->which = which; - sc->visual = DefaultVisual(X_Dpy, sc->which); - sc->colormap = DefaultColormap(X_Dpy, sc->which); sc->rootwin = RootWindow(X_Dpy, sc->which); conf_screen(sc); |