mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-12 17:51:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Win32: Cleanup keyboard input flag parsing

Browse Source 
This replaces some magic numbers with the corresponding winuser.h
provided macros and unifies how the MSB from Get*KeyState is tested.

(cherry picked from commit 3d2540c373)
This commit is contained in:
Camilla Löwy 2019-09-13 01:16:13 +02:00
parent e30718e927
commit 087110aa63
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/win32_window.c
View File

@ -481,7 +481,7 @@ static int translateKey(WPARAM wParam, LPARAM lParam)
DWORD time; DWORD time;
// Right side keys have the extended key bit set // Right side keys have the extended key bit set
if (lParam & 0x01000000) if (HIWORD(lParam) & KF_EXTENDED)
return GLFW_KEY_RIGHT_CONTROL; return GLFW_KEY_RIGHT_CONTROL;
// HACK: Alt Gr sends Left Ctrl and then Right Alt in close sequence // HACK: Alt Gr sends Left Ctrl and then Right Alt in close sequence
@ -497,7 +497,7 @@ static int translateKey(WPARAM wParam, LPARAM lParam)
next.message == WM_SYSKEYUP) next.message == WM_SYSKEYUP)
{ {
if (next.wParam == VK_MENU && if (next.wParam == VK_MENU &&
(next.lParam & 0x01000000) && (HIWORD(next.lParam) & KF_EXTENDED) &&
next.time == time) next.time == time)
{ {
// Next message is Right Alt down so discard this // Next message is Right Alt down so discard this
@ -740,8 +740,8 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg,
case WM_SYSKEYUP: case WM_SYSKEYUP:
{ {
const int key = translateKey(wParam, lParam); const int key = translateKey(wParam, lParam);
const int scancode = (lParam >> 16) & 0x1ff; const int scancode = (HIWORD(lParam) & 0x1ff);
const int action = ((lParam >> 31) & 1) ? GLFW_RELEASE : GLFW_PRESS; const int action = (HIWORD(lParam) & KF_UP) ? GLFW_RELEASE : GLFW_PRESS;
const int mods = getKeyMods(); const int mods = getKeyMods();
if (key == _GLFW_KEY_INVALID) if (key == _GLFW_KEY_INVALID)
@ -1934,8 +1934,8 @@ void _glfwPlatformPollEvents(void)
window = GetPropW(handle, L"GLFW"); window = GetPropW(handle, L"GLFW");
if (window) if (window)
{ {
const GLFWbool lshift = (GetAsyncKeyState(VK_LSHIFT) >> 15) & 1; const GLFWbool lshift = (GetAsyncKeyState(VK_LSHIFT) & 0x8000) != 0;
const GLFWbool rshift = (GetAsyncKeyState(VK_RSHIFT) >> 15) & 1; const GLFWbool rshift = (GetAsyncKeyState(VK_RSHIFT) & 0x8000) != 0;
if (!lshift && window->keys[GLFW_KEY_LEFT_SHIFT] == GLFW_PRESS) if (!lshift && window->keys[GLFW_KEY_LEFT_SHIFT] == GLFW_PRESS)
{ {