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

conf: make cursor's default style configurable

Browse source
This commit is contained in:
Daniel Eklöf 2019-07-22 20:15:14 +02:00
parent ed5df194b8
commit 3ccdef3498
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
5 changed files with 48 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

35
config.c
View file

@ -181,12 +181,39 @@ parse_section_colors(const char *key, const char *value, struct config *conf,
return true;
}
static bool
parse_section_cursor(const char *key, const char *value, struct config *conf,
const char *path, unsigned lineno)
{
if (strcmp(key, "style") == 0) {
if (strcmp(value, "block") == 0)
conf->cursor.style = CURSOR_BLOCK;
else if (strcmp(value, "bar") == 0)
conf->cursor.style = CURSOR_BAR;
else if (strcmp(value, "underline") == 0)
conf->cursor.style = CURSOR_UNDERLINE;
else {
LOG_ERR("%s:%d: invalid 'style': %s", path, lineno, value);
return false;
}
}
else {
LOG_ERR("%s:%d: invalid key: %s", path, lineno, key);
return false;
}
return true;
}
static bool
parse_config_file(FILE *f, struct config *conf, const char *path)
{
enum section {
SECTION_MAIN,
SECTION_COLORS,
SECTION_CURSOR,
} section = SECTION_MAIN;
/* Function pointer, called for each key/value line */
@ -198,12 +225,14 @@ parse_config_file(FILE *f, struct config *conf, const char *path)
static const parser_fun_t section_parser_map[] = {
[SECTION_MAIN] = &parse_section_main,
[SECTION_COLORS] = &parse_section_colors,
[SECTION_CURSOR] = &parse_section_cursor,
};
#if defined(_DEBUG) && defined(LOG_ENABLE_DBG) && LOG_ENABLE_DBG
static const char *const section_names[] = {
[SECTION_MAIN] = "main",
[SECTION_COLORS] = "colors",
[SECTION_CURSOR] = "cursor",
};
#endif
@ -257,6 +286,8 @@ parse_config_file(FILE *f, struct config *conf, const char *path)
if (strcmp(&line[1], "colors") == 0)
section = SECTION_COLORS;
else if (strcmp(&line[1], "cursor") == 0)
section = SECTION_CURSOR;
else {
LOG_ERR("%s:%d: invalid section name: %s", path, lineno, &line[1]);
goto err;
@ -354,6 +385,10 @@ config_load(struct config *conf)
default_bright[7],
},
},
.cursor = {
.style = CURSOR_BLOCK,
},
};
char *path = get_config_path();