Short Ctrl keys like ^A need to be converted to lowercase so they end up

as 'a'|KEYC_CTRL to match the new internal representation. Problem
reported by naddy@.

diff --git a/usr.bin/tmux/key-string.c b/usr.bin/tmux/key-string.c
index d9ba95a..0c96738 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.72 2024/08/21 04:17:09 nicm Exp $ */
+/* $OpenBSD: key-string.c,v 1.73 2024/08/22 05:39:55 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -18,6 +18,7 @@
 
 #include <sys/types.h>
 
+#include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
@@ -241,7 +242,7 @@ key_string_get_modifiers(const char **string)
 key_code
 key_string_lookup_string(const char *string)
 {
-       key_code                 key, modifiers;
+       key_code                 key, modifiers = 0;
        u_int                    u, i;
        struct utf8_data         ud, *udp;
        enum utf8_state          more;
@@ -276,14 +277,18 @@ key_string_lookup_string(const char *string)
                }
                free(udp);
                return (uc);
+
        }
 
-       /* Check for modifiers. */
-       modifiers = 0;
+       /* Check for short Ctrl key. */
        if (string[0] == '^' && string[1] != '\0') {
+               if (string[2] == '\0')
+                       return (tolower((u_char)string[1])|KEYC_CTRL);
                modifiers |= KEYC_CTRL;
                string++;
        }
+
+       /* Check for modifiers. */
        modifiers |= key_string_get_modifiers(&string);
        if (string == NULL || string[0] == '\0')
                return (KEYC_UNKNOWN);