From e218e19ea3f47b69b985ce997fa5dba80ae78e9b Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Thu, 17 Oct 2019 17:43:40 +0200 Subject: font: load all fallbacks when instantiating a primary font The caching of fallback fonts didn't work. It "worked" because we didn't free the fonts... When we started doing that, the fallback fonts were no longer cached. Another solution would have been to keep the cached fallback fonts around until exit, and free them there. But that didn't seem very clean. So, for now, load *all* fallbacks when instantiating a primary (non-fallback) font. Note that this slows down initial startup time. --- font.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'font.h') diff --git a/font.h b/font.h index 149dda19..3bd10129 100644 --- a/font.h +++ b/font.h @@ -30,6 +30,8 @@ struct glyph { typedef tll(struct glyph) hash_entry_t; struct font { + char *name; + mtx_t lock; FT_Face face; int load_flags; @@ -50,7 +52,7 @@ struct font { } strikeout; bool is_fallback; - tll(char *) fallbacks; + tll(struct font *) fallbacks; size_t ref_counter; -- cgit v1.3