aboutsummaryrefslogtreecommitdiff
path: root/terminal.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2025-04-20 05:58:02 +0000
committerDaniel Eklöf <daniel@ekloef.se>2025-04-26 12:20:58 +0000
commit6bc91b5e288ef16613a4e6f9d0a9f6077cedc267 (patch)
tree67ba84ba5b165a2a8c24253b83ae7935d7a3bd9c /terminal.c
parentconfig: add new section 'colors2' (diff)
key-bindings: add bindings to switch between color themes
* color-theme-switch-1: select the primary color theme * color-theme-switch-2: select the alternative color theme * color-theme-toggle: toggle between the primary and alternative color themes
Diffstat (limited to 'terminal.c')
-rw-r--r--terminal.c27
1 files changed, 17 insertions, 10 deletions
diff --git a/terminal.c b/terminal.c
index 16663647..29e03b8e 100644
--- a/terminal.c
+++ b/terminal.c
@@ -1303,6 +1303,7 @@ term_init(const struct config *conf, struct fdm *fdm, struct reaper *reaper,
.selection_fg = conf->colors.selection_fg,
.selection_bg = conf->colors.selection_bg,
.use_custom_selection = conf->colors.use_custom.selection,
+ .active_theme = COLOR_THEME1,
},
.color_stack = {
.stack = NULL,
@@ -2150,16 +2151,8 @@ term_reset(struct terminal *term, bool hard)
term->flash.active = false;
term->blink.state = BLINK_ON;
fdm_del(term->fdm, term->blink.fd); term->blink.fd = -1;
- term->colors.fg = term->conf->colors.fg;
- term->colors.bg = term->conf->colors.bg;
- term->colors.alpha = term->conf->colors.alpha;
- term->colors.cursor_fg = (term->conf->colors.use_custom.cursor ? 1u << 31 : 0) | term->conf->colors.cursor.text;
- term->colors.cursor_bg = (term->conf->colors.use_custom.cursor ? 1u << 31 : 0) | term->conf->colors.cursor.cursor;
- term->colors.selection_fg = term->conf->colors.selection_fg;
- term->colors.selection_bg = term->conf->colors.selection_bg;
- term->colors.use_custom_selection = term->conf->colors.use_custom.selection;
- memcpy(term->colors.table, term->conf->colors.table,
- sizeof(term->colors.table));
+ term_theme_apply(term, &term->conf->colors);
+ term->colors.active_theme = COLOR_THEME1;
free(term->color_stack.stack);
term->color_stack.stack = NULL;
term->color_stack.size = 0;
@@ -4693,3 +4686,17 @@ term_send_size_notification(struct terminal *term)
term->rows, term->cols, height, width);
term_to_slave(term, buf, n);
}
+
+void
+term_theme_apply(struct terminal *term, const struct color_theme *theme)
+{
+ term->colors.fg = theme->fg;
+ term->colors.bg = theme->bg;
+ term->colors.alpha = theme->alpha;
+ term->colors.cursor_fg = (theme->use_custom.cursor ? 1u << 31 : 0) | theme->cursor.text;
+ term->colors.cursor_bg = (theme->use_custom.cursor ? 1u << 31 : 0) | theme->cursor.cursor;
+ term->colors.selection_fg = theme->selection_fg;
+ term->colors.selection_bg = theme->selection_bg;
+ term->colors.use_custom_selection = theme->use_custom.selection;
+ memcpy(term->colors.table, theme->table, sizeof(term->colors.table));
+}