summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicm <nicm>2020-03-15 20:35:52 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2020-03-17 16:16:09 +0000
commitf16085a362129f3b6801005fdff038d6845f4613 (patch)
tree7fefd127c85e855cf156bc66990821e8ea682f1c
parent4ffbebedce48d1758e082a82cbe9292fee358992 (diff)
Fix C-Space key string.
-rw-r--r--key-string.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/key-string.c b/key-string.c
index d2b31e03..38e5b8a7 100644
--- a/key-string.c
+++ b/key-string.c
@@ -257,6 +257,10 @@ key_string_lookup_key(key_code key)
return (out);
}
+ /* Display C-@ as C-Space. */
+ if ((key & KEYC_MASK_KEY) == 0)
+ key = ' ' | KEYC_CTRL | (key & KEYC_MASK_MOD);
+
/* Fill in the modifiers. */
if (key & KEYC_CTRL)
strlcat(out, "C-", sizeof out);
@@ -329,15 +333,6 @@ key_string_lookup_key(key_code key)
return (out);
}
- /*
- * Special case: display C-@ as C-Space. Could do this below in
- * the (key >= 0 && key <= 32), but this way we let it be found
- * in key_string_table, for the unlikely chance that we might
- * change its name.
- */
- if ((key & KEYC_MASK_KEY) == 0)
- key = ' ' | KEYC_CTRL | (key & KEYC_MASK_MOD);
-
/* Try the key against the string table. */
for (i = 0; i < nitems(key_string_table); i++) {
if (key == key_string_table[i].key)