Add modified Tab key sequences, from Aaron Jensen, GitHub issue 3368.

diff --git a/usr.bin/tmux/input-keys.c b/usr.bin/tmux/input-keys.c
index 54f3470..eb2c865 100644 (file)
--- a/usr.bin/tmux/input-keys.c
+++ b/usr.bin/tmux/input-keys.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: input-keys.c,v 1.90 2022/05/30 13:02:55 nicm Exp $ */
+/* $OpenBSD: input-keys.c,v 1.91 2022/11/01 09:54:13 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -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))

diff --git a/usr.bin/tmux/key-string.c b/usr.bin/tmux/key-string.c
index c97d760..25d4106 100644 (file)
--- a/usr.bin/tmux/key-string.c
+++ b/usr.bin/tmux/key-string.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: key-string.c,v 1.69 2022/02/16 18:55:05 nicm Exp $ */
+/* $OpenBSD: key-string.c,v 1.70 2022/11/01 09:54:13 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -460,6 +460,8 @@ out:
                        strlcat(out, "I", sizeof out);
                if (saved & KEYC_BUILD_MODIFIERS)
                        strlcat(out, "B", sizeof out);
+               if (saved & KEYC_EXTENDED)
+                       strlcat(out, "E", sizeof out);
                strlcat(out, "]", sizeof out);
        }
        return (out);

diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h
index 7c7dbd5..3d49214 100644 (file)
--- a/usr.bin/tmux/tmux.h
+++ b/usr.bin/tmux/tmux.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.h,v 1.1183 2022/10/28 13:00:02 nicm Exp $ */
+/* $OpenBSD: tmux.h,v 1.1184 2022/11/01 09:54:13 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -137,6 +137,7 @@ struct winlink;
 #define KEYC_IMPLIED_META    0x08000000000000ULL
 #define KEYC_BUILD_MODIFIERS 0x10000000000000ULL
 #define KEYC_VI              0x20000000000000ULL
+#define KEYC_EXTENDED        0x40000000000000ULL
 
 /* Masks for key bits. */
 #define KEYC_MASK_MODIFIERS  0x00f00000000000ULL

diff --git a/usr.bin/tmux/tty-keys.c b/usr.bin/tmux/tty-keys.c
index 4d24010..3d2c031 100644 (file)
--- a/usr.bin/tmux/tty-keys.c
+++ b/usr.bin/tmux/tty-keys.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty-keys.c,v 1.158 2022/07/19 06:51:31 nicm Exp $ */
+/* $OpenBSD: tty-keys.c,v 1.159 2022/11/01 09:54:13 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -208,6 +208,9 @@ static const struct tty_default_key_raw tty_default_raw_keys[] = {
        /* Paste keys. */
        { "\033[200~", KEYC_PASTE_START },
        { "\033[201~", KEYC_PASTE_END },
+
+       /* Extended keys. */
+       { "\033[1;5Z", '\011'|KEYC_CTRL|KEYC_SHIFT|KEYC_EXTENDED },
 };
 
 /* Default xterm keys. */
@@ -974,7 +977,7 @@ tty_keys_extended_key(struct tty *tty, const char *buf, size_t len,
                log_debug("%s: extended key %.*s is %llx (%s)", c->name,
                    (int)*size, buf, nkey, key_string_lookup_key(nkey, 1));
        }
-       *key = nkey;
+       *key = nkey|KEYC_EXTENDED;
        return (0);
 }