diff options
| author | Thomas Adam <thomas@xteddy.org> | 2021-08-12 22:01:22 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2021-08-12 22:01:22 +0100 |
| commit | 94d96c6179277cae2443a3358d538493683576c9 (patch) | |
| tree | 8e0c7c3ffd4b0888fd7d16c5b4996a148af09889 /tty.c | |
| parent | 9d7b1960c2bf36f678cbe213ba46221f0b80b31e (diff) | |
| parent | 6feb8f6505441583bb9f289da2227954c8335ce4 (diff) | |
| download | rtmux-94d96c6179277cae2443a3358d538493683576c9.tar.gz rtmux-94d96c6179277cae2443a3358d538493683576c9.tar.bz2 rtmux-94d96c6179277cae2443a3358d538493683576c9.zip | |
Merge branch 'obsd-master' into master
Diffstat (limited to 'tty.c')
| -rw-r--r-- | tty.c | 13 |
1 files changed, 9 insertions, 4 deletions
@@ -2790,18 +2790,23 @@ tty_window_default_style(struct grid_cell *gc, struct window_pane *wp) void tty_default_colours(struct grid_cell *gc, struct window_pane *wp) { - struct options *oo = wp->options; + struct options *oo = wp->options; + struct format_tree *ft; memcpy(gc, &grid_default_cell, sizeof *gc); if (wp->flags & PANE_STYLECHANGED) { + log_debug("%%%u: style changed", wp->id); wp->flags &= ~PANE_STYLECHANGED; + ft = format_create(NULL, NULL, FORMAT_PANE|wp->id, + FORMAT_NOJOBS); + format_defaults(ft, NULL, NULL, NULL, wp); tty_window_default_style(&wp->cached_active_gc, wp); - style_add(&wp->cached_active_gc, oo, "window-active-style", - NULL); + style_add(&wp->cached_active_gc, oo, "window-active-style", ft); tty_window_default_style(&wp->cached_gc, wp); - style_add(&wp->cached_gc, oo, "window-style", NULL); + style_add(&wp->cached_gc, oo, "window-style", ft); + format_free(ft); } if (gc->fg == 8) { |