summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichelle Legrand <michelle.legrand@openwide.fr>2015-01-28 15:11:01 +0100
committerCedric BAIL <cedric@osg.samsung.com>2015-02-05 16:38:07 +0100
commitc9dd8fde7dc8b4eb93381c7dcfa888ddf6282c43 (patch)
tree3c9b498470d82b1760cffc74511d91a413ab8515
parent72baccaf4494f1661aca762a26597d78a717c6ef (diff)
downloadefl-c9dd8fde7dc8b4eb93381c7dcfa888ddf6282c43.tar.gz
ecore_cocoa: replace "keyname" by "key".
Ecore_Event_Key attribute "key" cannot be NULL. This raise a segmentation fault in Enventor when hitting on modifier keys. Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
-rw-r--r--src/lib/ecore_cocoa/ecore_cocoa.m24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/ecore_cocoa/ecore_cocoa.m b/src/lib/ecore_cocoa/ecore_cocoa.m
index cfae44d982..23aab3f131 100644
--- a/src/lib/ecore_cocoa/ecore_cocoa.m
+++ b/src/lib/ecore_cocoa/ecore_cocoa.m
@@ -365,17 +365,17 @@ ecore_cocoa_feed_events(void *anEvent)
// Turn special key flags on
if (flags & NSShiftKeyMask)
- evDown->keyname = "Shift_L";
+ evDown->key = "Shift_L";
else if (flags & NSControlKeyMask)
- evDown->keyname = "Control_L";
+ evDown->key = "Control_L";
else if (flags & NSAlternateKeyMask)
- evDown->keyname = "Alt_L";
+ evDown->key = "Alt_L";
else if (flags & NSCommandKeyMask)
- evDown->keyname = "Super_L";
+ evDown->key = "Super_L";
else if (flags & NSAlphaShiftKeyMask)
- evDown->keyname = "Caps_Lock";
+ evDown->key = "Caps_Lock";
- if (evDown->keyname)
+ if (evDown->key)
{
evDown->timestamp = time;
evDown->string = "";
@@ -388,17 +388,17 @@ ecore_cocoa_feed_events(void *anEvent)
// Turn special key flags off
if (changed_flags & NSShiftKeyMask)
- evUp->keyname = "Shift_L";
+ evUp->key = "Shift_L";
else if (changed_flags & NSControlKeyMask)
- evUp->keyname = "Control_L";
+ evUp->key = "Control_L";
else if (changed_flags & NSAlternateKeyMask)
- evUp->keyname = "Alt_L";
+ evUp->key = "Alt_L";
else if (changed_flags & NSCommandKeyMask)
- evUp->keyname = "Super_L";
+ evUp->key = "Super_L";
else if (changed_flags & NSAlphaShiftKeyMask)
- evUp->keyname = "Caps_Lock";
+ evUp->key = "Caps_Lock";
- if (evUp->keyname)
+ if (evUp->key)
{
evUp->timestamp = time;
evUp->string = "";