aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-10-10 08:41:55 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-10-10 08:41:55 +0000
commitb3bc7ec413eae09a92f1228a086475fc36a9bc42 (patch)
treed45f4c430f153dbc526ac24ce843c98d8d1aa70a
parentMerge branch 'use-pixman-renderer' (diff)
parentchangelog: list scrollback.indicator-color addition (diff)
Merge branch 'configurable-indicator-colors'
-rw-r--r--CHANGELOG.md2
-rw-r--r--config.c13
-rw-r--r--config.h6
-rw-r--r--doc/foot.ini.5.scd7
-rw-r--r--render.c9
5 files changed, 36 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a9b57ff0..a400d9d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,6 +38,8 @@
* `notify-focus-inhibit` boolean option, which can be used to control whether
desktop notifications should be inhibited when the terminal has keyboard
focus
+* `colors.scrollback-indicator` color-pair option, which specifies foreground
+ and background colors for the scrollback indicator.
### Changed
### Deprecated
diff --git a/config.c b/config.c
index 3448cab6..a213075b 100644
--- a/config.c
+++ b/config.c
@@ -1324,6 +1324,18 @@ parse_section_colors(const char *key, const char *value, struct config *conf,
return true;
}
+ else if (strcmp(key, "scrollback-indicator") == 0) {
+ if (!str_to_two_colors(
+ value, &conf->colors.scrollback_indicator.fg, &conf->colors.scrollback_indicator.bg,
+ false, conf, path, lineno, "colors", "scrollback-indicator"))
+ {
+ return false;
+ }
+
+ conf->colors.use_custom.scrollback_indicator = true;
+ return true;
+ }
+
else if (strcmp(key, "urls") == 0) {
if (!str_to_color(value, &conf->colors.url, false,
conf, path, lineno, "colors", "urls"))
@@ -2926,6 +2938,7 @@ config_load(struct config *conf, const char *conf_path,
.use_custom = {
.selection = false,
.jump_label = false,
+ .scrollback_indicator = false,
.url = false,
},
},
diff --git a/config.h b/config.h
index 66db5d2f..db4bc275 100644
--- a/config.h
+++ b/config.h
@@ -164,8 +164,14 @@ struct config {
} jump_label;
struct {
+ uint32_t fg;
+ uint32_t bg;
+ } scrollback_indicator;
+
+ struct {
bool selection:1;
bool jump_label:1;
+ bool scrollback_indicator:1;
bool url:1;
} use_custom;
} colors;
diff --git a/doc/foot.ini.5.scd b/doc/foot.ini.5.scd
index 26116d62..b242e8fb 100644
--- a/doc/foot.ini.5.scd
+++ b/doc/foot.ini.5.scd
@@ -513,6 +513,13 @@ _alpha_ option.
colors to use when rendering jump labels in URL mode. Default:
_regular0 regular3_.
+*scrollback-indicator*
+ Two RRGGBB values specifying the foreground (text) and background
+ (indicator itself) colors for the scrollback indicator.
+
+ Default: first regular color (black) for foreground,
+ and fifth bright color (light blue) for background.
+
*urls*
Color to use for the underline used to highlight URLs in URL
mode. Default: _regular3_.
diff --git a/render.c b/render.c
index c4b1b4c8..9a5291e4 100644
--- a/render.c
+++ b/render.c
@@ -2147,12 +2147,19 @@ render_scrollback_position(struct terminal *term)
wl_subsurface_set_position(
win->scrollback_indicator.sub, x / scale, y / scale);
+ uint32_t fg = term->colors.table[0];
+ uint32_t bg = term->colors.table[8 + 4];
+ if (term->conf->colors.use_custom.scrollback_indicator) {
+ fg = term->conf->colors.scrollback_indicator.fg;
+ bg = term->conf->colors.scrollback_indicator.bg;
+ }
+
render_osd(
term,
win->scrollback_indicator.surf,
win->scrollback_indicator.sub,
term->fonts[0], buf, text,
- term->colors.table[0], 0xffu << 24 | term->colors.table[8 + 4],
+ fg, 0xffu << 24 | bg,
width - margin - wcslen(text) * term->cell_width, margin);
}