mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-02-05 04:06:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

font: fc_idx may not be the requested one

Browse source
This commit is contained in:
Daniel Eklöf 2019-10-17 17:07:37 +02:00
parent af85c10127
commit 1875f98945
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
font.c
View file

@ -221,15 +221,14 @@ from_font_set(FcPattern *pattern, FcFontSet *fonts, int start_idx, const font_li
font->pixel_size_fixup = scalable ? pixel_fixup : 1.;
font->bgr = fc_rgba == FC_RGBA_BGR || fc_rgba == FC_RGBA_VBGR;
font->ref_counter = 1;
font->fc_idx = font_idx;
if (is_fallback) {
font->fc_idx = 0;
font->fc_pattern = NULL;
font->fc_fonts = NULL;
font->fc_loaded_fallbacks = NULL;
font->cache = NULL;
} else {
font->fc_idx = font_idx;
font->fc_pattern = !is_fallback ? pattern : NULL;
font->fc_fonts = !is_fallback ? fonts : NULL;
font->fc_loaded_fallbacks = calloc(
@ -436,6 +435,9 @@ glyph_for_wchar(const struct font *font, wchar_t wc, struct glyph *glyph)
}
LOG_DBG("loaded new fontconfig fallback font");
assert(fallback->fc_idx >= i);
i = fallback->fc_idx;
font->fc_loaded_fallbacks[i] = fallback;
}