update draw.c

2 files changed, 14 insertions, 14 deletions

diff --git a/draw.c b/draw.c
index f952b53..2028fd9 100644
--- a/draw.c
+++ b/draw.c
@@ -120,24 +120,23 @@ 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))) {
-                dc->font.ascent = dc->font.xfont->ascent;
-                dc->font.descent = dc->font.xfont->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);
         }
         if(missing)
                 XFreeStringList(missing);
diff --git a/draw.h b/draw.h
index 247c0b3..43a57bf 100644
--- a/draw.h
+++ b/draw.h
@@ -15,6 +15,7 @@ typedef struct {
                 int ascent;
                 int descent;
                 int height;
+                int width;
                 XFontSet set;
                 XFontStruct *xfont;
         } font;