Commit Diff

Commit:
f7cbe710a266448122d89a02b8ba8c70423fc750
From:
Connor Lane Smith <cls@lubutu.com>
Date:
Message:
update draw.c
Actions:
Patch | Tree
commit - 723cbabc122292cc87474fd203e199e392206640
commit + f7cbe710a266448122d89a02b8ba8c70423fc750
blob - f952b534f89d6bea5303e560cc139e86ea0b8f63
blob + 2028fd94d2d72d239929018afe32d36d9c86774b
--- draw.c
+++ draw.c
@@ -120,25 +120,24 @@ initfont(DC *dc, const char *fontstr) {
 
 Bool
 loadfont(DC *dc, const char *fontstr) {
-	char *def, **missing;
-	int i, n;
+	char *def, **missing, **names;
+	int i, n = 1;
+	XFontStruct **xfonts;
 
 	if(!*fontstr)
 		return False;
-	if((dc->font.set = XCreateFontSet(dc->dpy, fontstr, &missing, &n, &def))) {
-		char **names;
-		XFontStruct **xfonts;
-
+	if((dc->font.set = XCreateFontSet(dc->dpy, fontstr, &missing, &n, &def)))
 		n = XFontsOfFontSet(dc->font.set, &xfonts, &names);
-		for(i = dc->font.ascent = dc->font.descent = 0; i < n; i++) {
-			dc->font.ascent = MAX(dc->font.ascent, xfonts[i]->ascent);
-			dc->font.descent = MAX(dc->font.descent, xfonts[i]->descent);
-		}
+	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);
 	}
-	else if((dc->font.xfont = XLoadQueryFont(dc->dpy, fontstr))) {
-		dc->font.ascent = dc->font.xfont->ascent;
-		dc->font.descent = dc->font.xfont->descent;
-	}
 	if(missing)
 		XFreeStringList(missing);
 	return (dc->font.set || dc->font.xfont);
blob - 247c0b318607b0d9d4dae7aba5774ebcec4f9f28
blob + 43a57bf6fe4ce49599e861c9fcb9e2e97df76134
--- draw.h
+++ draw.h
@@ -15,6 +15,7 @@ typedef struct {
 		int ascent;
 		int descent;
 		int height;
+		int width;
 		XFontSet set;
 		XFontStruct *xfont;
 	} font;