aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Lohmann <20h@r-36.net>2016-06-03 15:02:32 +0200
committerChristoph Lohmann <20h@r-36.net>2016-06-03 15:02:32 +0200
commit528241aa3835e2f1f052abeeaf891737712955a0 (patch)
tree4045741b3749ad09128516d7430063b45e49775f
parent60aeb37edb8c5280d31b6b3c801d09c7a5fdca76 (diff)
downloadst-patched-528241aa3835e2f1f052abeeaf891737712955a0.tar.bz2
st-patched-528241aa3835e2f1f052abeeaf891737712955a0.tar.xz
st-patched-528241aa3835e2f1f052abeeaf891737712955a0.zip
Use XftFontMatch in place of FcFontMatch.
git am -s didn't like your patch: From: Mark Edgar <medgar123@gmail.com> XftFontMatch calls XftDefaultSubstitute which configures various match properties according to the user's configured Xft defaults (xrdb) as well as according to the current display and screen. Most importantly, the screen DPI is computed [1]. Without this, st uses a "default" DPI of 75 [2]. [1]: https://cgit.freedesktop.org/xorg/lib/libXft/tree/src/xftdpy.c?id=libXft-2.3.2#n535 [2]: https://cgit.freedesktop.org/fontconfig/tree/src/fcdefault.c?id=2.11.1#n255
-rw-r--r--st.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/st.c b/st.c
index 6736464..2594c65 100644
--- a/st.c
+++ b/st.c
@@ -3279,7 +3279,7 @@ xloadfont(Font *f, FcPattern *pattern)
3279 FcResult result; 3279 FcResult result;
3280 XGlyphInfo extents; 3280 XGlyphInfo extents;
3281 3281
3282 match = FcFontMatch(NULL, pattern, &result); 3282 match = XftFontMatch(xw.dpy, xw.scr, pattern, &result);
3283 if (!match) 3283 if (!match)
3284 return 1; 3284 return 1;
3285 3285
@@ -3345,9 +3345,6 @@ xloadfonts(char *fontstr, double fontsize)
3345 defaultfontsize = usedfontsize; 3345 defaultfontsize = usedfontsize;
3346 } 3346 }
3347 3347
3348 FcConfigSubstitute(0, pattern, FcMatchPattern);
3349 FcDefaultSubstitute(pattern);
3350
3351 if (xloadfont(&dc.font, pattern)) 3348 if (xloadfont(&dc.font, pattern))
3352 die("st: can't open font %s\n", fontstr); 3349 die("st: can't open font %s\n", fontstr);
3353 3350