mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-22 13:04:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Documentation work

Browse Source
This commit is contained in:
Camilla Löwy 2017-02-09 20:55:29 +01:00
parent 77a8f103d8
commit 366b90be1a
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/win32_window.c
View File

@ -369,20 +369,19 @@ static int getAsyncKeyMods(void)
// //
static int translateKey(WPARAM wParam, LPARAM lParam) static int translateKey(WPARAM wParam, LPARAM lParam)
{ {
// The Ctrl keys require special handling
if (wParam == VK_CONTROL) if (wParam == VK_CONTROL)
{ {
// The CTRL keys require special handling
MSG next; MSG next;
DWORD time; DWORD time;
// Is this an extended key (i.e. right key)? // Right side keys have the extended key bit set
if (lParam & 0x01000000) if (lParam & 0x01000000)
return GLFW_KEY_RIGHT_CONTROL; return GLFW_KEY_RIGHT_CONTROL;
// Here is a trick: "Alt Gr" sends LCTRL, then RALT. We only // HACK: Alt Gr sends Left Ctrl and then Right Alt in close sequence
// want the RALT message, so we try to see if the next message // We only want the Right Alt message, so if the next message is
// is a RALT message. In that case, this is a false LCTRL! // Right Alt we ignore this (synthetic) Left Ctrl message
time = GetMessageTime(); time = GetMessageTime();
if (PeekMessageW(&next, NULL, 0, 0, PM_NOREMOVE)) if (PeekMessageW(&next, NULL, 0, 0, PM_NOREMOVE))
@ -396,8 +395,7 @@ static int translateKey(WPARAM wParam, LPARAM lParam)
(next.lParam & 0x01000000) && (next.lParam & 0x01000000) &&
next.time == time) next.time == time)
{ {
// Next message is a RALT down message, which // Next message is Right Alt down so discard this
// means that this is not a proper LCTRL message
return _GLFW_KEY_INVALID; return _GLFW_KEY_INVALID;
} }
} }
@ -580,14 +578,15 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg,
if (action == GLFW_RELEASE && wParam == VK_SHIFT) if (action == GLFW_RELEASE && wParam == VK_SHIFT)
{ {
// Release both Shift keys on Shift up event, as only one event // HACK: Release both Shift keys on Shift up event, as when both
// is sent even if both keys are released // are pressed the first release does not emit any event
// NOTE: The other half of this is in _glfwPlatformPollEvents
_glfwInputKey(window, GLFW_KEY_LEFT_SHIFT, scancode, action, mods); _glfwInputKey(window, GLFW_KEY_LEFT_SHIFT, scancode, action, mods);
_glfwInputKey(window, GLFW_KEY_RIGHT_SHIFT, scancode, action, mods); _glfwInputKey(window, GLFW_KEY_RIGHT_SHIFT, scancode, action, mods);
} }
else if (wParam == VK_SNAPSHOT) else if (wParam == VK_SNAPSHOT)
{ {
// Key down is not reported for the Print Screen key // HACK: Key down is not reported for the Print Screen key
_glfwInputKey(window, key, scancode, GLFW_PRESS, mods); _glfwInputKey(window, key, scancode, GLFW_PRESS, mods);
_glfwInputKey(window, key, scancode, GLFW_RELEASE, mods); _glfwInputKey(window, key, scancode, GLFW_RELEASE, mods);
} }
@ -891,7 +890,7 @@ static int createNativeWindow(_GLFWwindow* window,
// NOTE: This window placement is temporary and approximate, as the // NOTE: This window placement is temporary and approximate, as the
// correct position and size cannot be known until the monitor // correct position and size cannot be known until the monitor
// video mode has been set // video mode has been picked in _glfwSetVideoModeWin32
_glfwPlatformGetMonitorPos(window->monitor, &xpos, &ypos); _glfwPlatformGetMonitorPos(window->monitor, &xpos, &ypos);
_glfwPlatformGetVideoMode(window->monitor, &mode); _glfwPlatformGetVideoMode(window->monitor, &mode);
fullWidth = mode.width; fullWidth = mode.width;
@ -1393,9 +1392,9 @@ void _glfwPlatformPollEvents(void)
{ {
if (msg.message == WM_QUIT) if (msg.message == WM_QUIT)
{ {
// Treat WM_QUIT as a close on all windows // NOTE: While GLFW does not itself post WM_QUIT, other processes
// While GLFW does not itself post WM_QUIT, other processes may post // may post it to this one, for example Task Manager
// it to this one, for example Task Manager // HACK: Treat WM_QUIT as a close on all windows
window = _glfw.windowListHead; window = _glfw.windowListHead;
while (window) while (window)
@ -1416,6 +1415,7 @@ void _glfwPlatformPollEvents(void)
{ {
// NOTE: Shift keys on Windows tend to "stick" when both are pressed as // NOTE: Shift keys on Windows tend to "stick" when both are pressed as
// no key up message is generated by the first key release // no key up message is generated by the first key release
// The other half of this is in the handling of WM_KEYUP
// HACK: Query actual key state and synthesize release events as needed // 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)