brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

osx: Handle bare modifier keypresses

Browse Source 
http://bugzilla.clutter-project.org/show_bug.cgi?id=2644
This commit is contained in:
Craig R. Hughes 2011-05-09 09:39:55 -07:00 committed by Emmanuele Bassi
parent 22cc9b35cb
commit 9ecddeb1c3
1 changed files with 80 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
clutter/osx/clutter-event-osx.c
View File

@ -115,6 +115,38 @@
* to 'unicode_value' Instead of <Shift>a or <Shift>3 you'd get <Shift>A * to 'unicode_value' Instead of <Shift>a or <Shift>3 you'd get <Shift>A
* and <Shift># * and <Shift>#
*/ */
if ([self type] == NSFlagsChanged)
{
switch ([self keyCode])
{
case 54: // Right Command
return CLUTTER_KEY_Meta_R;
case 55: // Left Command
return CLUTTER_KEY_Meta_L;
case 57: // Capslock
return CLUTTER_KEY_Caps_Lock;
case 56: // Left Shift
return CLUTTER_KEY_Shift_L;
case 60: // Right Shift
return CLUTTER_KEY_Shift_R;
case 58: // Left Alt
return CLUTTER_KEY_Alt_L;
case 61: // Right Alt
return CLUTTER_KEY_Alt_R;
case 59: // Left Ctrl
return CLUTTER_KEY_Control_L;
case 62: // Right Ctrl
return CLUTTER_KEY_Control_R;
case 63: // Function
return CLUTTER_KEY_function;
default: // No such key??!??
CLUTTER_NOTE (EVENT, "Got NSFlagsChanged event with keyCode not a known modifier key: %d",
[self keyCode]);
return CLUTTER_KEY_VoidSymbol;
}
}
unichar c = [[self charactersIgnoringModifiers] characterAtIndex:0]; unichar c = [[self charactersIgnoringModifiers] characterAtIndex:0];
/* Latin-1 characters, 1:1 mapping - this ought to be reliable */ /* Latin-1 characters, 1:1 mapping - this ought to be reliable */
@ -366,7 +398,48 @@ clutter_event_osx_translate (NSEvent *nsevent,
process_scroll_event (event, FALSE); process_scroll_event (event, FALSE);
break; break;
case NSFlagsChanged:
// FIXME: This logic fails if the user presses both Shift keys at once, for example:
// we treat releasing one of them as keyDown.
switch ([nsevent keyCode])
{
case 54: // Right Command
case 55: // Left Command
if ([nsevent modifierFlags] & NSCommandKeyMask)
event->type = CLUTTER_KEY_PRESS;
break;
case 57: // Capslock
if ([nsevent modifierFlags] & NSAlphaShiftKeyMask)
event->type = CLUTTER_KEY_PRESS;
break;
case 56: // Left Shift
case 60: // Right Shift
if ([nsevent modifierFlags] & NSShiftKeyMask)
event->type = CLUTTER_KEY_PRESS;
break;
case 58: // Left Alt
case 61: // Right Alt
if ([nsevent modifierFlags] & NSAlternateKeyMask)
event->type = CLUTTER_KEY_PRESS;
break;
case 59: // Left Ctrl
case 62: // Right Ctrl
if ([nsevent modifierFlags] & NSControlKeyMask)
event->type = CLUTTER_KEY_PRESS;
break;
case 63: // Function
if ([nsevent modifierFlags] & NSFunctionKeyMask)
event->type = CLUTTER_KEY_PRESS;
break;
}
/* fall through */
case NSKeyDown: case NSKeyDown:
if ([nsevent type] == NSKeyDown)
event->type = CLUTTER_KEY_PRESS; event->type = CLUTTER_KEY_PRESS;
/* fall through */ /* fall through */
case NSKeyUp: case NSKeyUp:
@ -376,14 +449,16 @@ clutter_event_osx_translate (NSEvent *nsevent,
event->key.hardware_keycode = [nsevent keyCode]; event->key.hardware_keycode = [nsevent keyCode];
event->key.modifier_state = [nsevent clutterModifierState]; event->key.modifier_state = [nsevent clutterModifierState];
event->key.keyval = [nsevent clutterKeyVal]; event->key.keyval = [nsevent clutterKeyVal];
event->key.unicode_value = [[nsevent characters] characterAtIndex:0]; event->key.unicode_value = ([nsevent type] == NSFlagsChanged)
? (gunichar)'\0'
: [[nsevent characters] characterAtIndex:0];
clutter_event_set_device (event, manager_osx->core_keyboard); clutter_event_set_device (event, manager_osx->core_keyboard);
CLUTTER_NOTE (EVENT, "key %d (%s) (%s) %s, keyval %d", CLUTTER_NOTE (EVENT, "key %d (%s) (%s) %s, keyval %d",
[nsevent keyCode], [nsevent keyCode],
[[nsevent characters] UTF8String], ([nsevent type] == NSFlagsChanged) ? "NULL" : [[nsevent characters] UTF8String],
[[nsevent charactersIgnoringModifiers] UTF8String], ([nsevent type] == NSFlagsChanged) ? "NULL" : [[nsevent charactersIgnoringModifiers] UTF8String],
event->type == CLUTTER_KEY_PRESS ? "press" : "release", (event->type == CLUTTER_KEY_PRESS) ? "press" : "release",
event->key.keyval); event->key.keyval);
return TRUE; return TRUE;