aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2025-07-17 08:18:17 +0000
committerDaniel Eklöf <daniel@ekloef.se>2025-07-18 06:33:42 +0000
commit01387f9593294f4eb467a162f245e3c712635f35 (patch)
tree04f74a39d2cfafe9e2c6da82b226647727e00772
parenturl-mode: assign label keys in reverse order (diff)
main: SIGUSR1 selects the first color theme, SIGUSR2 the second
Before this patch, SIGUSR1 toggled between [colors] and [colors2]. Now, SIGUSR1 changes to [colors], regardless of what the current color theme is, and SIGUSR2 changes to [colors2]. Closes #2144
-rw-r--r--CHANGELOG.md4
-rw-r--r--main.c22
2 files changed, 21 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index df52e27d..af7fe73a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -71,8 +71,12 @@
* URL labels are now assigned in reverse order, from bottom to
top. This ensures the **last** URL (which is often the one you are
interested in) is always assigned the same key ([#2140][2140]).
+* Sending `SIGUSR1` no longer **toggles** between `[colors]` and
+ `[colors2]`, but explicitly changes to `[colors]`. `SIGUSR2` changes
+ to `[colors2]` ([#2144][2144]).
[2140]: https://codeberg.org/dnkl/foot/issues/2140
+[2144]: https://codeberg.org/dnkl/foot/issues/2144
### Deprecated
diff --git a/main.c b/main.c
index 37bbb6a7..517d8460 100644
--- a/main.c
+++ b/main.c
@@ -46,13 +46,22 @@ fdm_sigint(struct fdm *fdm, int signo, void *data)
}
static bool
-fdm_sigusr1(struct fdm *fdm, int signo, void *data)
+fdm_sigusr(struct fdm *fdm, int signo, void *data)
{
struct wayland *wayl = data;
- tll_foreach(wayl->terms, it) {
- struct terminal *term = it->item;
- term_theme_toggle(term);
+ xassert(signo == SIGUSR1 || signo == SIGUSR2);
+
+ if (signo == SIGUSR1) {
+ tll_foreach(wayl->terms, it) {
+ struct terminal *term = it->item;
+ term_theme_switch_to_1(term);
+ }
+ } else {
+ tll_foreach(wayl->terms, it) {
+ struct terminal *term = it->item;
+ term_theme_switch_to_2(term);
+ }
}
return true;
@@ -621,8 +630,11 @@ main(int argc, char *const *argv)
goto out;
}
- if (!fdm_signal_add(fdm, SIGUSR1, &fdm_sigusr1, wayl))
+ if (!fdm_signal_add(fdm, SIGUSR1, &fdm_sigusr, wayl) ||
+ !fdm_signal_add(fdm, SIGUSR2, &fdm_sigusr, wayl))
+ {
goto out;
+ }
struct sigaction sig_ign = {.sa_handler = SIG_IGN};
sigemptyset(&sig_ign.sa_mask);