Lazy fontset loading. Thanks Johannes Hofmann <Johannes.Hofmann@gmx.de>!
Christoph Lohmann 20h@r-36.net
1 files changed,
15 insertions(+),
6 deletions(-)
jump to
M
st.c
→
st.c
@@ -363,6 +363,7 @@ static void xloadcols(void);
static int xsetcolorname(int, const char *); static int xloadfont(Font *, FcPattern *); static void xloadfonts(char *, int); +static int xloadfontset(Font *); static void xsettitle(char *); static void xresettitle(void); static void xseturgency(int);@@ -2643,16 +2644,12 @@ match = FcFontMatch(NULL, pattern, &result);
if(!match) return 1; - if(!(f->set = FcFontSort(0, match, FcTrue, 0, &result))) { - FcPatternDestroy(match); - return 1; - } - if(!(f->match = XftFontOpenPattern(xw.dpy, match))) { FcPatternDestroy(match); return 1; } + f->set = NULL; f->pattern = FcPatternDuplicate(pattern); f->ascent = f->match->ascent;@@ -2725,6 +2722,15 @@ if(xloadfont(&dc.bfont, pattern))
die("st: can't open font %s\n", fontstr); FcPatternDestroy(pattern); +} + +int +xloadfontset(Font *f) { + FcResult result; + + if(!(f->set = FcFontSort(0, f->pattern, FcTrue, 0, &result))) + return 1; + return 0; } void@@ -2987,7 +2993,6 @@ r.height = xw.ch;
r.width = width; XftDrawSetClipRectangles(xw.draw, winx, winy, &r, 1); - fcsets[0] = font->set; for(xp = winx; bytelen > 0;) { /* * Search for the range in the to be printed string of glyphs@@ -3045,6 +3050,10 @@ }
/* Nothing was found. */ if(i >= frclen) { + if(!font->set) + xloadfontset(font); + fcsets[0] = font->set; + /* * Nothing was found in the cache. Now use * some dozen of Fontconfig calls to get the