Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes issue #1259 - Added modifier key handling for macosx backend #1841

Merged
merged 3 commits into from Mar 27, 2013
Merged

Fixes issue #1259 - Added modifier key handling for macosx backend #1841

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b671394
Added modifier key event handling for the macosx backend and cleaned …
cimarronm Mar 22, 2013
5de4ed7
Updated to not use NSDictionary literals for pre-obj2.0 compiler supp…
cimarronm Mar 26, 2013
7574ed4
Removed shift from modifier flags as the character returned already i…
cimarronm Mar 26, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
116 changes: 63 additions & 53 deletions src/_macosx.m
View file
Open in desktop
Expand Up @@ -391,7 +391,7 @@ - (const char*)convertKeyEvent:(NSEvent*)event;
- (void)keyDown:(NSEvent*)event; - (void)keyDown:(NSEvent*)event;
- (void)keyUp:(NSEvent*)event; - (void)keyUp:(NSEvent*)event;
- (void)scrollWheel:(NSEvent *)event; - (void)scrollWheel:(NSEvent *)event;
- (void)flagsChanged:(NSEvent*)event; //- (void)flagsChanged:(NSEvent*)event;
@end @end


@interface ScrollableButton : NSButton @interface ScrollableButton : NSButton
Expand Down Expand Up @@ -5439,66 +5439,73 @@ - (void)removeRubberband
rubberband = NSZeroRect; rubberband = NSZeroRect;
} }




- (const char*)convertKeyEvent:(NSEvent*)event - (const char*)convertKeyEvent:(NSEvent*)event
{ {
NSString* text = [event charactersIgnoringModifiers]; NSDictionary* specialkeymappings = [NSDictionary dictionaryWithObjectsAndKeys:
unichar uc = [text characterAtIndex:0]; @"left", [NSNumber numberWithUnsignedLong:NSLeftArrowFunctionKey],
int i = (int)uc; @"right", [NSNumber numberWithUnsignedLong:NSRightArrowFunctionKey],
if ([event modifierFlags] & NSNumericPadKeyMask) @"up", [NSNumber numberWithUnsignedLong:NSUpArrowFunctionKey],
{ @"down", [NSNumber numberWithUnsignedLong:NSDownArrowFunctionKey],
if (i > 256) @"f1", [NSNumber numberWithUnsignedLong:NSF1FunctionKey],
{ @"f2", [NSNumber numberWithUnsignedLong:NSF2FunctionKey],
if (uc==NSLeftArrowFunctionKey) return "left"; @"f3", [NSNumber numberWithUnsignedLong:NSF3FunctionKey],
else if (uc==NSUpArrowFunctionKey) return "up"; @"f4", [NSNumber numberWithUnsignedLong:NSF4FunctionKey],
else if (uc==NSRightArrowFunctionKey) return "right"; @"f5", [NSNumber numberWithUnsignedLong:NSF5FunctionKey],
else if (uc==NSDownArrowFunctionKey) return "down"; @"f6", [NSNumber numberWithUnsignedLong:NSF6FunctionKey],
else if (uc==NSF1FunctionKey) return "f1"; @"f7", [NSNumber numberWithUnsignedLong:NSF7FunctionKey],
else if (uc==NSF2FunctionKey) return "f2"; @"f8", [NSNumber numberWithUnsignedLong:NSF8FunctionKey],
else if (uc==NSF3FunctionKey) return "f3"; @"f9", [NSNumber numberWithUnsignedLong:NSF9FunctionKey],
else if (uc==NSF4FunctionKey) return "f4"; @"f10", [NSNumber numberWithUnsignedLong:NSF10FunctionKey],
else if (uc==NSF5FunctionKey) return "f5"; @"f11", [NSNumber numberWithUnsignedLong:NSF11FunctionKey],
else if (uc==NSF6FunctionKey) return "f6"; @"f12", [NSNumber numberWithUnsignedLong:NSF12FunctionKey],
else if (uc==NSF7FunctionKey) return "f7"; @"f13", [NSNumber numberWithUnsignedLong:NSF13FunctionKey],
else if (uc==NSF8FunctionKey) return "f8"; @"f14", [NSNumber numberWithUnsignedLong:NSF14FunctionKey],
else if (uc==NSF9FunctionKey) return "f9"; @"f15", [NSNumber numberWithUnsignedLong:NSF15FunctionKey],
else if (uc==NSF10FunctionKey) return "f10"; @"f16", [NSNumber numberWithUnsignedLong:NSF16FunctionKey],
else if (uc==NSF11FunctionKey) return "f11"; @"f17", [NSNumber numberWithUnsignedLong:NSF17FunctionKey],
else if (uc==NSF12FunctionKey) return "f12"; @"f18", [NSNumber numberWithUnsignedLong:NSF18FunctionKey],
else if (uc==NSScrollLockFunctionKey) return "scroll_lock"; @"f19", [NSNumber numberWithUnsignedLong:NSF19FunctionKey],
else if (uc==NSBreakFunctionKey) return "break"; @"scroll_lock", [NSNumber numberWithUnsignedLong:NSScrollLockFunctionKey],
else if (uc==NSInsertFunctionKey) return "insert"; @"break", [NSNumber numberWithUnsignedLong:NSBreakFunctionKey],
else if (uc==NSDeleteFunctionKey) return "delete"; @"insert", [NSNumber numberWithUnsignedLong:NSInsertFunctionKey],
else if (uc==NSHomeFunctionKey) return "home"; @"delete", [NSNumber numberWithUnsignedLong:NSDeleteFunctionKey],
else if (uc==NSEndFunctionKey) return "end"; @"home", [NSNumber numberWithUnsignedLong:NSHomeFunctionKey],
else if (uc==NSPageUpFunctionKey) return "pageup"; @"end", [NSNumber numberWithUnsignedLong:NSEndFunctionKey],
else if (uc==NSPageDownFunctionKey) return "pagedown"; @"pagedown", [NSNumber numberWithUnsignedLong:NSPageDownFunctionKey],
} @"pageup", [NSNumber numberWithUnsignedLong:NSPageUpFunctionKey],
else if ((char)uc == '.') return "dec"; @"backspace", [NSNumber numberWithUnsignedLong:NSDeleteCharacter],
} @"enter", [NSNumber numberWithUnsignedLong:NSEnterCharacter],

@"tab", [NSNumber numberWithUnsignedLong:NSTabCharacter],
switch (i) @"enter", [NSNumber numberWithUnsignedLong:NSCarriageReturnCharacter],
{ @"backtab", [NSNumber numberWithUnsignedLong:NSBackTabCharacter],
case 127: return "backspace"; @"escape", [NSNumber numberWithUnsignedLong:27],
case 13: return "enter"; nil
case 3: return "enter"; ];
case 27: return "escape";
default: NSMutableString* returnkey = [NSMutableString string];
{ if ([event modifierFlags] & NSControlKeyMask)
static char s[2]; [returnkey appendString:@"ctrl+" ];
s[0] = (char)uc; if ([event modifierFlags] & NSAlternateKeyMask)
s[1] = '\0'; [returnkey appendString:@"alt+" ];
return (const char*)s; if ([event modifierFlags] & NSCommandKeyMask)
} [returnkey appendString:@"cmd+" ];
}
unichar uc = [[event charactersIgnoringModifiers] characterAtIndex:0];
NSString* specialchar = [specialkeymappings objectForKey:[NSNumber numberWithUnsignedLong:uc]];
if (specialchar)
[returnkey appendString:specialchar];
else
[returnkey appendString:[event charactersIgnoringModifiers]];


return NULL; return [returnkey UTF8String];
} }


