diff options
| author | Guilherme Iscaro <iscaro@profusion.mobi> | 2016-10-08 17:20:28 -0300 |
|---|---|---|
| committer | Jean Guyomarc'h <jean@guyomarch.bzh> | 2016-10-14 18:25:17 +0200 |
| commit | a9e6bac27ccb3a94f71ebf96b009e5812a82cf81 (patch) | |
| tree | 264037e67551f7ce6d80544c017c7b6c625e505a | |
| parent | 21abce32093d26fcd0ca2d81232179ed4e998de1 (diff) | |
| download | efl-a9e6bac27ccb3a94f71ebf96b009e5812a82cf81.tar.gz | |
Ecore_Cocoa: Fix repeat modifers keys.
Some values were repeated.
| -rw-r--r-- | src/lib/ecore_cocoa/ecore_cocoa.m | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/lib/ecore_cocoa/ecore_cocoa.m b/src/lib/ecore_cocoa/ecore_cocoa.m index 1ef0da5c13..854a125e85 100644 --- a/src/lib/ecore_cocoa/ecore_cocoa.m +++ b/src/lib/ecore_cocoa/ecore_cocoa.m @@ -96,10 +96,11 @@ ecore_cocoa_event_modifiers(NSUInteger mod) unsigned int modifiers = 0; if (mod & NSEventModifierFlagShift) modifiers |= ECORE_EVENT_MODIFIER_SHIFT; - if (mod & NSEventModifierFlagShift) modifiers |= ECORE_EVENT_MODIFIER_CTRL; + if (mod & NSEventModifierFlagControl) modifiers |= ECORE_EVENT_MODIFIER_CTRL; if (mod & NSEventModifierFlagOption) modifiers |= ECORE_EVENT_MODIFIER_ALTGR; - if (mod & NSEventModifierFlagOption) modifiers |= ECORE_EVENT_MODIFIER_WIN; + if (mod & NSEventModifierFlagCommand) modifiers |= ECORE_EVENT_MODIFIER_WIN; if (mod & NSEventModifierFlagNumericPad) modifiers |= ECORE_EVENT_LOCK_NUM; + if (mod & NSEventModifierFlagCapsLock) modifiers |= ECORE_EVENT_LOCK_CAPS; DBG("key modifiers: 0x%lx, %u", mod, modifiers); return modifiers; @@ -234,14 +235,16 @@ _ecore_cocoa_feed_events(void *anEvent) // Turn special key flags on if (flags & NSEventModifierFlagShift) evDown->key = "Shift_L"; - else if (flags & NSEventModifierFlagShift) + else if (flags & NSEventModifierFlagControl) evDown->key = "Control_L"; else if (flags & NSEventModifierFlagOption) evDown->key = "Alt_L"; - else if (flags & NSEventModifierFlagOption) + else if (flags & NSEventModifierFlagCommand) evDown->key = "Super_L"; else if (flags & NSEventModifierFlagCapsLock) evDown->key = "Caps_Lock"; + else if (flags & NSEventModifierFlagNumericPad) + evDown->key = "Num_Lock"; if (evDown->key) { @@ -266,14 +269,16 @@ _ecore_cocoa_feed_events(void *anEvent) // Turn special key flags off if (changed_flags & NSEventModifierFlagShift) evUp->key = "Shift_L"; - else if (changed_flags & NSEventModifierFlagShift) + else if (changed_flags & NSEventModifierFlagControl) evUp->key = "Control_L"; else if (changed_flags & NSEventModifierFlagOption) evUp->key = "Alt_L"; - else if (changed_flags & NSEventModifierFlagOption) + else if (changed_flags & NSEventModifierFlagCommand) evUp->key = "Super_L"; else if (changed_flags & NSEventModifierFlagCapsLock) evUp->key = "Caps_Lock"; + else if (changed_flags & NSEventModifierFlagNumericPad) + evUp->key = "Num_Lock"; if (evUp->key) { |