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

term: load primary fonts in parallel

Browse source 
Use four threads to load the four primary font variants - normal,
bold, italic and bold italic.

This speeds up initial startup, and reloading of fonts on a DPI
change.
This commit is contained in:
Daniel Eklöf 2020-04-28 22:07:02 +02:00
parent 2fd5a9ee8d
commit 3adcbf7d4d
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 38 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -45,6 +45,9 @@
the subpixel order is `none`, then grayscale antialiasing is the subpixel order is `none`, then grayscale antialiasing is
used. The subpixel order is ignored if antialiasing has been used. The subpixel order is ignored if antialiasing has been
disabled. disabled.
* The four primary font variants (normal, bold, italic, bold italic)
are now loaded in parallel. This speeds up both the initial startup
time, as well as a DPI change.
### Deprecated ### Deprecated

43
terminal.c
View file

@ -623,6 +623,22 @@ get_font_subpixel(const struct terminal *term)
return FCFT_SUBPIXEL_DEFAULT; return FCFT_SUBPIXEL_DEFAULT;
} }
struct font_load_data {
size_t count;
const char **names;
const char *attrs;
struct fcft_font **font;
};
static int
font_loader_thread(void *_data)
{
struct font_load_data *data = _data;
*data->font = fcft_from_name(data->count, data->names, data->attrs);
return *data->font != NULL;
}
static bool static bool
load_fonts_from_conf(const struct terminal *term, const struct config *conf, load_fonts_from_conf(const struct terminal *term, const struct config *conf,
struct fcft_font *fonts[static 4]) struct fcft_font *fonts[static 4])
@ -640,14 +656,25 @@ load_fonts_from_conf(const struct terminal *term, const struct config *conf,
snprintf(attrs2, sizeof(attrs2), "dpi=%u:slant=italic", term->font_dpi); snprintf(attrs2, sizeof(attrs2), "dpi=%u:slant=italic", term->font_dpi);
snprintf(attrs3, sizeof(attrs3), "dpi=%u:weight=bold:slant=italic", term->font_dpi); snprintf(attrs3, sizeof(attrs3), "dpi=%u:weight=bold:slant=italic", term->font_dpi);
fonts[0] = fonts[1] = fonts[2] = fonts[3] = NULL; struct font_load_data data[4] = {
bool ret = {count, names, attrs0, &fonts[0]},
(fonts[0] = fcft_from_name(count, names, attrs0)) != NULL && {count, names, attrs1, &fonts[1]},
(fonts[1] = fcft_from_name(count, names, attrs1)) != NULL && {count, names, attrs2, &fonts[2]},
(fonts[2] = fcft_from_name(count, names, attrs2)) != NULL && {count, names, attrs3, &fonts[3]},
(fonts[3] = fcft_from_name(count, names, attrs3)) != NULL; };
if (!ret) { thrd_t tids[4];
for (size_t i = 0; i < 4; i++)
thrd_create(&tids[i], &font_loader_thread, &data[i]);
bool success = true;
for (size_t i = 0; i < 4; i++) {
int ret;
thrd_join(tids[i], &ret);
success = success && ret;
}
if (!success) {
LOG_ERR("failed to load primary fonts"); LOG_ERR("failed to load primary fonts");
for (size_t i = 0; i < 4; i++) { for (size_t i = 0; i < 4; i++) {
fcft_destroy(fonts[i]); fcft_destroy(fonts[i]);
@ -655,7 +682,7 @@ load_fonts_from_conf(const struct terminal *term, const struct config *conf,
} }
} }
return ret; return success;
} }
struct terminal * struct terminal *