- (void)keyDown:(NSEvent*)event - (void)keyDown:(NSEvent*)event
{ {
PyObject* result; PyObject* result;
const char* s = [self convertKeyEvent: event]; const char* s = [self convertKeyEvent: event];
/* TODO: Handle ctrl, alt, super modifiers. qt4 has implemented these. */
PyGILState_STATE gstate = PyGILState_Ensure(); PyGILState_STATE gstate = PyGILState_Ensure();
if (s==NULL) if (s==NULL)
{ {
Expand All @@ -5520,7 +5527,6 @@ - (void)keyUp:(NSEvent*)event
{ {
PyObject* result; PyObject* result;
const char* s = [self convertKeyEvent: event]; const char* s = [self convertKeyEvent: event];
/* TODO: Handle ctrl, alt, super modifiers. qt4 has implemented these. */
PyGILState_STATE gstate = PyGILState_Ensure(); PyGILState_STATE gstate = PyGILState_Ensure();
if (s==NULL) if (s==NULL)
{ {
Expand Down Expand Up @@ -5561,6 +5567,9 @@ - (void)scrollWheel:(NSEvent*)event
PyGILState_Release(gstate); PyGILState_Release(gstate);
} }


/* This is all wrong. Address of pointer is being passed instead of pointer, keynames don't
match up with what the front-end and does the front-end even handle modifier keys by themselves?

- (void)flagsChanged:(NSEvent*)event - (void)flagsChanged:(NSEvent*)event
{ {
const char *s = NULL; const char *s = NULL;
Expand All @@ -5580,6 +5589,7 @@ - (void)flagsChanged:(NSEvent*)event


PyGILState_Release(gstate); PyGILState_Release(gstate);
} }
*/
@end @end


@implementation ScrollableButton @implementation ScrollableButton
Expand Down