Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-10-04 13:46:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 8b5f92134a into d3f5d036f8

Browse Source
This commit is contained in:
Xo Wang 2016-02-26 08:27:03 +00:00
commit 29107677e5
1 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/cocoa_window.m
View File

@ -123,6 +123,29 @@ static int translateKey(unsigned int key)
return _glfw.ns.publicKeys[key]; return _glfw.ns.publicKeys[key];
} }
// Translate a GLFW keycode to a mask for its GLFW modifier flag bit
//
static int translateKeyToFlagMask(int key)
{
switch (key)
{
case GLFW_KEY_LEFT_SHIFT:
case GLFW_KEY_RIGHT_SHIFT:
return GLFW_MOD_SHIFT;
case GLFW_KEY_LEFT_CONTROL:
case GLFW_KEY_RIGHT_CONTROL:
return GLFW_MOD_CONTROL;
case GLFW_KEY_LEFT_ALT:
case GLFW_KEY_RIGHT_ALT:
return GLFW_MOD_ALT;
case GLFW_KEY_LEFT_SUPER:
case GLFW_KEY_RIGHT_SUPER:
return GLFW_MOD_SUPER;
default:
return 0;
}
}
//------------------------------------------------------------------------ //------------------------------------------------------------------------
// Delegate for window related notifications // Delegate for window related notifications
@ -502,17 +525,26 @@ static int translateKey(unsigned int key)
[event modifierFlags] & NSDeviceIndependentModifierFlagsMask; [event modifierFlags] & NSDeviceIndependentModifierFlagsMask;
const int key = translateKey([event keyCode]); const int key = translateKey([event keyCode]);
const int mods = translateFlags(modifierFlags); const int mods = translateFlags(modifierFlags);
// Process flag change as a key press only if the key and flag match
const int flagMask = translateKeyToFlagMask(key);
const int modsMasked = mods & flagMask;
const int prevModsMasked =
translateFlags(window->ns.modifierFlags) & flagMask;
if (modifierFlags == window->ns.modifierFlags) if ((modsMasked & prevModsMasked) != 0)
{ {
// Toggle key state if key is already held, to handle left and right
// modifier keys being held simultaneously
if (window->keys[key] == GLFW_PRESS) if (window->keys[key] == GLFW_PRESS)
action = GLFW_RELEASE; action = GLFW_RELEASE;
else else
action = GLFW_PRESS; action = GLFW_PRESS;
} }
else if (modifierFlags > window->ns.modifierFlags) else if (modsMasked > prevModsMasked)
// The bit corresponding to the key is set in the new flags
action = GLFW_PRESS; action = GLFW_PRESS;
else else
// Modifier key was released or the flag change was not for this key
action = GLFW_RELEASE; action = GLFW_RELEASE;
window->ns.modifierFlags = modifierFlags; window->ns.modifierFlags = modifierFlags;
@ -862,6 +894,12 @@ static GLFWbool createWindow(_GLFWwindow* window,
window->ns.view = [[GLFWContentView alloc] initWithGlfwWindow:window]; window->ns.view = [[GLFWContentView alloc] initWithGlfwWindow:window];
#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
// Initialize modifiers state with any already held modifiers
window->ns.modifierFlags =
[NSEvent modifierFlags] & NSDeviceIndependentModifierFlagsMask;
#endif /*MAC_OS_X_VERSION_MAX_ALLOWED*/
#if defined(_GLFW_USE_RETINA) #if defined(_GLFW_USE_RETINA)
[window->ns.view setWantsBestResolutionOpenGLSurface:YES]; [window->ns.view setWantsBestResolutionOpenGLSurface:YES];
#endif /*_GLFW_USE_RETINA*/ #endif /*_GLFW_USE_RETINA*/