patch 9.0.0888: MS-Windows GUI: CTRL-] does not work on Swiss keyboard
Problem: MS-Windows GUI: CTRL-] does not work on Swiss keyboard.
Solution: Check the key code and don't consider it as a dead key. (Aedin
Louis Xavier, closes #11556)
diff --git a/src/gui_w32.c b/src/gui_w32.c
index 9399c93..6733ac0 100644
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -2152,16 +2152,25 @@
if (len <= 0)
{
- if ( dead_key == DEAD_KEY_SET_DEFAULT
- && (GetKeyState(VK_CONTROL) & 0x8000)
- && ( (vk == 221 && scan_code == 26) // AZERTY CTRL+dead_circumflex
- || (vk == 220 && scan_code == 41) // QWERTZ CTRL+dead_circumflex
- )
- )
+ int wm_char = NUL;
+
+ if (dead_key == DEAD_KEY_SET_DEFAULT
+ && (GetKeyState(VK_CONTROL) & 0x8000))
+ {
+ if ( // AZERTY CTRL+dead_circumflex
+ (vk == 221 && scan_code == 26)
+ // QWERTZ CTRL+dead_circumflex
+ || (vk == 220 && scan_code == 41))
+ wm_char = '[';
+ if ( // QWERTZ CTRL+dead_two-overdots
+ (vk == 192 && scan_code == 27))
+ wm_char = ']';
+ }
+ if (wm_char != NUL)
{
// post WM_CHAR='[' - which will be interpreted with CTRL
// still hold as ESC
- PostMessageW(msg.hwnd, WM_CHAR, '[', msg.lParam);
+ PostMessageW(msg.hwnd, WM_CHAR, wm_char, msg.lParam);
// ask _OnChar() to not touch this state, wait for next key
// press and maintain knowledge that we are "poisoned" with
// "dead state"
diff --git a/src/version.c b/src/version.c
index 08c05f3..fcc6719 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 888,
+/**/
887,
/**/
886,