Navy.gif/glfw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplified Cocoa key input.

Browse Source
This commit is contained in:
Camilla Berglund 2013-03-07 17:37:07 +01:00
parent aec952e8dc
commit 6a7dbfee29
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/cocoa_window.m
View File

@ -436,20 +436,14 @@ static int convertMacKeyCode(unsigned int macKeyCode)
- (void)keyDown:(NSEvent *)event - (void)keyDown:(NSEvent *)event
{ {
NSUInteger i, length; _glfwInputKey(window, convertMacKeyCode([event keyCode]), GLFW_PRESS);
NSString* characters;
const int key = convertMacKeyCode([event keyCode]);
if (key == -1)
return;
_glfwInputKey(window, key, GLFW_PRESS);
if ([event modifierFlags] & NSCommandKeyMask) if ([event modifierFlags] & NSCommandKeyMask)
[super keyDown:event]; [super keyDown:event];
else else
{ {
characters = [event characters]; NSString* characters = [event characters];
length = [characters length]; NSUInteger i, length = [characters length];
for (i = 0; i < length; i++) for (i = 0; i < length; i++)
_glfwInputChar(window, [characters characterAtIndex:i]); _glfwInputChar(window, [characters characterAtIndex:i]);
@ -476,9 +470,7 @@ static int convertMacKeyCode(unsigned int macKeyCode)
- (void)keyUp:(NSEvent *)event - (void)keyUp:(NSEvent *)event
{ {
int key = convertMacKeyCode([event keyCode]); _glfwInputKey(window, convertMacKeyCode([event keyCode]), GLFW_RELEASE);
if (key != -1)
_glfwInputKey(window, key, GLFW_RELEASE);
} }
- (void)scrollWheel:(NSEvent *)event - (void)scrollWheel:(NSEvent *)event