|
|
@ -261,11 +261,9 @@ initfont(const char *fontstr) { |
|
|
|
XFreeStringList(missing); |
|
|
|
XFreeStringList(missing); |
|
|
|
} |
|
|
|
} |
|
|
|
if(dc.font.set) { |
|
|
|
if(dc.font.set) { |
|
|
|
XFontSetExtents *font_extents; |
|
|
|
|
|
|
|
XFontStruct **xfonts; |
|
|
|
XFontStruct **xfonts; |
|
|
|
char **font_names; |
|
|
|
char **font_names; |
|
|
|
dc.font.ascent = dc.font.descent = 0; |
|
|
|
dc.font.ascent = dc.font.descent = 0; |
|
|
|
font_extents = XExtentsOfFontSet(dc.font.set); |
|
|
|
|
|
|
|
n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names); |
|
|
|
n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names); |
|
|
|
for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) { |
|
|
|
for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) { |
|
|
|
dc.font.ascent = MAX(dc.font.ascent, (*xfonts)->ascent); |
|
|
|
dc.font.ascent = MAX(dc.font.ascent, (*xfonts)->ascent); |
|
|
|