diff options
| author | LemonBoy <thatlemon@gmail.com> | 2022-04-28 19:50:54 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-04-28 19:50:54 +0100 |
| commit | 202b4bd3a452898cfe3ed72facfbf7cb8199fa4b (patch) | |
| tree | 54722014f107db4fb2fc338b9c1ea7fd5201105f | |
| parent | 211a5bb2353c66684f38527184a258921f95c9d9 (diff) | |
patch 8.2.4843: treating CTRL + ALT as AltGr is not backwards compatiblev8.2.4843
Problem: Win32 GUI: Treating CTRL + ALT as AltGr is not backwards
compatible. (Axel Bender)
Solution: Make a difference between left and right menu keys.
(closes #10308)
| -rw-r--r-- | src/gui_w32.c | 24 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 14 insertions, 12 deletions
diff --git a/src/gui_w32.c b/src/gui_w32.c index 9308e47852..f32bc30c9c 100644 --- a/src/gui_w32.c +++ b/src/gui_w32.c @@ -827,13 +827,13 @@ get_active_modifiers(void) modifiers |= MOD_MASK_CTRL; if (GetKeyState(VK_SHIFT) & 0x8000) modifiers |= MOD_MASK_SHIFT; - if (GetKeyState(VK_MENU) & 0x8000) - modifiers |= MOD_MASK_ALT; - // Windows handles Ctrl + Alt as AltGr, in that case no modifier is actually + // Windows handles Ctrl + Alt as AltGr and vice-versa. We can distinguish + // the two cases by checking whether the left or the right Alt key is // pressed. - if ((modifiers & (MOD_MASK_CTRL | MOD_MASK_ALT)) == - (MOD_MASK_CTRL | MOD_MASK_ALT)) - modifiers &= ~(MOD_MASK_CTRL | MOD_MASK_ALT); + if (GetKeyState(VK_LMENU) & 0x8000) + modifiers |= MOD_MASK_ALT; + if ((modifiers & MOD_MASK_CTRL) && (GetKeyState(VK_RMENU) & 0x8000)) + modifiers &= ~MOD_MASK_CTRL; return modifiers; } @@ -955,7 +955,7 @@ _OnMouseEvent( vim_modifiers |= MOUSE_SHIFT; if (keyFlags & MK_CONTROL) vim_modifiers |= MOUSE_CTRL; - if (GetKeyState(VK_MENU) & 0x8000) + if (GetKeyState(VK_LMENU) & 0x8000) vim_modifiers |= MOUSE_ALT; gui_send_mouse_event(button, x, y, repeated_click, vim_modifiers); @@ -1722,8 +1722,8 @@ gui_mch_haskey(char_u *name) int i; for (i = 0; special_keys[i].vim_code1 != NUL; i++) - if (name[0] == special_keys[i].vim_code0 && - name[1] == special_keys[i].vim_code1) + if (name[0] == special_keys[i].vim_code0 + && name[1] == special_keys[i].vim_code1) return OK; return FAIL; } @@ -1972,7 +1972,7 @@ process_message(void) { // ignore VK_SPACE when ALT key pressed: system menu if (special_keys[i].key_sym == vk - && (vk != VK_SPACE || !(GetKeyState(VK_MENU) & 0x8000))) + && (vk != VK_SPACE || !(GetKeyState(VK_LMENU) & 0x8000))) { /* * Behave as expected if we have a dead key and the special key @@ -2051,8 +2051,8 @@ process_message(void) if (GetKeyState(VK_CAPITAL) & 0x0001) keyboard_state[VK_CAPITAL] = 0x01; // Alt-Gr is synthesized as Alt + Ctrl. - if ((GetKeyState(VK_MENU) & 0x8000) && - (GetKeyState(VK_CONTROL) & 0x8000)) + if ((GetKeyState(VK_RMENU) & 0x8000) + && (GetKeyState(VK_CONTROL) & 0x8000)) { keyboard_state[VK_MENU] = 0x80; keyboard_state[VK_CONTROL] = 0x80; diff --git a/src/version.c b/src/version.c index 0d95a7cac4..ab771fef13 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4843, +/**/ 4842, /**/ 4841, |