commit c805dcbeaff38dfcf78bdcc10c863eb7e1bbc32d
from: Connor Lane Smith <cls@lubutu.com>
date: Fri Jul 22 17:16:57 2011 UTC

fix loadfont

commit - a6cbc6c9a7b8cfbf7382a6a81450bf4466980a21
commit + c805dcbeaff38dfcf78bdcc10c863eb7e1bbc32d
blob - d0beee8ef28d23a6f21ae412a17f4600aaa403ad
blob + 76f0c54eeff3086399a10d1698e0c47ea7ff056b
--- draw.c
+++ draw.c
@@ -121,26 +121,27 @@ initfont(DC *dc, const char *fontstr) {
 Bool
 loadfont(DC *dc, const char *fontstr) {
 	char *def, **missing, **names;
-	int i, n = 1;
+	int i, n;
 	XFontStruct **xfonts;
 
 	if(!*fontstr)
 		return False;
-	if((dc->font.set = XCreateFontSet(dc->dpy, fontstr, &missing, &n, &def)))
+	if((dc->font.set = XCreateFontSet(dc->dpy, fontstr, &missing, &n, &def))) {
 		n = XFontsOfFontSet(dc->font.set, &xfonts, &names);
-	else if((dc->font.xfont = XLoadQueryFont(dc->dpy, fontstr)))
-		xfonts = &dc->font.xfont;
-	else
-		n = 0;
-
-	for(i = 0; i < n; i++) {
-		dc->font.ascent  = MAX(dc->font.ascent,  xfonts[i]->ascent);
-		dc->font.descent = MAX(dc->font.descent, xfonts[i]->descent);
-		dc->font.width   = MAX(dc->font.width,   xfonts[i]->max_bounds.width);
+		for(i = 0; i < n; i++) {
+			dc->font.ascent  = MAX(dc->font.ascent,  xfonts[i]->ascent);
+			dc->font.descent = MAX(dc->font.descent, xfonts[i]->descent);
+			dc->font.width   = MAX(dc->font.width,   xfonts[i]->max_bounds.width);
+		}
 	}
+	else if((dc->font.xfont = XLoadQueryFont(dc->dpy, fontstr))) {
+		dc->font.ascent  = dc->font.xfont->ascent;
+		dc->font.descent = dc->font.xfont->descent;
+		dc->font.width   = dc->font.xfont->max_bounds.width;
+	}
 	if(missing)
 		XFreeStringList(missing);
-	return (dc->font.set || dc->font.xfont);
+	return dc->font.set || dc->font.xfont;
 }
 
 void