From 21da45e5c3ec26a42d8c6a6de3556d47acdef0a9 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Sun, 5 Apr 2026 14:29:04 +0000
Subject: [PATCH] Add extkeys feature to tmux itself so nested tmux works,
 GitHub issue 4960.

---
 tty-features.c | 48 +++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 37 insertions(+), 11 deletions(-)

diff --git a/tty-features.c b/tty-features.c
index 18922956..623e8f20 100644
--- a/tty-features.c
+++ b/tty-features.c
@@ -464,23 +464,46 @@ tty_default_features(int *feat, const char *name, u_int version)
 #define TTY_FEATURES_BASE_MODERN_XTERM \
 	"256,RGB,bpaste,clipboard,mouse,strikethrough,title"
 		{ .name = "mintty",
-		  .features = TTY_FEATURES_BASE_MODERN_XTERM
-			      ",ccolour,cstyle,extkeys,margins,overline,usstyle"
+		  .features = TTY_FEATURES_BASE_MODERN_XTERM ","
+		              "ccolour,"
+		              "cstyle,"
+		              "extkeys,"
+		              "margins,"
+		              "overline,"
+		              "usstyle"
 		},
 		{ .name = "tmux",
-		  .features = TTY_FEATURES_BASE_MODERN_XTERM
-			      ",ccolour,cstyle,focus,overline,usstyle,hyperlinks"
+		  .features = TTY_FEATURES_BASE_MODERN_XTERM ","
+		              "ccolour,"
+		              "cstyle,"
+		              "extkeys,"
+		              "focus,"
+		              "overline,"
+		              "usstyle,"
+		              "hyperlinks"
 		},
 		{ .name = "rxvt-unicode",
-		  .features = "256,bpaste,ccolour,cstyle,mouse,title,ignorefkeys"
+		  .features = "256,"
+		              "bpaste,"
+		              "ccolour,"
+		              "cstyle,"
+		              "mouse,"
+		              "title,"
+		              "ignorefkeys"
 		},
 		{ .name = "iTerm2",
-		  .features = TTY_FEATURES_BASE_MODERN_XTERM
-			      ",cstyle,extkeys,margins,usstyle,sync,osc7,hyperlinks"
+		  .features = TTY_FEATURES_BASE_MODERN_XTERM ","
+		              "cstyle,"
+		              "extkeys,"
+		              "margins,"
+		              "usstyle,"
+		              "sync,"
+		              "osc7,hyperlinks"
 		},
 		{ .name = "foot",
-		  .features = TTY_FEATURES_BASE_MODERN_XTERM
-		              ",cstyle,extkeys"
+		  .features = TTY_FEATURES_BASE_MODERN_XTERM ","
+		              "cstyle,"
+		              "extkeys"
 		},
 		{ .name = "XTerm",
 		  /*
@@ -488,8 +511,11 @@ tty_default_features(int *feat, const char *name, u_int version)
 		   * disabled so not set it here - they will be added if
 		   * secondary DA shows VT420.
 		   */
-		  .features = TTY_FEATURES_BASE_MODERN_XTERM
-			      ",ccolour,cstyle,extkeys,focus"
+		  .features = TTY_FEATURES_BASE_MODERN_XTERM ","
+		              "ccolour,"
+		              "cstyle,"
+		              "extkeys,"
+		              "focus"
 		}
 	};
 	u_int	i;