diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/keymap.c | 12 | ||||
| -rw-r--r-- | src/nvim/keymap.h | 5 |
2 files changed, 12 insertions, 5 deletions
diff --git a/src/nvim/keymap.c b/src/nvim/keymap.c index eb0653c432..5e56e5f41b 100644 --- a/src/nvim/keymap.c +++ b/src/nvim/keymap.c @@ -40,6 +40,7 @@ static const struct modmasktable { // 'A' must be the last one { MOD_MASK_ALT, MOD_MASK_ALT, (char_u)'A' }, { 0, 0, NUL } + // NOTE: when adding an entry, update MAX_KEY_NAME_LEN! }; /* @@ -285,6 +286,7 @@ static const struct key_name_entry { { K_PLUG, "Plug" }, { K_PASTE, "Paste" }, { 0, NULL } + // NOTE: When adding a long name update MAX_KEY_NAME_LEN. }; static struct mousetable { @@ -472,9 +474,13 @@ char_u *get_special_key_name(int c, int modifiers) string[idx++] = *s++; } } - } else { /* use name of special key */ - STRCPY(string + idx, key_names_table[table_idx].name); - idx = (int)STRLEN(string); + } else { // use name of special key + size_t len = STRLEN(key_names_table[table_idx].name); + + if ((int)len + idx + 2 <= MAX_KEY_NAME_LEN) { + STRCPY(string + idx, key_names_table[table_idx].name); + idx += (int)len; + } } string[idx++] = '>'; string[idx] = NUL; diff --git a/src/nvim/keymap.h b/src/nvim/keymap.h index ee64854c98..04fc93e29e 100644 --- a/src/nvim/keymap.h +++ b/src/nvim/keymap.h @@ -448,9 +448,10 @@ enum key_extra { /* * The length of the longest special key name, including modifiers. - * Current longest is <M-C-S-T-4-MiddleRelease> (length includes '<' and '>'). + * Current longest is <M-C-S-T-D-A-4-ScrollWheelRight> (length includes '<' and + * '>'). */ -#define MAX_KEY_NAME_LEN 25 +#define MAX_KEY_NAME_LEN 32 // Maximum length of a special key event as tokens. This includes modifiers. // The longest event is something like <M-C-S-T-4-LeftDrag> which would be the |