From 4c4c8d61c662cfe45e4aa6b6662a1c00947225db Mon Sep 17 00:00:00 2001
From: okan
Date: Tue, 8 Dec 2009 16:52:17 +0000
Subject: start fixing screen_ctx usage, for it is utterly broken.  bring font
 into screen_ctx and start passing screen_ctx around to in order get rid of
 Curscreen; fixup per-screen config colors the same way.

diff mostly from oga@, with a bit harsher reaction to the state of screen_ctx.

"please commit" oga@
---
 font.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'font.c')

diff --git a/font.c b/font.c
index 0322d50..0f58c82 100644
--- a/font.c
+++ b/font.c
@@ -33,11 +33,11 @@ font_init(struct screen_ctx *sc)
 }
 
 int
-font_width(const char *text, int len)
+font_width(struct screen_ctx *sc, const char *text, int len)
 {
 	XGlyphInfo	 extents;
 
-	XftTextExtents8(X_Dpy, Conf.DefaultFont, (const XftChar8*)text,
+	XftTextExtents8(X_Dpy, sc->font, (const XftChar8*)text,
 	    len, &extents);
 
 	return (extents.xOff);
@@ -49,7 +49,7 @@ font_draw(struct screen_ctx *sc, const char *text, int len,
 {
 	XftDrawChange(sc->xftdraw, d);
 	/* Really needs to be UTF8'd. */
-	XftDrawString8(sc->xftdraw, &sc->xftcolor, Conf.DefaultFont, x, y,
+	XftDrawString8(sc->xftdraw, &sc->xftcolor, sc->font, x, y,
 	    (const FcChar8*)text, len);
 }
 
-- 
cgit v1.2.3-2-gb3c3