circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-04-25 06:08:53 +00:00
Code Issues Projects Releases Wiki Activity

When toggling between sessions, ensure that applications in the new session adapt to the client's theme.

Browse Source
This commit is contained in:
Jonathan Slenders 2025-02-27 20:50:39 +00:00
parent b448f4ba6c
commit b3d3a37e5e
4 changed files with 17 additions and 16 deletions

1
server-client.c
View File

@ -401,6 +401,7 @@ server_client_set_session(struct client *c, struct session *s)
recalculate_sizes(); recalculate_sizes();
window_update_focus(s->curw->window); window_update_focus(s->curw->window);
session_update_activity(s, NULL); session_update_activity(s, NULL);
session_theme_changed(s);
gettimeofday(&s->last_attached_time, NULL); gettimeofday(&s->last_attached_time, NULL);
s->curw->flags &= ~WINLINK_ALERTFLAGS; s->curw->flags &= ~WINLINK_ALERTFLAGS;
s->curw->window->latest = c; s->curw->window->latest = c;

13
session.c
View File

@ -751,3 +751,16 @@ session_renumber_windows(struct session *s)
RB_FOREACH_SAFE(wl, winlinks, &old_wins, wl1) RB_FOREACH_SAFE(wl, winlinks, &old_wins, wl1)
winlink_remove(&old_wins, wl); winlink_remove(&old_wins, wl);
} }
/* Set the PANE_THEMECHANGED flag for every pane in this session. */
void
session_theme_changed(struct session *s)
{
struct window_pane *wp;
struct winlink *wl;
RB_FOREACH(wl, winlinks, &s->windows) {
TAILQ_FOREACH(wp, &wl->window->panes, entry)
wp->flags |= PANE_THEMECHANGED;
}
}

1
tmux.h
View File

@ -3464,6 +3464,7 @@ void session_group_synchronize_from(struct session *);
u_int session_group_count(struct session_group *); u_int session_group_count(struct session_group *);
u_int session_group_attached_count(struct session_group *); u_int session_group_attached_count(struct session_group *);
void session_renumber_windows(struct session *); void session_renumber_windows(struct session *);
void session_theme_changed(struct session *);
/* utf8.c */ /* utf8.c */
enum utf8_state utf8_towc (const struct utf8_data *, wchar_t *); enum utf8_state utf8_towc (const struct utf8_data *, wchar_t *);

18
tty-keys.c
View File

@ -59,7 +59,6 @@ static int tty_keys_device_attributes2(struct tty *, const char *, size_t,
size_t *); size_t *);
static int tty_keys_extended_device_attributes(struct tty *, const char *, static int tty_keys_extended_device_attributes(struct tty *, const char *,
size_t, size_t *); size_t, size_t *);
static void tty_keys_theme_changed(struct tty *);
/* A key tree entry. */ /* A key tree entry. */
struct tty_key { struct tty_key {
@ -796,12 +795,12 @@ tty_keys_next(struct tty *tty)
switch (tty_keys_colours(tty, buf, len, &size, &tty->fg, &tty->bg)) { switch (tty_keys_colours(tty, buf, len, &size, &tty->fg, &tty->bg)) {
case 0: /* yes */ case 0: /* yes */
key = KEYC_UNKNOWN; key = KEYC_UNKNOWN;
tty_keys_theme_changed(tty); session_theme_changed(tty->client->session);
goto complete_key; goto complete_key;
case -1: /* no, or not valid */ case -1: /* no, or not valid */
break; break;
case 1: /* partial */ case 1: /* partial */
tty_keys_theme_changed(tty); session_theme_changed(tty->client->session);
goto partial_key; goto partial_key;
} }
@ -1686,16 +1685,3 @@ tty_keys_colours(struct tty *tty, const char *buf, size_t len, size_t *size,
return (0); return (0);
} }
/* Set the PANE_THEMECHANGED flag for every pane for client's session. */
static void
tty_keys_theme_changed(struct tty *tty)
{
struct window_pane *wp;
struct winlink *wl;
RB_FOREACH(wl, winlinks, &tty->client->session->windows) {
TAILQ_FOREACH(wp, &wl->window->panes, entry)
wp->flags |= PANE_THEMECHANGED;
}
}