From d329b035cee47d968a8c93b5cbd8fde879ce6f0d Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 24 Jul 2020 07:05:37 +0000
Subject: Add a hook when the pane title changed.

---
 input.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'input.c')

diff --git a/input.c b/input.c
index a3850371..b1b8bf94 100644
--- a/input.c
+++ b/input.c
@@ -1867,6 +1867,7 @@ input_csi_dispatch_winops(struct input_ctx *ictx)
 			case 2:
 				screen_pop_title(sctx->s);
 				if (wp != NULL) {
+					notify_pane("pane-title-changed", wp);
 					server_redraw_window_borders(wp->window);
 					server_status_window(wp->window);
 				}
@@ -2261,6 +2262,7 @@ input_exit_osc(struct input_ctx *ictx)
 	case 0:
 	case 2:
 		if (screen_set_title(sctx->s, p) && wp != NULL) {
+			notify_pane("pane-title-changed", wp);
 			server_redraw_window_borders(wp->window);
 			server_status_window(wp->window);
 		}
@@ -2326,6 +2328,7 @@ input_exit_apc(struct input_ctx *ictx)
 	log_debug("%s: \"%s\"", __func__, ictx->input_buf);
 
 	if (screen_set_title(sctx->s, ictx->input_buf) && wp != NULL) {
+		notify_pane("pane-title-changed", wp);
 		server_redraw_window_borders(wp->window);
 		server_status_window(wp->window);
 	}
-- 
cgit 


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

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

(limited to 'input.c')

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;
-- 
cgit 


From a868bacb46e3c900530bed47a1c6f85b0fbe701c Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 29 Oct 2020 16:33:01 +0000
Subject: Do not write after the end of the array and overwrite the stack when
 colon-separated SGR sequences contain empty arguments. Reported by Sergey
 Nizovtsev.

---
 input.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'input.c')

diff --git a/input.c b/input.c
index 42a60c92..c280c0d9 100644
--- a/input.c
+++ b/input.c
@@ -1976,8 +1976,13 @@ input_csi_dispatch_sgr_colon(struct input_ctx *ictx, u_int i)
 				free(copy);
 				return;
 			}
-		} else
+		} else {
 			n++;
+			if (n == nitems(p)) {
+				free(copy);
+				return;
+			}
+		}
 		log_debug("%s: %u = %d", __func__, n - 1, p[n - 1]);
 	}
 	free(copy);
-- 
cgit 


From 8e1d28453d23d6283abe1bb709a4fe06139d2750 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 30 Oct 2020 11:34:13 +0000
Subject: Limit range of repeat to avoid silly high numbers causing delays,
 from Sergey Nizovtsev.

---
 input.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'input.c')

diff --git a/input.c b/input.c
index c280c0d9..8b7ba08a 100644
--- a/input.c
+++ b/input.c
@@ -1545,6 +1545,10 @@ input_csi_dispatch(struct input_ctx *ictx)
 		if (n == -1)
 			break;
 
+		m = screen_size_x(s) - s->cx;
+		if (n > m)
+			n = m;
+
 		if (ictx->last == -1)
 			break;
 		ictx->ch = ictx->last;
-- 
cgit