gwm17/glfw
1
0
Fork 0
mirror of https://github.com/gwm17/glfw.git synced 2025-02-07 06:38:50 -05:00
Code Issues Projects Releases Wiki Activity

Win32: Cleanup

Browse Source
This commit is contained in:
Camilla Löwy 2017-01-29 18:47:59 +01:00
parent 260dbf0a1d
commit 43c1910453
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/win32_window.c
View File

@ -1413,28 +1413,24 @@ void _glfwPlatformPollEvents(void)
handle = GetActiveWindow(); handle = GetActiveWindow();
if (handle) if (handle)
{ {
// LSHIFT/RSHIFT fixup (keys tend to "stick" without this fix) // NOTE: Shift keys on Windows tend to "stick" when both are pressed as
// This is the only async event handling in GLFW, but it solves some // no key up message is generated by the first key release
// nasty problems // HACK: Query actual key state and synthesize release events as needed
window = GetPropW(handle, L"GLFW"); window = GetPropW(handle, L"GLFW");
if (window) if (window)
{ {
const int mods = getAsyncKeyMods(); const GLFWbool lshift = (GetAsyncKeyState(VK_LSHIFT) >> 15) & 1;
const GLFWbool rshift = (GetAsyncKeyState(VK_RSHIFT) >> 15) & 1;
// Get current state of left and right shift keys if (!lshift && window->keys[GLFW_KEY_LEFT_SHIFT] == GLFW_PRESS)
const int lshiftDown = (GetAsyncKeyState(VK_LSHIFT) >> 15) & 1;
const int rshiftDown = (GetAsyncKeyState(VK_RSHIFT) >> 15) & 1;
// See if this differs from our belief of what has happened
// (we only have to check for lost key up events)
if (!lshiftDown && window->keys[GLFW_KEY_LEFT_SHIFT] == 1)
{ {
const int mods = getAsyncKeyMods();
const int scancode = _glfw.win32.scancodes[GLFW_KEY_LEFT_SHIFT]; const int scancode = _glfw.win32.scancodes[GLFW_KEY_LEFT_SHIFT];
_glfwInputKey(window, GLFW_KEY_LEFT_SHIFT, scancode, GLFW_RELEASE, mods); _glfwInputKey(window, GLFW_KEY_LEFT_SHIFT, scancode, GLFW_RELEASE, mods);
} }
else if (!rshift && window->keys[GLFW_KEY_RIGHT_SHIFT] == GLFW_PRESS)
if (!rshiftDown && window->keys[GLFW_KEY_RIGHT_SHIFT] == 1)
{ {
const int mods = getAsyncKeyMods();
const int scancode = _glfw.win32.scancodes[GLFW_KEY_RIGHT_SHIFT]; const int scancode = _glfw.win32.scancodes[GLFW_KEY_RIGHT_SHIFT];
_glfwInputKey(window, GLFW_KEY_RIGHT_SHIFT, scancode, GLFW_RELEASE, mods); _glfwInputKey(window, GLFW_KEY_RIGHT_SHIFT, scancode, GLFW_RELEASE, mods);
} }