Mercurial > vim
changeset 22407:c19acd92ee83 v8.2.1752
patch 8.2.1752: GTK GUI: cannot map alt-? with <A-?>
Commit: https://github.com/vim/vim/commit/daff0fb73851ef368ede180dbb3b772e55304ba7
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Sep 27 13:16:46 2020 +0200
patch 8.2.1752: GTK GUI: cannot map alt-? with <A-?>
Problem: GTK GUI: cannot map alt-? with <A-?>. (Ingo Karkat)
Solution: Adjust the characters for which the shift modifier is removed.
(closes #7016) Make Motif and Win32 use the same function as GTK.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 27 Sep 2020 13:30:03 +0200 |
| parents | 4b657770c9b7 |
| children | 001318b6f357 |
| files | src/gui_w32.c src/gui_x11.c src/misc2.c src/testdir/test_termcodes.vim src/version.c |
| diffstat | 5 files changed, 22 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gui_w32.c +++ b/src/gui_w32.c @@ -842,8 +842,7 @@ char_to_string(int ch, char_u *string, i ch = simplify_key(ch, &modifiers); // remove the SHIFT modifier for keys where it's already included, e.g., // '(' and '*' - if (ch < 0x100 && !isalpha(ch) && isprint(ch)) - modifiers &= ~MOD_MASK_SHIFT; + modifiers = may_remove_shift_modifier(modifiers, ch); // Unify modifiers somewhat. No longer use ALT to set the 8th bit. ch = extract_modifiers(ch, &modifiers, FALSE, NULL);
--- a/src/gui_x11.c +++ b/src/gui_x11.c @@ -958,8 +958,7 @@ gui_x11_key_hit_cb( // Remove the SHIFT modifier for keys where it's already included, // e.g., '(', '!' and '*'. - if (!ASCII_ISALPHA(key) && key > 0x20 && key < 0x7f) - modifiers &= ~MOD_MASK_SHIFT; + modifiers = may_remove_shift_modifier(modifiers, key); } if (modifiers != 0)
--- a/src/misc2.c +++ b/src/misc2.c @@ -2950,6 +2950,7 @@ find_special_key( * Some keys already have Shift included, pass them as normal keys. * Not when Ctrl is also used, because <C-H> and <C-S-H> are different. * Also for <A-S-a> and <M-S-a>. + * This includes all printable ASCII characters except numbers and a-z. */ int may_remove_shift_modifier(int modifiers, int key) @@ -2957,8 +2958,9 @@ may_remove_shift_modifier(int modifiers, if ((modifiers == MOD_MASK_SHIFT || modifiers == (MOD_MASK_SHIFT | MOD_MASK_ALT) || modifiers == (MOD_MASK_SHIFT | MOD_MASK_META)) - && ((key >= '@' && key <= 'Z') - || key == '^' || key == '_' + && ((key >= '!' && key <= '/') + || (key >= ':' && key <= 'Z') + || (key >= '[' && key <= '`') || (key >= '{' && key <= '~'))) return modifiers & ~MOD_MASK_SHIFT; return modifiers;
--- a/src/testdir/test_termcodes.vim +++ b/src/testdir/test_termcodes.vim @@ -2123,6 +2123,20 @@ func Test_mapping_works_with_shift_alt() call RunTest_mapping_works_with_mods(function('GetEscCodeCSIu'), 'S-A', 4) endfunc +func Test_mapping_works_with_alt_and_shift() + new + set timeoutlen=10 + + " mapping <A-?> works even though the code is A-S-? + for c in ['!', '$', '+', ':', '?', '^', '~'] + call RunTest_mapping_mods('<A-' .. c .. '>', c, function('GetEscCodeCSI27'), 4) + call RunTest_mapping_mods('<A-' .. c .. '>', c, function('GetEscCodeCSIu'), 4) + endfor + + bwipe! + set timeoutlen& +endfunc + func Test_mapping_works_with_ctrl_alt() call RunTest_mapping_works_with_mods(function('GetEscCodeCSI27'), 'C-A', 7) call RunTest_mapping_works_with_mods(function('GetEscCodeCSIu'), 'C-A', 7)