From: David Hill <dhill@conformal.com>
Date: Thu, 19 Jul 2012 19:52:15 +0000 (-0400)
Subject: allow core fonts to load again.  this may need more magic.
X-Git-Url: https://jasonwoof.com/gitweb/?a=commitdiff_plain;ds=inline;h=ff9956dda8ed3a7d857646620e0392f5672e23a6;p=spectrwm.git

allow core fonts to load again.  this may need more magic.
---

diff --git a/spectrwm.c b/spectrwm.c
index 4ec1967..596db23 100644
--- a/spectrwm.c
+++ b/spectrwm.c
@@ -1866,7 +1866,8 @@ bar_refresh(void)
 void
 bar_setup(struct swm_region *r)
 {
-	char			*font;
+	char			*font, *fontpos;
+	int			count;
 	xcb_screen_t		*screen = get_screen(r->s->idx);
 	uint32_t		wa[3];
 	XRenderColor		color;
@@ -1883,7 +1884,20 @@ bar_setup(struct swm_region *r)
 				continue;
 
 			DNPRINTF(SWM_D_INIT, "bar_setup: try font %s\n", font);
-			bar_font = XftFontOpenName(display, r->s->idx, font);
+
+			count = 0;
+			fontpos = font;
+			while ((fontpos = index(fontpos, '-'))) {
+				count++;
+				fontpos++;
+			}
+
+			if (count == 14)
+				bar_font = XftFontOpenXlfd(display, r->s->idx,
+						font);
+			else
+				bar_font = XftFontOpenName(display, r->s->idx,
+						font);
 			if (!bar_font) {
 				warnx("unable to load font %s", font);
 				continue;