[hackers] [dmenu] update draw.c || Connor Lane Smith

changeset: 419:907b03ca997d
tag: tip
parent: 414:6f2996a6a294
user: Connor Lane Smith <cls_AT_lubutu.com>
date: Sat Jun 18 22:11:19 2011 +0100
files: draw.c draw.h
description:
update draw.c

diff -r 6f2996a6a294 -r 907b03ca997d draw.c
--- a/draw.c Mon Jun 13 19:25:40 2011 +0100
+++ b/draw.c Sat Jun 18 22:11:19 2011 +0100
@@ -120,24 +120,23 @@
 
 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);
+ else if((dc->font.xfont = XLoadQueryFont(dc->dpy, fontstr)))
+ xfonts = &dc->font.xfont;
+ else
+ n = 0;
 
- 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;
+ 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 -r 6f2996a6a294 -r 907b03ca997d draw.h
--- a/draw.h Mon Jun 13 19:25:40 2011 +0100
+++ b/draw.h Sat Jun 18 22:11:19 2011 +0100
@@ -15,6 +15,7 @@
                 int ascent;
                 int descent;
                 int height;
+ int width;
                 XFontSet set;
                 XFontStruct *xfont;
         } font;
Received on Sat Jun 18 2011 - 23:11:30 CEST