circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-10-13 06:04:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2026-07-08 09:30:06 +01:00
parent e601bfb362 dac6514147
commit 0f354ac4e0
6 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
window.c
View File

@@ -2423,7 +2423,6 @@ window_pane_get_theme(struct window_pane *wp)
{
struct window *w;
struct client *loop;
enum client_theme theme;
int found_light = 0, found_dark = 0;
if (wp == NULL)
@@ -2431,14 +2430,9 @@ window_pane_get_theme(struct window_pane *wp)
w = wp->window;
/*
* Derive theme from pane background color, if it's not the default
* colour.
* Prefer a theme reported by an attached client with mode 2031 or DSR
* 996: the terminal knows its own light or dark mode.
*/
theme = colour_totheme(window_pane_get_bg(wp));
if (theme != THEME_UNKNOWN)
return (theme);
/* Try to find a client that has a theme. */
TAILQ_FOREACH(loop, &clients, entry) {
if (loop->flags & CLIENT_UNATTACHEDFLAGS)
continue;
@@ -2455,12 +2449,16 @@ window_pane_get_theme(struct window_pane *wp)
break;
}
}
if (found_dark && !found_light)
return (THEME_DARK);
if (found_light && !found_dark)
return (THEME_LIGHT);
return (THEME_UNKNOWN);
/*
* Otherwise guess from the pane background colour, for terminals which
* do not report a theme themselves.
*/
return (colour_totheme(window_pane_get_bg(wp)));
}
void