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

Merge branch 'master' into scroll-damage-performance

Browse source
This commit is contained in:
Daniel Eklöf 2020-03-27 21:16:42 +01:00
commit 598ac4bcd0
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
14 changed files with 138 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
config.c
View file

@ -226,7 +226,7 @@ parse_section_main(const char *key, const char *value, struct config *conf,
unsigned x, y;
if (sscanf(value, "%ux%u", &x, &y) != 2) {
LOG_ERR(
"%s: %d: expected PAD_XxPAD_Y, where both are positive integers: %s",
"%s:%d: expected PAD_XxPAD_Y, where both are positive integers: %s",
path, lineno, value);
return false;
}
@ -235,6 +235,21 @@ parse_section_main(const char *key, const char *value, struct config *conf,
conf->pad_y = y;
}
else if (strcmp(key, "startup-mode") == 0) {
if (strcmp(value, "windowed") == 0)
conf->startup_mode = STARTUP_WINDOWED;
else if (strcmp(value, "maximized") == 0)
conf->startup_mode = STARTUP_MAXIMIZED;
else if (strcmp(value, "fullscreen") == 0)
conf->startup_mode = STARTUP_FULLSCREEN;
else {
LOG_ERR(
"%s:%d: expected either 'windowed', 'maximized' or 'fullscreen'",
path, lineno);
return false;
}
}
else if (strcmp(key, "font") == 0) {
char *copy = strdup(value);
for (const char *font = strtok(copy, ","); font != NULL; font = strtok(NULL, ",")) {
@ -816,6 +831,7 @@ config_load(struct config *conf, const char *conf_path)
.height = 500,
.pad_x = 2,
.pad_y = 2,
.startup_mode = STARTUP_WINDOWED,
.fonts = tll_init(),
.scrollback_lines = 1000,