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

font: rename cache -> glyph_cache

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

28
font.c
View file

@ -227,13 +227,13 @@ from_font_set(FcPattern *pattern, FcFontSet *fonts, int start_idx, const font_li
font->fc_pattern = NULL; font->fc_pattern = NULL;
font->fc_fonts = NULL; font->fc_fonts = NULL;
font->fc_loaded_fallbacks = NULL; font->fc_loaded_fallbacks = NULL;
font->cache = NULL; font->glyph_cache = NULL;
} else { } else {
font->fc_pattern = !is_fallback ? pattern : NULL; font->fc_pattern = !is_fallback ? pattern : NULL;
font->fc_fonts = !is_fallback ? fonts : NULL; font->fc_fonts = !is_fallback ? fonts : NULL;
font->fc_loaded_fallbacks = calloc( font->fc_loaded_fallbacks = calloc(
fonts->nfont, sizeof(font->fc_loaded_fallbacks[0])); fonts->nfont, sizeof(font->fc_loaded_fallbacks[0]));
font->cache = calloc(cache_size, sizeof(font->cache[0])); font->glyph_cache = calloc(cache_size, sizeof(font->glyph_cache[0]));
} }
if (fallbacks != NULL) { if (fallbacks != NULL) {
@ -622,9 +622,9 @@ font_glyph_for_wc(struct font *font, wchar_t wc)
{ {
mtx_lock(&font->lock); mtx_lock(&font->lock);
assert(font->cache != NULL); assert(font->glyph_cache != NULL);
size_t hash_idx = hash_index(wc); size_t hash_idx = hash_index(wc);
hash_entry_t *hash_entry = font->cache[hash_idx]; hash_entry_t *hash_entry = font->glyph_cache[hash_idx];
if (hash_entry != NULL) { if (hash_entry != NULL) {
tll_foreach(*hash_entry, it) { tll_foreach(*hash_entry, it) {
@ -641,8 +641,8 @@ font_glyph_for_wc(struct font *font, wchar_t wc)
if (hash_entry == NULL) { if (hash_entry == NULL) {
hash_entry = calloc(1, sizeof(*hash_entry)); hash_entry = calloc(1, sizeof(*hash_entry));
assert(font->cache[hash_idx] == NULL); assert(font->glyph_cache[hash_idx] == NULL);
font->cache[hash_idx] = hash_entry; font->glyph_cache[hash_idx] = hash_entry;
} }
assert(hash_entry != NULL); assert(hash_entry != NULL);
@ -686,11 +686,11 @@ font_destroy(struct font *font)
FcFontSetDestroy(font->fc_fonts); FcFontSetDestroy(font->fc_fonts);
for (size_t i = 0; i < cache_size && font->cache != NULL; i++) { for (size_t i = 0; i < cache_size && font->glyph_cache != NULL; i++) {
if (font->cache[i] == NULL) if (font->glyph_cache[i] == NULL)
continue; continue;
tll_foreach(*font->cache[i], it) { tll_foreach(*font->glyph_cache[i], it) {
if (!it->item.valid) if (!it->item.valid)
continue; continue;
@ -699,17 +699,19 @@ font_destroy(struct font *font)
free(image); free(image);
} }
tll_free(*font->cache[i]); tll_free(*font->glyph_cache[i]);
free(font->cache[i]); free(font->glyph_cache[i]);
} }
free(font->cache); free(font->glyph_cache);
tll_foreach(font_cache, it) { tll_foreach(font_cache, it) {
if (it->item.font == font) { if (it->item.font == font) {
tll_remove(font_cache, it); tll_remove(font_cache, it);
break; free(font);
return;
} }
} }
LOG_ERR("font not found in cache");
free(font); free(font);
} }

2
font.h
View file

@ -60,7 +60,7 @@ struct font {
int fc_idx; int fc_idx;
struct font **fc_loaded_fallbacks; /* fc_fonts->nfont array */ struct font **fc_loaded_fallbacks; /* fc_fonts->nfont array */
hash_entry_t **cache; hash_entry_t **glyph_cache;
}; };
struct font *font_from_name(font_list_t names, const char *attributes); struct font *font_from_name(font_list_t names, const char *attributes);