Cleanup and rebase on master.

Makefile.am

@@ -174,8 +174,8 @@ dist_tmux_SOURCES = \
 	grid.c \
 	hooks.c \
 	hyperlinks.c \
-	input-kitty.c \
 	input-keys.c \
+	input-kitty.c \
 	input.c \
 	job.c \
 	json.c \
@@ -215,8 +215,8 @@ dist_tmux_SOURCES = \
 	tty-acs.c \
 	tty-draw.c \
 	tty-features.c \
-	tty-kitty.c \
 	tty-keys.c \
+	tty-kitty.c \
 	tty-term.c \
 	tty.c \
 	utf8-combined.c \

input-keys.c

@@ -682,9 +682,8 @@ input_key(struct screen *s, struct bufferevent *bev, key_code key)
 		log_debug("%s: ignoring key 0x%llx", __func__, key);
 		return (0);
 	}
-	if (key & (KEYC_SUPER|KEYC_HYPER))
+	if ((key & (KEYC_SUPER|KEYC_HYPER)) ||
-		return (input_key_vt10x(bev, key));
+	    (s->kitty_keys.flags & KITTY_KEY_SUPPORTED))
-	if (s->kitty_keys.flags & KITTY_KEY_SUPPORTED)
 		return (input_key_vt10x(bev, key));
 
 	/*

input-kitty.c

@@ -233,7 +233,7 @@ int
 input_key_kitty(struct screen *s, struct bufferevent *bev, key_code key)
 {
 	const struct input_kitty_key	*ikk;
-	struct utf8_data			 ud;
+	struct utf8_data		 ud;
 	wchar_t				 wc;
 	key_code			 modifiers, onlykey;
 	u_int				 flags, number, modifier;

key-string.c

@@ -163,36 +163,36 @@ static const struct {
 	{ "CapsLock",	KEYC_CAPSLOCK },
 	{ "ScrollLock",	KEYC_SCROLLLOCK },
 	{ "NumLock",	KEYC_NUMLOCK },
-	{ "PrintScreen", KEYC_PRINTSCREEN },
+	{ "PrintScreen",	KEYC_PRINTSCREEN },
 	{ "Pause",	KEYC_PAUSE },
 	{ "Menu",	KEYC_MENU },
 	{ "MediaPlay",	KEYC_MEDIA_PLAY },
-	{ "MediaPause", KEYC_MEDIA_PAUSE },
+	{ "MediaPause",	KEYC_MEDIA_PAUSE },
-	{ "MediaPlayPause", KEYC_MEDIA_PLAYPAUSE },
+	{ "MediaPlayPause",	KEYC_MEDIA_PLAYPAUSE },
-	{ "MediaReverse", KEYC_MEDIA_REVERSE },
+	{ "MediaReverse",	KEYC_MEDIA_REVERSE },
 	{ "MediaStop",	KEYC_MEDIA_STOP },
-	{ "MediaFastForward", KEYC_MEDIA_FASTFORWARD },
+	{ "MediaFastForward",	KEYC_MEDIA_FASTFORWARD },
-	{ "MediaRewind", KEYC_MEDIA_REWIND },
+	{ "MediaRewind",	KEYC_MEDIA_REWIND },
 	{ "MediaNext",	KEYC_MEDIA_NEXT },
-	{ "MediaPrevious", KEYC_MEDIA_PREVIOUS },
+	{ "MediaPrevious",	KEYC_MEDIA_PREVIOUS },
-	{ "MediaRecord", KEYC_MEDIA_RECORD },
+	{ "MediaRecord",	KEYC_MEDIA_RECORD },
-	{ "VolumeDown", KEYC_VOLUME_DOWN },
+	{ "VolumeDown",	KEYC_VOLUME_DOWN },
 	{ "VolumeUp",	KEYC_VOLUME_UP },
-	{ "VolumeMute", KEYC_VOLUME_MUTE },
+	{ "VolumeMute",	KEYC_VOLUME_MUTE },
 	{ "LeftShift",	KEYC_LEFT_SHIFT },
-	{ "LeftControl", KEYC_LEFT_CTRL },
+	{ "LeftControl",	KEYC_LEFT_CTRL },
 	{ "LeftAlt",	KEYC_LEFT_ALT },
 	{ "LeftSuper",	KEYC_LEFT_SUPER },
 	{ "LeftHyper",	KEYC_LEFT_HYPER },
 	{ "LeftMeta",	KEYC_LEFT_META },
-	{ "RightShift", KEYC_RIGHT_SHIFT },
+	{ "RightShift",	KEYC_RIGHT_SHIFT },
-	{ "RightControl", KEYC_RIGHT_CTRL },
+	{ "RightControl",	KEYC_RIGHT_CTRL },
 	{ "RightAlt",	KEYC_RIGHT_ALT },
-	{ "RightSuper", KEYC_RIGHT_SUPER },
+	{ "RightSuper",	KEYC_RIGHT_SUPER },
-	{ "RightHyper", KEYC_RIGHT_HYPER },
+	{ "RightHyper",	KEYC_RIGHT_HYPER },
 	{ "RightMeta",	KEYC_RIGHT_META },
-	{ "ISOLevel3Shift", KEYC_ISO_LEVEL3_SHIFT },
+	{ "ISOLevel3Shift",	KEYC_ISO_LEVEL3_SHIFT },
-	{ "ISOLevel5Shift", KEYC_ISO_LEVEL5_SHIFT },
+	{ "ISOLevel5Shift",	KEYC_ISO_LEVEL5_SHIFT },
 
 	/* Mouse keys. */
 	KEYC_MOUSE_STRING(MOUSEDOWN1, MouseDown1),

