From 0cca695d6e75426e295e03668a4ed35ee62afe7c Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 25 Oct 2021 09:22:17 +0000
Subject: Instead of setting the popup default colours in the draw callback,
 set it up in popup_display and follow the same routine as panes in the draw
 and init_ctx callbacks - use the palette if the option value is default.
 Allows application-set fg and bg to work in panes again.

---
 screen-write.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'screen-write.c')

diff --git a/screen-write.c b/screen-write.c
index e2904ef6..251ca823 100644
--- a/screen-write.c
+++ b/screen-write.c
@@ -184,8 +184,10 @@ screen_write_initctx(struct screen_write_ctx *ctx, struct tty_ctx *ttyctx,
 	if (ctx->init_ctx_cb != NULL) {
 		ctx->init_ctx_cb(ctx, ttyctx);
 		if (ttyctx->palette != NULL) {
-			ttyctx->defaults.fg = ttyctx->palette->fg;
-			ttyctx->defaults.bg = ttyctx->palette->bg;
+			if (COLOUR_DEFAULT(ttyctx->defaults.fg))
+				ttyctx->defaults.fg = ttyctx->palette->fg;
+			if (COLOUR_DEFAULT(ttyctx->defaults.bg))
+				ttyctx->defaults.bg = ttyctx->palette->bg;
 		}
 	} else {
 		ttyctx->redraw_cb = screen_write_redraw_cb;
-- 
cgit 


From ef46eb91a5e0b6e2b023544f45dbc98c8fe1377f Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 25 Oct 2021 09:38:36 +0000
Subject: Add -s and -S to display-popup to set popup and border style, from
 Alexis Hildebrandt in GitHub issue 2931.

---
 screen-write.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'screen-write.c')

diff --git a/screen-write.c b/screen-write.c
index 251ca823..cead12d4 100644
--- a/screen-write.c
+++ b/screen-write.c
@@ -184,9 +184,9 @@ screen_write_initctx(struct screen_write_ctx *ctx, struct tty_ctx *ttyctx,
 	if (ctx->init_ctx_cb != NULL) {
 		ctx->init_ctx_cb(ctx, ttyctx);
 		if (ttyctx->palette != NULL) {
-			if (COLOUR_DEFAULT(ttyctx->defaults.fg))
+			if (ttyctx->defaults.fg == 8)
 				ttyctx->defaults.fg = ttyctx->palette->fg;
-			if (COLOUR_DEFAULT(ttyctx->defaults.bg))
+			if (ttyctx->defaults.bg == 8)
 				ttyctx->defaults.bg = ttyctx->palette->bg;
 		}
 	} else {
-- 
cgit