circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 13:37:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2025-03-31 00:01:10 +01:00
parent c2a95a372f ef923d28ff
commit dfdced2ab1
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd-refresh-client.c
View File

@ -36,7 +36,7 @@ const struct cmd_entry cmd_refresh_client_entry = {
.args = { "A:B:cC:Df:r:F:l::LRSt:U", 0, 1, NULL }, .args = { "A:B:cC:Df:r:F:l::LRSt:U", 0, 1, NULL },
.usage = "[-cDlLRSU] [-A pane:state] [-B name:what:format] " .usage = "[-cDlLRSU] [-A pane:state] [-B name:what:format] "
"[-C XxY] [-f flags] [-r pane:report]" CMD_TARGET_CLIENT_USAGE "[-C XxY] [-f flags] [-r pane:report] " CMD_TARGET_CLIENT_USAGE
" [adjustment]", " [adjustment]",
.flags = CMD_AFTERHOOK|CMD_CLIENT_TFLAG, .flags = CMD_AFTERHOOK|CMD_CLIENT_TFLAG,

10
session.c
View File

@ -361,7 +361,7 @@ session_detach(struct session *s, struct winlink *wl)
if (RB_EMPTY(&s->windows)) if (RB_EMPTY(&s->windows))
return (1); return (1);
return (0); return (0);
} }
/* Return if session has window. */ /* Return if session has window. */
@ -759,8 +759,10 @@ session_theme_changed(struct session *s)
struct window_pane *wp; struct window_pane *wp;
struct winlink *wl; struct winlink *wl;
RB_FOREACH(wl, winlinks, &s->windows) { if (s != NULL) {
TAILQ_FOREACH(wp, &wl->window->panes, entry) RB_FOREACH(wl, winlinks, &s->windows) {
wp->flags |= PANE_THEMECHANGED; TAILQ_FOREACH(wp, &wl->window->panes, entry)
wp->flags |= PANE_THEMECHANGED;
}
} }
} }

4
tty-keys.c
View File

@ -795,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;
session_theme_changed(tty->client->session); session_theme_changed(c->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 */
session_theme_changed(tty->client->session); session_theme_changed(c->session);
goto partial_key; goto partial_key;
} }