regress/kitty-keys-terminal.sh

@@ -23,8 +23,7 @@ SOCKET=$DIR/kitty
 OUT=$DIR/out
 TMUX="$TEST_TMUX -LtestKrt$$ -f$CONF"
 
-printf '%s\n' 'set -g extended-keys on' \
+printf '%s\n' 'set -g extended-keys on' >"$CONF"
-    'set -g extended-keys-format kitty' >"$CONF"
 
 cleanup()
 {

tmux.1

@@ -5144,7 +5144,6 @@ and use the
 internal set only.
 .It kittykeys
 Supports the Kitty keyboard protocol.
-This is added automatically if the terminal answers the Kitty keyboard query.
 .It margins
 Supports DECSLRM margins.
 .It mouse

tmux.h

@@ -3134,6 +3134,12 @@ int		tty_keys_next(struct tty *);
 int		tty_keys_colours(struct tty *, const char *, size_t, size_t *,
 		     int *, int *);
 
+/* tty-kitty.c */
+int		tty_keys_kitty(struct tty *, const char *, size_t, size_t *,
+		     key_code *);
+int		tty_keys_kitty_query(struct tty *, const char *, size_t,
+		     size_t *);
+
 /* arguments.c */
 void		 args_set(struct args *, u_char, struct args_value *, int);
 struct args 	*args_create(void);
@@ -3538,11 +3544,6 @@ void	 input_kitty_push(struct screen *, u_int);
 void	 input_kitty_pop(struct screen *, u_int);
 int	 input_key_kitty(struct screen *, struct bufferevent *, key_code);
 
-/* tty-kitty.c */
-int	 tty_keys_kitty(struct tty *, const char *, size_t, size_t *,
-	     key_code *);
-int	 tty_keys_kitty_query(struct tty *, const char *, size_t, size_t *);
-
 /* colour.c */
 int	 colour_find_rgb(u_char, u_char, u_char);
 int	 colour_join_rgb(u_char, u_char, u_char);

tty-keys.c

@@ -879,7 +879,7 @@ tty_keys_next(struct tty *tty)
 		goto partial_key;
 	}
 
-	/* Is this an extended key press? */
+	/* Is this a Kitty keyboard protocol key press? */
 	switch (tty_keys_kitty(tty, buf, len, &size, &key)) {
 	case 0:		/* yes */
 		goto complete_key;