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

main: configure locale *before* loading the config

Browse source 
Without this, config_load() can’t use wide-character functions
properly.
This commit is contained in:
Daniel Eklöf 2020-10-09 19:45:26 +02:00
parent 49f4b3da64
commit 4d17c23224
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
main.c
View file

@ -352,6 +352,13 @@ main(int argc, char *const *argv)
LOG_INFO("arch: %s/%zu-bit, ", name.machine, sizeof(void *) * 8); LOG_INFO("arch: %s/%zu-bit, ", name.machine, sizeof(void *) * 8);
} }
setlocale(LC_CTYPE, "");
LOG_INFO("locale: %s", setlocale(LC_CTYPE, NULL));
if (!locale_is_utf8()) {
LOG_ERR("locale is not UTF-8");
return ret;
}
struct config conf = {NULL}; struct config conf = {NULL};
if (!config_load(&conf, conf_path, &user_notifications, check_config)) { if (!config_load(&conf, conf_path, &user_notifications, check_config)) {
config_free(conf); config_free(conf);
@ -365,13 +372,6 @@ main(int argc, char *const *argv)
fcft_set_scaling_filter(conf.tweak.fcft_filter); fcft_set_scaling_filter(conf.tweak.fcft_filter);
setlocale(LC_CTYPE, "");
LOG_INFO("locale: %s", setlocale(LC_CTYPE, NULL));
if (!locale_is_utf8()) {
LOG_ERR("locale is not UTF-8");
return ret;
}
if (conf_term != NULL) { if (conf_term != NULL) {
free(conf.term); free(conf.term);
conf.term = xstrdup(conf_term); conf.term = xstrdup(conf_term);