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

main: stop initializing a default set of fonts

Browse source
This commit is contained in:
Daniel Eklöf 2019-12-04 22:01:39 +01:00
parent 7e0e6762eb
commit bafe7cab28
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 0 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

25
main.c
View file

@ -60,23 +60,6 @@ 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])
{
const size_t count = tll_length(conf->fonts);
const char *names[count];
size_t i = 0;
tll_foreach(conf->fonts, it)
names[i++] = it->item;
return (
(fonts[0] = font_from_name(names, count, "dpi=96")) != NULL &&
(fonts[1] = font_from_name(names, count, "dpi=96:weight=bold")) != NULL &&
(fonts[2] = font_from_name(names, count, "dpi=96:slant=italic")) != NULL &&
(fonts[3] = font_from_name(names, count, "dpi=96:weight=bold:slant=italic")) != NULL);
}
int int
main(int argc, char *const *argv) main(int argc, char *const *argv)
{ {
@ -181,7 +164,6 @@ 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;
@ -190,10 +172,6 @@ main(int argc, char *const *argv)
log_init(as_server ? LOG_FACILITY_DAEMON : LOG_FACILITY_USER); log_init(as_server ? LOG_FACILITY_DAEMON : LOG_FACILITY_USER);
/* This ensures we keep a set of fonts in the cache */
if (!initialize_fonts(&conf, fonts))
goto out;
if ((fdm = fdm_init()) == NULL) if ((fdm = fdm_init()) == NULL)
goto out; goto out;
@ -237,9 +215,6 @@ out:
wayl_destroy(wayl); wayl_destroy(wayl);
fdm_destroy(fdm); fdm_destroy(fdm);
for (size_t i = 0; i < sizeof(fonts) / sizeof(fonts[0]); i++)
font_destroy(fonts[i]);
config_free(conf); config_free(conf);
log_deinit(); log_deinit();
return ret == EXIT_SUCCESS && !as_server ? shutdown_ctx.exit_code : ret; return ret == EXIT_SUCCESS && !as_server ? shutdown_ctx.exit_code : ret;