move the rest of xft init into screen_conf, since most of it is based on

config parameters.

3 files changed, 11 insertions, 18 deletions

diff --git a/calmwm.h b/calmwm.h
index 844c957..529d463 100644
--- a/calmwm.h
+++ b/calmwm.h
@@ -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.203 2013/05/19 23:09:59 okan Exp $
+ * $OpenBSD: calmwm.h,v 1.204 2013/05/19 23:16:29 okan Exp $
  */
 
 #ifndef _CALMWM_H_
@@ -446,7 +446,6 @@ void			 conf_ungrab(struct conf *, struct keybinding *);
 
 void			 font_draw(struct screen_ctx *, const char *,
 			     Drawable, int, int, int);
-void			 font_init(struct screen_ctx *, const char *);
 int			 font_width(XftFont *, const char *, int);
 
 void			 xev_loop(void);
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')
diff --git a/font.c b/font.c
index eb61d06..de1f10f 100644
--- a/font.c
+++ b/font.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: font.c,v 1.27 2013/05/19 23:09:59 okan Exp $
+ * $OpenBSD: font.c,v 1.28 2013/05/19 23:16:29 okan Exp $
  */
 
 #include <sys/param.h>
@@ -30,19 +30,6 @@
 
 #include "calmwm.h"
 
-void
-font_init(struct screen_ctx *sc, const char *name)
-{
-	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, name);
-	if (sc->xftfont == NULL)
-		errx(1, "XftFontOpenName");
-}
-
 int
 font_width(XftFont *xftfont, const char *text, int len)
 {