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

main: pre-allocate fonts

Browse source 
Since fonts are cached, this adds no additional memory. However, it
makes the first terminal window in --server mode start much faster,
since the (primary) fonts have already been loaded.

Fallback fonts are still loaded on-demand.
This commit is contained in:
Daniel Eklöf 2019-11-02 13:50:40 +01:00
parent c99c0285dc
commit 32129083bd
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 28 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

29
main.c
View file

@ -59,6 +59,26 @@ term_shutdown_cb(void *data, int exit_code)
ctx->exit_code = exit_code; ctx->exit_code = exit_code;
} }
static bool
initialize_fonts(const struct config *conf, struct font *fonts[4])
{
font_list_t font_names = tll_init();
tll_foreach(conf->fonts, it)
tll_push_back(font_names, it->item);
if ((fonts[0] = font_from_name(font_names, "")) == NULL ||
(fonts[1] = font_from_name(font_names, "style=bold")) == NULL ||
(fonts[2] = font_from_name(font_names, "style=italic")) == NULL ||
(fonts[3] = font_from_name(font_names, "style=bold italic")) == NULL)
{
tll_free(font_names);
return false;
}
tll_free(font_names);
return true;
}
int int
main(int argc, char *const *argv) main(int argc, char *const *argv)
{ {
@ -162,12 +182,16 @@ main(int argc, char *const *argv)
setlocale(LC_ALL, ""); setlocale(LC_ALL, "");
struct font *fonts[4] = {NULL};
struct fdm *fdm = NULL; struct fdm *fdm = NULL;
struct wayland *wayl = NULL; struct wayland *wayl = NULL;
struct terminal *term = NULL; struct terminal *term = NULL;
struct server *server = NULL; struct server *server = NULL;
struct shutdown_context shutdown_ctx = {.term = &term, .exit_code = EXIT_FAILURE}; struct shutdown_context shutdown_ctx = {.term = &term, .exit_code = EXIT_FAILURE};
if (!initialize_fonts(&conf, fonts))
goto out;
if ((fdm = fdm_init()) == NULL) if ((fdm = fdm_init()) == NULL)
goto out; goto out;
@ -204,7 +228,10 @@ out:
term_destroy(term); term_destroy(term);
wayl_destroy(wayl); wayl_destroy(wayl);
fdm_destroy(fdm); fdm_destroy(fdm);
config_free(conf);
for (size_t i = 0; i < sizeof(fonts) / sizeof(fonts[0]); i++)
font_destroy(fonts[i]);
config_free(conf);
return ret == EXIT_SUCCESS && !as_server ? shutdown_ctx.exit_code : ret; return ret == EXIT_SUCCESS && !as_server ? shutdown_ctx.exit_code : ret;
} }