|
@ -3279,7 +3279,7 @@ xloadfont(Font *f, FcPattern *pattern) |
|
|
FcResult result; |
|
|
FcResult result; |
|
|
XGlyphInfo extents; |
|
|
XGlyphInfo extents; |
|
|
|
|
|
|
|
|
match = FcFontMatch(NULL, pattern, &result); |
|
|
|
|
|
|
|
|
match = XftFontMatch(xw.dpy, xw.scr, pattern, &result); |
|
|
if (!match) |
|
|
if (!match) |
|
|
return 1; |
|
|
return 1; |
|
|
|
|
|
|
|
@ -3345,9 +3345,6 @@ xloadfonts(char *fontstr, double fontsize) |
|
|
defaultfontsize = usedfontsize; |
|
|
defaultfontsize = usedfontsize; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
FcConfigSubstitute(0, pattern, FcMatchPattern); |
|
|
|
|
|
FcDefaultSubstitute(pattern); |
|
|
|
|
|
|
|
|
|
|
|
if (xloadfont(&dc.font, pattern)) |
|
|
if (xloadfont(&dc.font, pattern)) |
|
|
die("st: can't open font %s\n", fontstr); |
|
|
die("st: can't open font %s\n", fontstr); |
|
|
|
|
|
|
|
|