aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2025-04-21 10:19:11 +0000
committerDaniel Eklöf <daniel@ekloef.se>2025-04-26 12:43:42 +0000
commitbc5b71666867c00e7dc850740bb5cc2a13a9c2a9 (patch)
treeb37c0637d15f8750857b97362038d7b25dcec38b
parentcsi: implement private mode 2031 (dark/light mode detection) (diff)
config: add initial-color-theme=1|2
This option selects which color theme to use by default. I.e. at startup, and after a reset. This is useful with combined theme files, where a single file defines e.g. both a dark and light version of the theme.
-rw-r--r--CHANGELOG.md2
-rw-r--r--config.c11
-rw-r--r--config.h6
-rw-r--r--doc/foot.ini.5.scd12
-rw-r--r--foot.ini1
-rw-r--r--terminal.c39
-rw-r--r--terminal.h2
7 files changed, 58 insertions, 15 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c40b8cf..41457205 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -74,6 +74,8 @@
* Support for private mode 2031 - [_Dark and Light Mode
Detection_](https://contour-terminal.org/vt-extensions/color-palette-update-notifications/)
([#2025][2025])
+* Added `initial-color-theme=1|2` config option. `1` uses colors from
+ the `[colors]` section, `2` uses `[colors2]`.
[2025]: https://codeberg.org/dnkl/foot/issues/2025
diff --git a/config.c b/config.c
index 921b2d68..7dc41aa6 100644
--- a/config.c
+++ b/config.c
@@ -1098,6 +1098,15 @@ parse_section_main(struct context *ctx)
return true;
}
+ else if (streq(key, "initial-color-theme")) {
+ _Static_assert(
+ sizeof(conf->initial_color_theme) == sizeof(int),
+ "enum is not 32-bit");
+
+ return value_to_enum(ctx, (const char*[]){"1", "2", NULL},
+ (int *)&conf->initial_color_theme);
+ }
+
else {
LOG_CONTEXTUAL_ERR("not a valid option: %s", key);
return false;
@@ -3402,7 +3411,7 @@ config_load(struct config *conf, const char *conf_path,
.url = false,
},
},
-
+ .initial_color_theme = COLOR_THEME1,
.cursor = {
.style = CURSOR_BLOCK,
.unfocused_style = CURSOR_UNFOCUSED_HOLLOW,
diff --git a/config.h b/config.h
index 8954b270..cbdf11b1 100644
--- a/config.h
+++ b/config.h
@@ -190,6 +190,11 @@ struct color_theme {
} use_custom;
};
+enum which_color_theme {
+ COLOR_THEME1,
+ COLOR_THEME2,
+};
+
struct config {
char *term;
char *shell;
@@ -305,6 +310,7 @@ struct config {
struct color_theme colors;
struct color_theme colors2;
+ enum which_color_theme initial_color_theme;
struct {
enum cursor_style style;
diff --git a/doc/foot.ini.5.scd b/doc/foot.ini.5.scd
index 85a7cf7b..f7da2c53 100644
--- a/doc/foot.ini.5.scd
+++ b/doc/foot.ini.5.scd
@@ -349,6 +349,18 @@ empty string to be set, but it must be quoted: *KEY=""*)
Default: _yes_
+*initial-color-theme*
+ Selects which color theme to use, *1*, or *2*.
+
+ *1* uses the colors defined in the *colors* section, while *2*
+ uses the colors from the *colors2* section.
+
+ Use the *color-theme-switch-1*, *color-theme-switch-2* and
+ *color-theme-toggle* key bindings to switch between the two themes
+ at runtime.
+
+ Default: _1_
+
*initial-window-size-pixels*
Initial window width and height in _pixels_ (subject to output
scaling), in the form _WIDTHxHEIGHT_. The height _includes_ the
diff --git a/foot.ini b/foot.ini
index ebbc8ca7..563558db 100644
--- a/foot.ini
+++ b/foot.ini
@@ -23,6 +23,7 @@
# box-drawings-uses-font-glyphs=no
# dpi-aware=no
+# initial-color-theme=1
# initial-window-size-pixels=700x500 # Or,
# initial-window-size-chars=<COLSxROWS>
# initial-window-mode=windowed
diff --git a/terminal.c b/terminal.c
index 29e03b8e..d25516cb 100644
--- a/terminal.c
+++ b/terminal.c
@@ -1262,6 +1262,12 @@ term_init(const struct config *conf, struct fdm *fdm, struct reaper *reaper,
const bool ten_bit_surfaces = conf->tweak.surface_bit_depth == SHM_10_BIT;
+ const struct color_theme *theme = NULL;
+ switch (conf->initial_color_theme) {
+ case COLOR_THEME1: theme = &conf->colors; break;
+ case COLOR_THEME2: theme = &conf->colors2; break;
+ }
+
/* Initialize configure-based terminal attributes */
*term = (struct terminal) {
.fdm = fdm,
@@ -1279,7 +1285,7 @@ term_init(const struct config *conf, struct fdm *fdm, struct reaper *reaper,
},
.font_dpi = 0.,
.font_dpi_before_unmap = -1.,
- .font_subpixel = (conf->colors.alpha == 0xffff /* Can't do subpixel rendering on transparent background */
+ .font_subpixel = (theme->alpha == 0xffff /* Can't do subpixel rendering on transparent background */
? FCFT_SUBPIXEL_DEFAULT
: FCFT_SUBPIXEL_NONE),
.cursor_keys_mode = CURSOR_KEYS_NORMAL,
@@ -1295,15 +1301,15 @@ term_init(const struct config *conf, struct fdm *fdm, struct reaper *reaper,
.state = 0, /* STATE_GROUND */
},
.colors = {
- .fg = conf->colors.fg,
- .bg = conf->colors.bg,
- .alpha = conf->colors.alpha,
- .cursor_fg = (conf->colors.use_custom.cursor ? 1u << 31 : 0) | conf->colors.cursor.text,
- .cursor_bg = (conf->colors.use_custom.cursor ? 1u << 31 : 0) | conf->colors.cursor.cursor,
- .selection_fg = conf->colors.selection_fg,
- .selection_bg = conf->colors.selection_bg,
- .use_custom_selection = conf->colors.use_custom.selection,
- .active_theme = COLOR_THEME1,
+ .fg = theme->fg,
+ .bg = theme->bg,
+ .alpha = theme->alpha,
+ .cursor_fg = (theme->use_custom.cursor ? 1u << 31 : 0) | theme->cursor.text,
+ .cursor_bg = (theme->use_custom.cursor ? 1u << 31 : 0) | theme->cursor.cursor,
+ .selection_fg = theme->selection_fg,
+ .selection_bg = theme->selection_bg,
+ .use_custom_selection = theme->use_custom.selection,
+ .active_theme = conf->initial_color_theme,
},
.color_stack = {
.stack = NULL,
@@ -1434,7 +1440,7 @@ term_init(const struct config *conf, struct fdm *fdm, struct reaper *reaper,
xassert(tll_length(term->wl->monitors) > 0);
term->scale = tll_front(term->wl->monitors).scale;
- memcpy(term->colors.table, term->conf->colors.table, sizeof(term->colors.table));
+ memcpy(term->colors.table, theme->table, sizeof(term->colors.table));
/* Initialize the Wayland window backend */
if ((term->window = wayl_win_init(term, token)) == NULL)
@@ -2148,11 +2154,18 @@ term_reset(struct terminal *term, bool hard)
if (!hard)
return;
+ const struct color_theme *theme = NULL;
+
+ switch (term->conf->initial_color_theme) {
+ case COLOR_THEME1: theme = &term->conf->colors; break;
+ case COLOR_THEME2: theme = &term->conf->colors2; break;
+ }
+
term->flash.active = false;
term->blink.state = BLINK_ON;
fdm_del(term->fdm, term->blink.fd); term->blink.fd = -1;
- term_theme_apply(term, &term->conf->colors);
- term->colors.active_theme = COLOR_THEME1;
+ term_theme_apply(term, theme);
+ term->colors.active_theme = term->conf->initial_color_theme;
free(term->color_stack.stack);
term->color_stack.stack = NULL;
term->color_stack.size = 0;
diff --git a/terminal.h b/terminal.h
index e6499ef7..4639fa69 100644
--- a/terminal.h
+++ b/terminal.h
@@ -405,7 +405,7 @@ struct colors {
uint32_t selection_fg;
uint32_t selection_bg;
bool use_custom_selection;
- enum { COLOR_THEME1, COLOR_THEME2 } active_theme;
+ enum which_color_theme active_theme;
};
struct terminal {