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

config: rename scrollback-indicator to scrollback-indicator-style

Browse source 
And turn it from a boolean to an enum. It can be set to:

* `none` - disables the indicator
* `static` - always rendered near the top of the window
* `moving` - position reflects the scrollback position
This commit is contained in:
Daniel Eklöf 2020-07-25 14:31:45 +02:00
parent 5b868fd0c9
commit c4679e474e
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
6 changed files with 54 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

37
config.c
View file

@ -288,21 +288,33 @@ parse_section_main(const char *key, const char *value, struct config *conf,
LOG_ERR("%s:%d: expected an integer: %s", path, lineno, value);
return false;
}
conf->scrollback_lines = lines;
conf->scrollback.lines = lines;
}
else if (strcmp(key, "scrollback-indicator") == 0)
conf->scrollback_indicator = str_to_bool(value);
else if (strcmp(key, "scrollback-indicator") == 0) {
if (strcmp(value, "none") == 0)
conf->scrollback.indicator.style = SCROLLBACK_INDICATOR_STYLE_NONE;
else if (strcmp(value, "static") == 0)
conf->scrollback.indicator.style = SCROLLBACK_INDICATOR_STYLE_STATIC;
else if (strcmp(value, "moving") == 0)
conf->scrollback.indicator.style = SCROLLBACK_INDICATOR_STYLE_MOVING;
else {
LOG_ERR("%s:%d: scrollback-indicator-style must be one of "
"'none', 'static' or 'moving'",
path, lineno);
return false;
}
}
else if (strcmp(key, "scrollback-indicator-format") == 0) {
if (strcmp(value, "percent") == 0)
conf->scrollback_indicator_format = SCROLLBACK_INDICATOR_PERCENT;
conf->scrollback.indicator.format = SCROLLBACK_INDICATOR_FORMAT_PERCENT;
else if (strcmp(value, "line") == 0)
conf->scrollback_indicator_format = SCROLLBACK_INDICATOR_LINENO;
conf->scrollback.indicator.format = SCROLLBACK_INDICATOR_FORMAT_LINENO;
else {
LOG_ERR("%s:%d: 'scrollback-indicator-format must be one "
"of 'percent' or 'line', not %s",
path, lineno, value);
"of 'percent' or 'line'",
path, lineno);
return false;
}
}
@ -933,10 +945,13 @@ config_load(struct config *conf, const char *conf_path)
.pad_y = 2,
.startup_mode = STARTUP_WINDOWED,
.fonts = tll_init(),
.scrollback_lines = 1000,
.scrollback_indicator = true,
.scrollback_indicator_format = SCROLLBACK_INDICATOR_PERCENT,
.scrollback = {
.lines = 1000,
.indicator = {
.style = SCROLLBACK_INDICATOR_STYLE_MOVING,
.format = SCROLLBACK_INDICATOR_FORMAT_PERCENT,
},
},
.colors = {
.fg = default_foreground,
.bg = default_background,