From 0af3bf3b36c68cacc60ad45653dde3b7848375b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Camilla=20L=C3=B6wy?= <elmindreda@elmindreda.org>
Date: Wed, 15 Jan 2020 16:26:29 +0100
Subject: [PATCH] Win32: Use non-async key state for modifier hack

The synchronous key state seems to make more sense in context.

(cherry picked from commit a491b0698cc520fb7e77d66e3d335310814cbb86)
---
 src/win32_window.c | 26 ++------------------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/src/win32_window.c b/src/win32_window.c
index 2d701bb6..38c12e0a 100644
--- a/src/win32_window.c
+++ b/src/win32_window.c
@@ -448,28 +448,6 @@ static int getKeyMods(void)
     return mods;
 }
 
-// Retrieves and translates modifier keys
-//
-static int getAsyncKeyMods(void)
-{
-    int mods = 0;
-
-    if (GetAsyncKeyState(VK_SHIFT) & 0x8000)
-        mods |= GLFW_MOD_SHIFT;
-    if (GetAsyncKeyState(VK_CONTROL) & 0x8000)
-        mods |= GLFW_MOD_CONTROL;
-    if (GetAsyncKeyState(VK_MENU) & 0x8000)
-        mods |= GLFW_MOD_ALT;
-    if ((GetAsyncKeyState(VK_LWIN) | GetAsyncKeyState(VK_RWIN)) & 0x8000)
-        mods |= GLFW_MOD_SUPER;
-    if (GetAsyncKeyState(VK_CAPITAL) & 1)
-        mods |= GLFW_MOD_CAPS_LOCK;
-    if (GetAsyncKeyState(VK_NUMLOCK) & 1)
-        mods |= GLFW_MOD_NUM_LOCK;
-
-    return mods;
-}
-
 // Translates a Windows key to the corresponding GLFW key
 //
 static int translateKey(WPARAM wParam, LPARAM lParam)
@@ -1951,12 +1929,12 @@ void _glfwPlatformPollEvents(void)
                 const int key = keys[i][1];
                 const int scancode = _glfw.win32.scancodes[key];
 
-                if ((GetAsyncKeyState(vk) & 0x8000))
+                if ((GetKeyState(vk) & 0x8000))
                     continue;
                 if (window->keys[key] != GLFW_PRESS)
                     continue;
 
-                _glfwInputKey(window, key, scancode, GLFW_RELEASE, getAsyncKeyMods());
+                _glfwInputKey(window, key, scancode, GLFW_RELEASE, getKeyMods());
             }
         }
     }