[CONTACT]

[ABOUT]

[POLICY]

git clone dmenu dmenu Log gph

Found at: gopher.r-36.net:70/scm/dmenu/commit/c805dcbeaff38dfcf78bdcc10c863eb7e1bbc32d.gph

tfix loadfont - dmenu - Dmenu fork with xft fonts.

git clone git://r-36.net/dmenu

Log

Files

Refs

README

LICENSE

---

commit c805dcbeaff38dfcf78bdcc10c863eb7e1bbc32d

parent a6cbc6c9a7b8cfbf7382a6a81450bf4466980a21

Author: Connor Lane Smith

Date:   Fri, 22 Jul 2011 18:16:57 +0100
fix loadfont
Diffstat:
  draw.c                              |      25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
---

diff --git a/draw.c b/draw.c

t@@ -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
.


AD: