[hackers] [dmenu] fix loadfont || Connor Lane Smith

changeset: 432:4b44e3cbdb64
tag: tip
user: Connor Lane Smith <cls_AT_lubutu.com>
date: Fri Jul 22 18:16:57 2011 +0100
files: draw.c
description:
fix loadfont

diff -r e1fea43313f5 -r 4b44e3cbdb64 draw.c
--- a/draw.c Tue Jul 19 21:30:14 2011 +0100
+++ b/draw.c Fri Jul 22 18:16:57 2011 +0100
@@ -121,26 +121,27 @@
 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
Received on Fri Jul 22 2011 - 19:17:21 CEST