iUse XftFontMatch in place of FcFontMatch. - st - Simple Terminal Err gopher.r-36.net 70 i Err gopher.r-36.net 70 1Log /scm/st//log.gph gopher.r-36.net 70 1Files /scm/st//files.gph gopher.r-36.net 70 1Refs /scm/st//refs.gph gopher.r-36.net 70 1README /scm/st//file/README.gph gopher.r-36.net 70 1LICENSE /scm/st//file/LICENSE.gph gopher.r-36.net 70 i--- Err gopher.r-36.net 70 1commit 528241aa3835e2f1f052abeeaf891737712955a0 /scm/st//commit/528241aa3835e2f1f052abeeaf891737712955a0.gph gopher.r-36.net 70 1parent 60aeb37edb8c5280d31b6b3c801d09c7a5fdca76 /scm/st//commit/60aeb37edb8c5280d31b6b3c801d09c7a5fdca76.gph gopher.r-36.net 70 hAuthor: Christoph Lohmann <20h@r-36.net> URL:mailto:20h@r-36.net gopher.r-36.net 70 iDate: Fri, 3 Jun 2016 15:02:32 +0200 Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iUse XftFontMatch in place of FcFontMatch. Err gopher.r-36.net 70 i Err gopher.r-36.net 70 igit am -s didn't like your patch: Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iFrom: Mark Edgar Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iXftFontMatch calls XftDefaultSubstitute which configures various match Err gopher.r-36.net 70 iproperties according to the user's configured Xft defaults (xrdb) as well as Err gopher.r-36.net 70 iaccording to the current display and screen. Most importantly, the screen DPI Err gopher.r-36.net 70 iis computed [1]. Without this, st uses a "default" DPI of 75 [2]. Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i[1]: https://cgit.freedesktop.org/xorg/lib/libXft/tree/src/xftdpy.c?id=libXft-2.3.2#n535 Err gopher.r-36.net 70 i[2]: https://cgit.freedesktop.org/fontconfig/tree/src/fcdefault.c?id=2.11.1#n255 Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iDiffstat: Err gopher.r-36.net 70 i st.c | 5 +---- Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i1 file changed, 1 insertion(+), 4 deletions(-) Err gopher.r-36.net 70 i--- Err gopher.r-36.net 70 1diff --git a/st.c b/st.c /scm/st//file/st.c.gph gopher.r-36.net 70 i@@ -3279,7 +3279,7 @@ xloadfont(Font *f, FcPattern *pattern) Err gopher.r-36.net 70 i FcResult result; Err gopher.r-36.net 70 i XGlyphInfo extents; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- match = FcFontMatch(NULL, pattern, &result); Err gopher.r-36.net 70 i+ match = XftFontMatch(xw.dpy, xw.scr, pattern, &result); Err gopher.r-36.net 70 i if (!match) Err gopher.r-36.net 70 i return 1; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -3345,9 +3345,6 @@ xloadfonts(char *fontstr, double fontsize) Err gopher.r-36.net 70 i defaultfontsize = usedfontsize; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- FcConfigSubstitute(0, pattern, FcMatchPattern); Err gopher.r-36.net 70 i- FcDefaultSubstitute(pattern); Err gopher.r-36.net 70 i- Err gopher.r-36.net 70 i if (xloadfont(&dc.font, pattern)) Err gopher.r-36.net 70 i die("st: can't open font %s\n", fontstr); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 .