From a83ec02263f57eac22f091d37c7e678aed7b8d38 Mon Sep 17 00:00:00 2001
From: okan
Date: Sun, 17 May 2009 23:40:57 +0000
Subject: a long time coming - re-work the way we deal with colors: since we're
 using Xft(3), use it to select the font color as well instead of trying to
 build one; properly allocate and free colors at-will, e.g. we now have
 configurable colors.

feedback and ok's todd@ and oga@
---
 font.c | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'font.c')

diff --git a/font.c b/font.c
index 622d17b..0322d50 100644
--- a/font.c
+++ b/font.c
@@ -22,22 +22,14 @@
 void
 font_init(struct screen_ctx *sc)
 {
-	XColor	 xcolor, tmp;
-
 	sc->xftdraw = XftDrawCreate(X_Dpy, sc->rootwin,
 	    DefaultVisual(X_Dpy, sc->which), DefaultColormap(X_Dpy, sc->which));
 	if (sc->xftdraw == NULL)
 		errx(1, "XftDrawCreate");
 
-	if (!XAllocNamedColor(X_Dpy, DefaultColormap(X_Dpy, sc->which),
-	    "black", &xcolor, &tmp))
-		errx(1, "XAllocNamedColor");
-
-	sc->xftcolor.color.red = xcolor.red;
-	sc->xftcolor.color.green = xcolor.green;
-	sc->xftcolor.color.blue = xcolor.blue;
-	sc->xftcolor.color.alpha = 0x00ff00;
-	sc->xftcolor.pixel = xcolor.pixel;
+	if (!XftColorAllocName(X_Dpy, DefaultVisual(X_Dpy, sc->which),
+	    DefaultColormap(X_Dpy, sc->which), "black", &sc->xftcolor))
+		errx(1, "XftColorAllocName");
 }
 
 int
-- 
cgit v1.2.3-2-gb3c3