# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1665156604 -7200
# Node ID 47332719dbb5c4f2d59e6efb94203dee8892c997
# Parent  3ffb92bedeb496d56e0e2b0c4b3f378b3581dad0
patch 9.0.0686: the right ALT key does not work on some MS-Windows keyboards

Commit: https://github.com/vim/vim/commit/8d8b9758ced52b6303af95ad7e28ae9c5636cdf8
Author: Anton Sharonov <anton.sharonov@gmail.com>
Date:   Fri Oct 7 16:28:48 2022 +0100

    patch 9.0.0686: the right ALT key does not work on some MS-Windows keyboards

    Problem:    The right ALT key does not work on some MS-Windows keyboards.
    Solution:   Adjust the modifiers based on GetKeyState(). (Anoton Sharonov,
                closes #11300)

diff --git a/src/gui_w32.c b/src/gui_w32.c
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -852,6 +852,13 @@ get_active_modifiers(void)
 	modifiers |= MOD_MASK_ALT;
     if ((modifiers & MOD_MASK_CTRL) && (GetKeyState(VK_RMENU) & 0x8000))
 	modifiers &= ~MOD_MASK_CTRL;
+    // Add RightALT only if it is hold alone (without Ctrl), because if AltGr
+    // is pressed, Windows claims that Ctrl is hold as well. That way we can
+    // recognize Right-ALT alone and be sure that not AltGr is hold.
+    if (!(GetKeyState(VK_CONTROL) & 0x8000)
+	    &&  (GetKeyState(VK_RMENU) & 0x8000)
+	    && !(GetKeyState(VK_LMENU) & 0x8000)) // seems AltGr has both set
+	modifiers |= MOD_MASK_ALT;
 
     return modifiers;
 }
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    686,
+/**/
     685,
 /**/
     684,