 |
tupdate draw.c - dwm - [fork] customized build of dwm, the dynamic window manag… |
 |
git clone git://src.adamsgaard.dk/dwm |
 |
Log |
|
Files |
|
Refs |
|
README |
|
LICENSE |
|
--- |
|
commit 04797343db457578906355cf1118548be90a183e |
|
parent e7d41cc18824114300a09d3bdb26c536f30b466e |
|
Author: Connor Lane Smith <[email protected]> |
|
Date: Sat, 21 May 2011 20:26:26 +0100 |
|
|
|
update draw.c |
|
Diffstat: |
|
M draw.c | 10 +++++----- |
|
|
|
1 file changed, 5 insertions(+), 5 deletions(-) |
|
--- |
|
diff --git a/draw.c b/draw.c |
|
t@@ -126,13 +126,13 @@ loadfont(DC *dc, const char *fontstr) { |
|
|
|
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 { |
|
- dc->font.xfont = XLoadQueryFont(dc->dpy, fontstr); |
|
+ 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); |
