kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ecore_Cocoa: Fix repeat modifers keys. 

Some values were repeated.
This commit is contained in:
Guilherme Iscaro 2016-10-08 17:20:28 -03:00
parent 16ee5b7a5f
commit 0897715c8d
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/lib/ecore_cocoa/ecore_cocoa.m
View File

@ -96,10 +96,11 @@ _ecore_cocoa_event_modifiers(NSUInteger mod)
unsigned int modifiers = 0; unsigned int modifiers = 0;
if (mod & NSEventModifierFlagShift) modifiers |= ECORE_EVENT_MODIFIER_SHIFT; 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_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 & NSEventModifierFlagNumericPad) modifiers |= ECORE_EVENT_LOCK_NUM;
if (mod & NSEventModifierFlagCapsLock) modifiers |= ECORE_EVENT_LOCK_CAPS;
DBG("key modifiers: 0x%lx, %u", mod, modifiers); DBG("key modifiers: 0x%lx, %u", mod, modifiers);
return modifiers; return modifiers;
@ -246,14 +247,16 @@ _ecore_cocoa_feed_events(void *anEvent)
// Turn special key flags on // Turn special key flags on
if (flags & NSEventModifierFlagShift) if (flags & NSEventModifierFlagShift)
evDown->key = "Shift_L"; evDown->key = "Shift_L";
else if (flags & NSEventModifierFlagShift) else if (flags & NSEventModifierFlagControl)
evDown->key = "Control_L"; evDown->key = "Control_L";
else if (flags & NSEventModifierFlagOption) else if (flags & NSEventModifierFlagOption)
evDown->key = "Alt_L"; evDown->key = "Alt_L";
else if (flags & NSEventModifierFlagOption) else if (flags & NSEventModifierFlagCommand)
evDown->key = "Super_L"; evDown->key = "Super_L";
else if (flags & NSEventModifierFlagCapsLock) else if (flags & NSEventModifierFlagCapsLock)
evDown->key = "Caps_Lock"; evDown->key = "Caps_Lock";
else if (flags & NSEventModifierFlagNumericPad)
evDown->key = "Num_Lock";
if (evDown->key) if (evDown->key)
{ {
@ -278,14 +281,16 @@ _ecore_cocoa_feed_events(void *anEvent)
// Turn special key flags off // Turn special key flags off
if (changed_flags & NSEventModifierFlagShift) if (changed_flags & NSEventModifierFlagShift)
evUp->key = "Shift_L"; evUp->key = "Shift_L";
else if (changed_flags & NSEventModifierFlagShift) else if (changed_flags & NSEventModifierFlagControl)
evUp->key = "Control_L"; evUp->key = "Control_L";
else if (changed_flags & NSEventModifierFlagOption) else if (changed_flags & NSEventModifierFlagOption)
evUp->key = "Alt_L"; evUp->key = "Alt_L";
else if (changed_flags & NSEventModifierFlagOption) else if (changed_flags & NSEventModifierFlagCommand)
evUp->key = "Super_L"; evUp->key = "Super_L";
else if (changed_flags & NSEventModifierFlagCapsLock) else if (changed_flags & NSEventModifierFlagCapsLock)
evUp->key = "Caps_Lock"; evUp->key = "Caps_Lock";
else if (changed_flags & NSEventModifierFlagNumericPad)
evUp->key = "Num_Lock";
if (evUp->key) if (evUp->key)
{ {