summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean Guyomarc'h <jean.guyomarch@openwide.fr>2015-10-13 15:20:27 +0200
committerNicolas Aguirre <aguirre.nicolas@gmail.com>2015-11-10 08:32:49 +0100
commit7ab47f961416e57ca22e65e924ab0cd847d4e013 (patch)
tree689b436b50a331a002b4b8345cf025b149c43468
parent3331526dc8c4019658d7e9ea21cec424ae9e5941 (diff)
ecore_cocoa: fix types
-rw-r--r--src/lib/ecore_cocoa/ecore_cocoa.m9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/ecore_cocoa/ecore_cocoa.m b/src/lib/ecore_cocoa/ecore_cocoa.m
index d2acc20c86..69dfdc4341 100644
--- a/src/lib/ecore_cocoa/ecore_cocoa.m
+++ b/src/lib/ecore_cocoa/ecore_cocoa.m
@@ -93,7 +93,7 @@ ecore_cocoa_shutdown(void)
93} 93}
94 94
95static unsigned int 95static unsigned int
96_ecore_cocoa_event_modifiers(unsigned int mod) 96_ecore_cocoa_event_modifiers(NSUInteger mod)
97{ 97{
98 unsigned int modifiers = 0; 98 unsigned int modifiers = 0;
99 99
@@ -103,13 +103,14 @@ _ecore_cocoa_event_modifiers(unsigned int mod)
103 if(mod & NSCommandKeyMask) modifiers |= ECORE_EVENT_MODIFIER_WIN; 103 if(mod & NSCommandKeyMask) modifiers |= ECORE_EVENT_MODIFIER_WIN;
104 if(mod & NSNumericPadKeyMask) modifiers |= ECORE_EVENT_LOCK_NUM; 104 if(mod & NSNumericPadKeyMask) modifiers |= ECORE_EVENT_LOCK_NUM;
105 105
106 DBG("key modifiers: %d, %d", mod, modifiers); 106 DBG("key modifiers: 0x%lx, %u", mod, modifiers);
107 return modifiers; 107 return modifiers;
108} 108}
109 109
110 110
111static Ecore_Event_Key* 111static Ecore_Event_Key*
112_ecore_cocoa_event_key(NSEvent *event, int keyType) 112_ecore_cocoa_event_key(NSEvent *event,
113 NSEventType keyType)
113{ 114{
114 static Eina_Bool compose = EINA_FALSE; 115 static Eina_Bool compose = EINA_FALSE;
115 static NSText *edit; 116 static NSText *edit;
@@ -121,7 +122,7 @@ _ecore_cocoa_event_key(NSEvent *event, int keyType)
121 NSString *keychar = [event charactersIgnoringModifiers]; 122 NSString *keychar = [event charactersIgnoringModifiers];
122 NSString *keycharRaw = [event characters]; 123 NSString *keycharRaw = [event characters];
123 124
124 DBG("Event Key, keyTpe : %d", keyType); 125 DBG("Event Key, keyType : %lu", keyType);
125 126
126 ev = calloc(1, sizeof (Ecore_Event_Key)); 127 ev = calloc(1, sizeof (Ecore_Event_Key));
127 if (!ev) return NULL; 128 if (!ev) return NULL;