From 1f94cf68e821c1e6e3850f540d098737baf9ba00 Mon Sep 17 00:00:00 2001
From: okan
Date: Sun, 19 May 2013 23:16:29 +0000
Subject: move the rest of xft init into screen_conf, since most of it is based
 on config parameters.

---
 conf.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'conf.c')

diff --git a/conf.c b/conf.c
index 128bcd9..1f0e2da 100644
--- a/conf.c
+++ b/conf.c
@@ -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.127 2013/05/19 23:09:59 okan Exp $
+ * $OpenBSD: conf.c,v 1.128 2013/05/19 23:16:29 okan Exp $
  */
 
 #include <sys/param.h>
@@ -103,7 +103,14 @@ conf_screen(struct screen_ctx *sc)
 
 	sc->gap = Conf.gap;
 
-	font_init(sc, Conf.font);
+	sc->xftdraw = XftDrawCreate(X_Dpy, sc->rootwin,
+	    sc->visual, sc->colormap);
+	if (sc->xftdraw == NULL)
+		errx(1, "XftDrawCreate");
+
+	sc->xftfont = XftFontOpenName(X_Dpy, sc->which, Conf.font);
+	if (sc->xftfont == NULL)
+		errx(1, "XftFontOpenName");
 
 	for (i = 0; i < CWM_COLOR_MAX; i++) {
 		if (*Conf.color[i] == '\0')
-- 
cgit v1.2.3-2-gb3c3