From f03b61131b3407929fea187a309fb336017791d1 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Sat, 16 May 2020 15:01:30 +0000
Subject: Drop having a separate type for style options and make them all
 strings, which allows formats to be expanded. Any styles without a '#{' are
 still validated when they are set but any with a '#{' are not. Formats are
 not expanded usefully in many cases yet, that will be changed later.

To make this work, a few other changes:

- set-option -a with a style option automatically appends a ",".

- OSC 10 and 11 don't set the window-style option anymore, instead the
  fg and bg are stored in the pane struct and act as the defaults that
  can be overridden by window-style.

- status-fg and -bg now override status-style instead of trying to keep
  them in sync.
---
 tty.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'tty.c')

diff --git a/tty.c b/tty.c
index 99b433ae..e378b45d 100644
--- a/tty.c
+++ b/tty.c
@@ -2686,6 +2686,14 @@ tty_try_colour(struct tty *tty, int colour, const char *type)
 	return (-1);
 }
 
+static void
+tty_window_default_style(struct grid_cell *gc, struct window_pane *wp)
+{
+	memcpy(gc, &grid_default_cell, sizeof *gc);
+	gc->fg = wp->fg;
+	gc->bg = wp->bg;
+}
+
 static void
 tty_default_colours(struct grid_cell *gc, struct window_pane *wp)
 {
@@ -2694,8 +2702,12 @@ tty_default_colours(struct grid_cell *gc, struct window_pane *wp)
 
 	if (wp->flags & PANE_STYLECHANGED) {
 		wp->flags &= ~PANE_STYLECHANGED;
-		style_apply(&wp->cached_active_gc, oo, "window-active-style");
-		style_apply(&wp->cached_gc, oo, "window-style");
+
+		tty_window_default_style(&wp->cached_active_gc, wp);
+		style_add(&wp->cached_active_gc, oo, "window-active-style",
+		    NULL);
+		tty_window_default_style(&wp->cached_gc, wp);
+		style_add(&wp->cached_gc, oo, "window-style", NULL);
 	}
 
 	if (gc->fg == 8) {
-- 
cgit