config: scrollback-indicator-format: percent -> percentage

This commit is contained in:
Daniel Eklöf 2020-07-26 11:39:02 +02:00
parent 9a9e876d6e
commit 50d116dcb9
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
5 changed files with 13 additions and 11 deletions

View file

@ -307,11 +307,13 @@ parse_section_main(const char *key, const char *value, struct config *conf,
}
else if (strcmp(key, "scrollback-indicator-format") == 0) {
if (strcmp(value, "percent") == 0)
conf->scrollback.indicator.format = SCROLLBACK_INDICATOR_FORMAT_PERCENT;
else if (strcmp(value, "line") == 0)
conf->scrollback.indicator.format = SCROLLBACK_INDICATOR_FORMAT_LINENO;
else {
if (strcmp(value, "percent") == 0) {
conf->scrollback.indicator.format
= SCROLLBACK_INDICATOR_FORMAT_PERCENTAGE;
} else if (strcmp(value, "line") == 0) {
conf->scrollback.indicator.format
= SCROLLBACK_INDICATOR_FORMAT_LINENO;
} else {
LOG_ERR("%s:%d: 'scrollback-indicator-format must be one "
"of 'percent' or 'line'",
path, lineno);
@ -949,7 +951,7 @@ config_load(struct config *conf, const char *conf_path)
.lines = 1000,
.indicator = {
.style = SCROLLBACK_INDICATOR_STYLE_RELATIVE,
.format = SCROLLBACK_INDICATOR_FORMAT_PERCENT,
.format = SCROLLBACK_INDICATOR_FORMAT_PERCENTAGE,
},
},
.colors = {

View file

@ -50,7 +50,7 @@ struct config {
} style;
enum {
SCROLLBACK_INDICATOR_FORMAT_PERCENT,
SCROLLBACK_INDICATOR_FORMAT_PERCENTAGE,
SCROLLBACK_INDICATOR_FORMAT_LINENO
} format;
} indicator;

View file

@ -78,8 +78,8 @@ in this order:
*scrollback-indicator-format*
Which format to use when displaying the scrollback position
indicator. Either _percent_ or _line_. This option is ignored if
*scrollback-indicator-style=none*. Default: _percent_.
indicator. Either _percentage_ or _line_. This option is ignored
if *scrollback-indicator-style=none*. Default: _percentage_.
*workers*
Number of threads to use for rendering. Set to 0 to disable

2
footrc
View file

@ -3,7 +3,7 @@
# font=monospace
# scrollback=1000
# scrollback-indicator-style=relative
# scrollback-indicator-format=percent
# scrollback-indicator-format=percentage
# geometry=700x500
# pad=2x2
# initial-window-mode=windowed

View file

@ -1363,7 +1363,7 @@ render_scrollback_position(struct terminal *term)
/* *What* to render */
switch (term->conf->scrollback.indicator.format) {
case SCROLLBACK_INDICATOR_FORMAT_PERCENT:
case SCROLLBACK_INDICATOR_FORMAT_PERCENTAGE:
swprintf(text, sizeof(text) / sizeof(text[0]), L"%u%%", percent);
cell_count = 3;
break;