From f08bfa7cd13f605396ac7e2810b8fa516f8e11bd Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 19 Aug 2020 06:37:23 +0000
Subject: [PATCH 1/2] Respond to colour requests if a colour is available, from
 Michal Goral.

---
 input.c | 44 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/input.c b/input.c
index b1b8bf94..42a60c92 100644
--- a/input.c
+++ b/input.c
@@ -65,7 +65,7 @@ struct input_param {
 		INPUT_MISSING,
 		INPUT_NUMBER,
 		INPUT_STRING
-	}                       type;
+	}			type;
 	union {
 		int		num;
 		char	       *str;
@@ -81,7 +81,7 @@ struct input_ctx {
 	struct input_cell	cell;
 
 	struct input_cell	old_cell;
-	u_int 			old_cx;
+	u_int			old_cx;
 	u_int			old_cy;
 	int			old_mode;
 
@@ -121,7 +121,7 @@ struct input_ctx {
 	 * All input received since we were last in the ground state. Sent to
 	 * control clients on connection.
 	 */
-	struct evbuffer	 	*since_ground;
+	struct evbuffer		*since_ground;
 };
 
 /* Helper functions. */
@@ -2459,13 +2459,31 @@ input_osc_parse_colour(const char *p, u_int *r, u_int *g, u_int *b)
 	return (1);
 }
 
+/* Reply to a colour request. */
+static void
+input_osc_colour_reply(struct input_ctx *ictx, u_int n, int c)
+{
+    u_char	 r, g, b;
+    const char	*end;
+
+    if (c == 8 || (~c & COLOUR_FLAG_RGB))
+	    return;
+    colour_split_rgb(c, &r, &g, &b);
+
+    if (ictx->input_end == INPUT_END_BEL)
+	    end = "\007";
+    else
+	    end = "\033\\";
+    input_reply(ictx, "\033]%u;rgb:%02hhx/%02hhx/%02hhx%s", n, r, g, b, end);
+}
+
 /* Handle the OSC 4 sequence for setting (multiple) palette entries. */
 static void
 input_osc_4(struct input_ctx *ictx, const char *p)
 {
 	struct window_pane	*wp = ictx->wp;
 	char			*copy, *s, *next = NULL;
-	long	 		 idx;
+	long			 idx;
 	u_int			 r, g, b;
 
 	if (wp == NULL)
@@ -2497,17 +2515,22 @@ bad:
 	free(copy);
 }
 
-/* Handle the OSC 10 sequence for setting foreground colour. */
+/* Handle the OSC 10 sequence for setting and querying foreground colour. */
 static void
 input_osc_10(struct input_ctx *ictx, const char *p)
 {
 	struct window_pane	*wp = ictx->wp;
+	struct grid_cell	 defaults;
 	u_int			 r, g, b;
 
 	if (wp == NULL)
 		return;
-	if (strcmp(p, "?") == 0)
+
+	if (strcmp(p, "?") == 0) {
+		tty_default_colours(&defaults, wp);
+		input_osc_colour_reply(ictx, 10, defaults.fg);
 		return;
+	}
 
 	if (!input_osc_parse_colour(p, &r, &g, &b))
 		goto bad;
@@ -2520,17 +2543,22 @@ bad:
 	log_debug("bad OSC 10: %s", p);
 }
 
-/* Handle the OSC 11 sequence for setting background colour. */
+/* Handle the OSC 11 sequence for setting and querying background colour. */
 static void
 input_osc_11(struct input_ctx *ictx, const char *p)
 {
 	struct window_pane	*wp = ictx->wp;
+	struct grid_cell	 defaults;
 	u_int			 r, g, b;
 
 	if (wp == NULL)
 		return;
-	if (strcmp(p, "?") == 0)
+
+	if (strcmp(p, "?") == 0) {
+		tty_default_colours(&defaults, wp);
+		input_osc_colour_reply(ictx, 11, defaults.bg);
 		return;
+	}
 
 	if (!input_osc_parse_colour(p, &r, &g, &b))
 	    goto bad;

From d8b6560cbfb5677223982e4b27be92b2fcd034df Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 19 Aug 2020 07:15:42 +0000
Subject: [PATCH 2/2] Set alert flag for the current window if the session is
 unattached. GitHub issues 1182 and 2299. From Eric Garver.

---
 alerts.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/alerts.c b/alerts.c
index 38e88801..0f2eb179 100644
--- a/alerts.c
+++ b/alerts.c
@@ -200,7 +200,7 @@ alerts_check_bell(struct window *w)
 		 * not check WINLINK_BELL).
 		 */
 		s = wl->session;
-		if (s->curw != wl) {
+		if (s->curw != wl || s->attached == 0) {
 			wl->flags |= WINLINK_BELL;
 			server_status_session(s);
 		}
@@ -236,7 +236,7 @@ alerts_check_activity(struct window *w)
 		if (wl->flags & WINLINK_ACTIVITY)
 			continue;
 		s = wl->session;
-		if (s->curw != wl) {
+		if (s->curw != wl || s->attached == 0) {
 			wl->flags |= WINLINK_ACTIVITY;
 			server_status_session(s);
 		}
@@ -272,7 +272,7 @@ alerts_check_silence(struct window *w)
 		if (wl->flags & WINLINK_SILENCE)
 			continue;
 		s = wl->session;
-		if (s->curw != wl) {
+		if (s->curw != wl || s->attached == 0) {
 			wl->flags |= WINLINK_SILENCE;
 			server_status_session(s);
 		}