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

Removed OS X modifier flags cache

Browse Source 
Related to #566.
Related to #567.
This commit is contained in:
Xo Wang 2015-07-26 18:40:54 -07:00 committed by Camilla Berglund
parent ca1f4db50c
commit 9f5658c8ac
3 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -247,6 +247,7 @@ skills.
- Simon Voordouw
- Torsten Walluhn
- Patrick Walton
- Xo Wang
- Jay Weisskopf
- Frank Wille
- yuriks

1
src/cocoa_platform.h
View File

@ -66,7 +66,6 @@ typedef struct _GLFWwindowNS
id object;
id delegate;
id view;
unsigned int modifierFlags;
// The total sum of the distances the cursor has been warped
// since the last cursor motion event was processed

33
src/cocoa_window.m
View File

@ -123,6 +123,29 @@ static int translateKey(unsigned int key)
return _glfw.ns.publicKeys[key];
}
// Translate a GLFW keycode to a Cocoa modifier flag
//
static NSUInteger translateKeyToModifierFlag(int key)
{
switch (key)
{
case GLFW_KEY_LEFT_SHIFT:
case GLFW_KEY_RIGHT_SHIFT:
return NSShiftKeyMask;
case GLFW_KEY_LEFT_CONTROL:
case GLFW_KEY_RIGHT_CONTROL:
return NSControlKeyMask;
case GLFW_KEY_LEFT_ALT:
case GLFW_KEY_RIGHT_ALT:
return NSAlternateKeyMask;
case GLFW_KEY_LEFT_SUPER:
case GLFW_KEY_RIGHT_SUPER:
return NSCommandKeyMask;
}
return 0;
}
//------------------------------------------------------------------------
// Delegate for window related notifications
@ -206,9 +229,6 @@ static int translateKey(unsigned int key)
- (void)windowDidBecomeKey:(NSNotification *)notification
{
window->ns.modifierFlags =
[NSEvent modifierFlags] & NSDeviceIndependentModifierFlagsMask;
if (_glfw.cursorWindow == window &&
window->cursorMode == GLFW_CURSOR_DISABLED)
{
@ -502,21 +522,18 @@ static int translateKey(unsigned int key)
[event modifierFlags] & NSDeviceIndependentModifierFlagsMask;
const int key = translateKey([event keyCode]);
const int mods = translateFlags(modifierFlags);
const NSUInteger keyFlag = translateKeyToModifierFlag(key);
if (modifierFlags == window->ns.modifierFlags)
if (keyFlag & modifierFlags)
{
if (window->keys[key] == GLFW_PRESS)
action = GLFW_RELEASE;
else
action = GLFW_PRESS;
}
else if (modifierFlags > window->ns.modifierFlags)
action = GLFW_PRESS;
else
action = GLFW_RELEASE;
window->ns.modifierFlags = modifierFlags;
_glfwInputKey(window, key, [event keyCode], action, mods);
}