From 2d08235987efa1e2f9c932c4a5c8a0200b4804c1 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 1 Nov 2022 09:54:13 +0000
Subject: Add modified Tab key sequences, from Aaron Jensen, GitHub issue 3368.

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

(limited to 'input-keys.c')

diff --git a/input-keys.c b/input-keys.c
index 038003df..5c4d3e1b 100644
--- a/input-keys.c
+++ b/input-keys.c
@@ -307,6 +307,20 @@ static struct input_key_entry input_key_defaults[] = {
 	},
 	{ .key = KEYC_DC|KEYC_BUILD_MODIFIERS,
 	  .data = "\033[3;_~"
+	},
+
+	/* Tab and modifiers. */
+	{ .key = '\011'|KEYC_CTRL,
+	  .data = "\011"
+	},
+	{ .key = '\011'|KEYC_CTRL|KEYC_EXTENDED,
+	  .data = "\033[9;5u"
+	},
+	{ .key = '\011'|KEYC_CTRL|KEYC_SHIFT,
+	  .data = "\011"
+	},
+	{ .key = '\011'|KEYC_CTRL|KEYC_SHIFT|KEYC_EXTENDED,
+	  .data = "\033[1;5Z"
 	}
 };
 static const key_code input_key_modifiers[] = {
@@ -469,6 +483,8 @@ input_key(struct screen *s, struct bufferevent *bev, key_code key)
 		key &= ~KEYC_KEYPAD;
 	if (~s->mode & MODE_KCURSOR)
 		key &= ~KEYC_CURSOR;
+	if (~s->mode & MODE_KEXTENDED)
+		key &= ~KEYC_EXTENDED;
 	ike = input_key_get(key);
 	if (ike == NULL && (key & KEYC_META) && (~key & KEYC_IMPLIED_META))
 		ike = input_key_get(key & ~KEYC_META);
@@ -476,6 +492,8 @@ input_key(struct screen *s, struct bufferevent *bev, key_code key)
 		ike = input_key_get(key & ~KEYC_CURSOR);
 	if (ike == NULL && (key & KEYC_KEYPAD))
 		ike = input_key_get(key & ~KEYC_KEYPAD);
+	if (ike == NULL && (key & KEYC_EXTENDED))
+		ike = input_key_get(key & ~KEYC_EXTENDED);
 	if (ike != NULL) {
 		log_debug("found key 0x%llx: \"%s\"", key, ike->data);
 		if ((key & KEYC_META) && (~key & KEYC_IMPLIED_META))
-- 
cgit 


From 9614f5156079773b338a13e95ec932cc7c95b031 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 2 Nov 2022 07:36:07 +0000
Subject: Instead of always setting the extended flag, set it only when
 searching. Allows send-keys to work. From Aaron Jensen.

---
 input-keys.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'input-keys.c')

diff --git a/input-keys.c b/input-keys.c
index 5c4d3e1b..d48d7d09 100644
--- a/input-keys.c
+++ b/input-keys.c
@@ -431,7 +431,7 @@ input_key_write(const char *from, struct bufferevent *bev, const char *data,
 int
 input_key(struct screen *s, struct bufferevent *bev, key_code key)
 {
-	struct input_key_entry	*ike;
+	struct input_key_entry	*ike = NULL;
 	key_code		 justkey, newkey, outkey, modifiers;
 	struct utf8_data	 ud;
 	char			 tmp[64], modifier;
@@ -483,9 +483,10 @@ input_key(struct screen *s, struct bufferevent *bev, key_code key)
 		key &= ~KEYC_KEYPAD;
 	if (~s->mode & MODE_KCURSOR)
 		key &= ~KEYC_CURSOR;
-	if (~s->mode & MODE_KEXTENDED)
-		key &= ~KEYC_EXTENDED;
-	ike = input_key_get(key);
+	if (s->mode & MODE_KEXTENDED)
+		ike = input_key_get(key|KEYC_EXTENDED);
+	if (ike == NULL)
+		ike = input_key_get(key);
 	if (ike == NULL && (key & KEYC_META) && (~key & KEYC_IMPLIED_META))
 		ike = input_key_get(key & ~KEYC_META);
 	if (ike == NULL && (key & KEYC_CURSOR))
-- 
cgit 


From f86eba21294b61f410300b0c9a8920cb155ab738 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 8 Nov 2022 10:04:31 +0000
Subject: Fix C-S-Tab without extended keys, from Aaron Jensen.

---
 input-keys.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'input-keys.c')

diff --git a/input-keys.c b/input-keys.c
index d48d7d09..93123b33 100644
--- a/input-keys.c
+++ b/input-keys.c
@@ -317,7 +317,7 @@ static struct input_key_entry input_key_defaults[] = {
 	  .data = "\033[9;5u"
 	},
 	{ .key = '\011'|KEYC_CTRL|KEYC_SHIFT,
-	  .data = "\011"
+	  .data = "\033[Z"
 	},
 	{ .key = '\011'|KEYC_CTRL|KEYC_SHIFT|KEYC_EXTENDED,
 	  .data = "\033[1;5Z"
-- 
cgit 


From 483cc77c1cbc6898fef143c8100945139c14a92c Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 12 Jan 2023 18:49:11 +0000
Subject: Have tmux recognise pasted texts wrapped in bracket paste sequences,
 rather than only forwarding them to the program inside. From Andrew Onyshchuk
 in GitHub issue 3431.

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

(limited to 'input-keys.c')

diff --git a/input-keys.c b/input-keys.c
index 93123b33..f3281b0e 100644
--- a/input-keys.c
+++ b/input-keys.c
@@ -497,6 +497,9 @@ input_key(struct screen *s, struct bufferevent *bev, key_code key)
 		ike = input_key_get(key & ~KEYC_EXTENDED);
 	if (ike != NULL) {
 		log_debug("found key 0x%llx: \"%s\"", key, ike->data);
+		if ((key == KEYC_PASTE_START || key == KEYC_PASTE_END) &&
+		    (~s->mode & MODE_BRACKETPASTE))
+			return (0);
 		if ((key & KEYC_META) && (~key & KEYC_IMPLIED_META))
 			input_key_write(__func__, bev, "\033", 1);
 		input_key_write(__func__, bev, ike->data, strlen(ike->data));
-- 
cgit