aboutsummaryrefslogtreecommitdiff
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
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
-rw-r--r--CHANGELOG.md10
-rw-r--r--config.c4
-rw-r--r--doc/foot.ini.5.scd16
-rw-r--r--foot.ini3
-rw-r--r--input.c45
-rw-r--r--key-binding.h5
-rw-r--r--terminal.c27
-rw-r--r--terminal.h3
8 files changed, 102 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b8348ed..4296da09 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -63,6 +63,16 @@
## Unreleased
### Added
+
+* `colors2` config section. This section duplicates the `colors`
+ section, and lets you define an alternative color theme.
+* `key-bindings.color-theme-switch-1`,
+ `key-bindings.color-theme-switch-2` and
+ `key-bindings.color-theme-toggle` key bindings. These can be used to
+ switch between the primary and alternative color themes. They are
+ not bound by default.
+
+
### Changed
* `cursor.color` moved to `colors.cursor`.
diff --git a/config.c b/config.c
index 1b73fbcf..921b2d68 100644
--- a/config.c
+++ b/config.c
@@ -142,6 +142,9 @@ static const char *const binding_action_map[] = {
[BIND_ACTION_QUIT] = "quit",
[BIND_ACTION_REGEX_LAUNCH] = "regex-launch",
[BIND_ACTION_REGEX_COPY] = "regex-copy",
+ [BIND_ACTION_THEME_SWITCH_1] = "color-theme-switch-1",
+ [BIND_ACTION_THEME_SWITCH_2] = "color-theme-switch-2",
+ [BIND_ACTION_THEME_TOGGLE] = "color-theme-toggle",
/* Mouse-specific actions */
[BIND_ACTION_SCROLLBACK_UP_MOUSE] = "scrollback-up-mouse",
@@ -3479,6 +3482,7 @@ config_load(struct config *conf, const char *conf_path,
memcpy(conf->colors.table, default_color_table, sizeof(default_color_table));
memcpy(conf->colors.sixel, default_sixel_colors, sizeof(default_sixel_colors));
+ memcpy(&conf->colors2, &conf->colors, sizeof(conf->colors));
parse_modifiers(XKB_MOD_NAME_SHIFT, 5, &conf->mouse.selection_override_modifiers);
tokenize_cmdline(
diff --git a/doc/foot.ini.5.scd b/doc/foot.ini.5.scd
index 45084ab6..af6f7875 100644
--- a/doc/foot.ini.5.scd
+++ b/doc/foot.ini.5.scd
@@ -1396,6 +1396,22 @@ e.g. *search-start=none*.
Default: _Control+Shift+u_.
+*color-theme-switch-1*, *color-theme-switch-2*, *color-theme-toggle*
+ Switch between the primary color theme (defined in the *colors*
+ section), and the alternative color theme (defined in the
+ *colors2* section).
+
+ *color-theme-switch-1* applies the primary color theme regardless
+ of which color theme is currently active.
+
+ *color-theme-switch-2* applies the alternative color theme regardless
+ of which color theme is currently active.
+
+ *color-theme-toggle* toggles between the primary and alternative
+ color themes.
+
+ Default: _none_
+
*quit*
Quit foot. Default: _none_.
diff --git a/foot.ini b/foot.ini
index 8482af6b..ebbc8ca7 100644
--- a/foot.ini
+++ b/foot.ini
@@ -212,6 +212,9 @@
# prompt-prev=Control+Shift+z
# prompt-next=Control+Shift+x
# unicode-input=Control+Shift+u
+# color-theme-switch-1=none
+# color-theme-switch-2=none
+# color-theme-toggle=none
# noop=none
# quit=none
diff --git a/input.c b/input.c
index d7a7975a..ebb646c6 100644
--- a/input.c
+++ b/input.c
@@ -484,6 +484,51 @@ execute_binding(struct seat *seat, struct terminal *term,
return true;
+ case BIND_ACTION_THEME_SWITCH_1:
+ if (term->colors.active_theme != COLOR_THEME1) {
+ term_theme_apply(term, &term->conf->colors);
+ term->colors.active_theme = COLOR_THEME1;
+
+ wayl_win_alpha_changed(term->window);
+ term_font_subpixel_changed(term);
+
+ term_damage_view(term);
+ term_damage_margins(term);
+ render_refresh(term);
+ }
+ return true;
+
+ case BIND_ACTION_THEME_SWITCH_2:
+ if (term->colors.active_theme != COLOR_THEME2) {
+ term_theme_apply(term, &term->conf->colors2);
+ term->colors.active_theme = COLOR_THEME2;
+
+ wayl_win_alpha_changed(term->window);
+ term_font_subpixel_changed(term);
+
+ term_damage_view(term);
+ term_damage_margins(term);
+ render_refresh(term);
+ }
+ return true;
+
+ case BIND_ACTION_THEME_TOGGLE:
+ if (term->colors.active_theme == COLOR_THEME1) {
+ term_theme_apply(term, &term->conf->colors2);
+ term->colors.active_theme = COLOR_THEME2;
+ } else {
+ term_theme_apply(term, &term->conf->colors);
+ term->colors.active_theme = COLOR_THEME1;
+ }
+
+ wayl_win_alpha_changed(term->window);
+ term_font_subpixel_changed(term);
+
+ term_damage_view(term);
+ term_damage_margins(term);
+ render_refresh(term);
+ return true;
+
case BIND_ACTION_SELECT_BEGIN:
selection_start(
term, seat->mouse.col, seat->mouse.row, SELECTION_CHAR_WISE, false);
diff --git a/key-binding.h b/key-binding.h
index 89398859..5f0c1f1e 100644
--- a/key-binding.h
+++ b/key-binding.h
@@ -43,6 +43,9 @@ enum bind_action_normal {
BIND_ACTION_QUIT,
BIND_ACTION_REGEX_LAUNCH,
BIND_ACTION_REGEX_COPY,
+ BIND_ACTION_THEME_SWITCH_1,
+ BIND_ACTION_THEME_SWITCH_2,
+ BIND_ACTION_THEME_TOGGLE,
/* Mouse specific actions - i.e. they require a mouse coordinate */
BIND_ACTION_SCROLLBACK_UP_MOUSE,
@@ -56,7 +59,7 @@ enum bind_action_normal {
BIND_ACTION_SELECT_QUOTE,
BIND_ACTION_SELECT_ROW,
- BIND_ACTION_KEY_COUNT = BIND_ACTION_REGEX_COPY + 1,
+ BIND_ACTION_KEY_COUNT = BIND_ACTION_THEME_TOGGLE + 1,
BIND_ACTION_COUNT = BIND_ACTION_SELECT_ROW + 1,
};
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));
+}
diff --git a/terminal.h b/terminal.h
index 518e36ef..45e13925 100644
--- a/terminal.h
+++ b/terminal.h
@@ -405,6 +405,7 @@ struct colors {
uint32_t selection_fg;
uint32_t selection_bg;
bool use_custom_selection;
+ enum { COLOR_THEME1, COLOR_THEME2 } active_theme;
};
struct terminal {
@@ -982,6 +983,8 @@ void term_enable_size_notifications(struct terminal *term);
void term_disable_size_notifications(struct terminal *term);
void term_send_size_notification(struct terminal *term);
+void term_theme_apply(struct terminal *term, const struct color_theme *theme);
+
static inline void term_reset_grapheme_state(struct terminal *term)
{
#if defined(FOOT_GRAPHEME_CLUSTERING)