summaryrefslogtreecommitdiff
path: root/src/lib/ecore_fb
diff options
context:
space:
mode:
authorJohn Magolske <listmail@b79.net>2014-03-28 17:16:24 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-03-28 17:16:24 +0900
commit71a9b7f5e9f5cca64d94cbf419687131f47c2984 (patch)
tree8dc825df2dd71a13a5e9bb6fc2a0cd95a83910a9 /src/lib/ecore_fb
parentfd25b44cab0e697ec109997be1e24c49e71cf265 (diff)
fix ecore_fb handling of escape and alt
as per mail to enlightenment-users@lists.sourceforge.net by: John Magolske <listmail@b79.net> Date: Fri, 28 Mar 2014 01:03:40 -0700
Diffstat (limited to 'src/lib/ecore_fb')
-rw-r--r--src/lib/ecore_fb/ecore_fb_li.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/lib/ecore_fb/ecore_fb_li.c b/src/lib/ecore_fb/ecore_fb_li.c
index 4d6ec34e10..43e876dd9d 100644
--- a/src/lib/ecore_fb/ecore_fb_li.c
+++ b/src/lib/ecore_fb/ecore_fb_li.c
@@ -123,10 +123,9 @@ _ecore_fb_li_device_event_key(Ecore_Fb_Input_Device *dev, struct input_event *ie
123 strcpy((char *)e->compose, compose); 123 strcpy((char *)e->compose, compose);
124 124
125 e->modifiers = 0; 125 e->modifiers = 0;
126 if (dev->keyboard.shift) 126 if (dev->keyboard.shift) e->modifiers |= ECORE_EVENT_MODIFIER_SHIFT;
127 e->modifiers |= ECORE_EVENT_MODIFIER_SHIFT;
128 if (dev->keyboard.ctrl) e->modifiers |= ECORE_EVENT_MODIFIER_CTRL; 127 if (dev->keyboard.ctrl) e->modifiers |= ECORE_EVENT_MODIFIER_CTRL;
129 if (dev->keyboard.alt) e->modifiers |= ECORE_EVENT_MODIFIER_SHIFT; 128 if (dev->keyboard.alt) e->modifiers |= ECORE_EVENT_MODIFIER_ALT;
130 if (dev->keyboard.lock) e->modifiers |= ECORE_EVENT_LOCK_CAPS; 129 if (dev->keyboard.lock) e->modifiers |= ECORE_EVENT_LOCK_CAPS;
131 130
132 e->timestamp = ecore_loop_time_get() * 1000.0; 131 e->timestamp = ecore_loop_time_get() * 1000.0;
@@ -187,10 +186,9 @@ _ecore_fb_li_device_event_key(Ecore_Fb_Input_Device *dev, struct input_event *ie
187 e->same_screen = 1; 186 e->same_screen = 1;
188 187
189 e->modifiers = 0; 188 e->modifiers = 0;
190 if (dev->keyboard.shift) 189 if (dev->keyboard.shift) e->modifiers |= ECORE_EVENT_MODIFIER_SHIFT;
191 e->modifiers |= ECORE_EVENT_MODIFIER_SHIFT;
192 if (dev->keyboard.ctrl) e->modifiers |= ECORE_EVENT_MODIFIER_CTRL; 190 if (dev->keyboard.ctrl) e->modifiers |= ECORE_EVENT_MODIFIER_CTRL;
193 if (dev->keyboard.alt) e->modifiers |= ECORE_EVENT_MODIFIER_SHIFT; 191 if (dev->keyboard.alt) e->modifiers |= ECORE_EVENT_MODIFIER_ALT;
194 if (dev->keyboard.lock) e->modifiers |= ECORE_EVENT_LOCK_CAPS; 192 if (dev->keyboard.lock) e->modifiers |= ECORE_EVENT_LOCK_CAPS;
195 193
196 e->x = dev->mouse.x; 194 e->x = dev->mouse.x;
@@ -251,7 +249,7 @@ _ecore_fb_li_device_event_rel(Ecore_Fb_Input_Device *dev, struct input_event *ie
251 e->modifiers = 0; 249 e->modifiers = 0;
252 if (dev->keyboard.shift) e->modifiers |= ECORE_EVENT_MODIFIER_SHIFT; 250 if (dev->keyboard.shift) e->modifiers |= ECORE_EVENT_MODIFIER_SHIFT;
253 if (dev->keyboard.ctrl) e->modifiers |= ECORE_EVENT_MODIFIER_CTRL; 251 if (dev->keyboard.ctrl) e->modifiers |= ECORE_EVENT_MODIFIER_CTRL;
254 if (dev->keyboard.alt) e->modifiers |= ECORE_EVENT_MODIFIER_SHIFT; 252 if (dev->keyboard.alt) e->modifiers |= ECORE_EVENT_MODIFIER_ALT;
255 if (dev->keyboard.lock) e->modifiers |= ECORE_EVENT_LOCK_CAPS; 253 if (dev->keyboard.lock) e->modifiers |= ECORE_EVENT_LOCK_CAPS;
256 254
257 e->x = dev->mouse.x; 255 e->x = dev->mouse.x;
@@ -289,7 +287,7 @@ _ecore_fb_li_device_event_rel(Ecore_Fb_Input_Device *dev, struct input_event *ie
289 e->modifiers = 0; 287 e->modifiers = 0;
290 if (dev->keyboard.shift) e->modifiers |= ECORE_EVENT_MODIFIER_SHIFT; 288 if (dev->keyboard.shift) e->modifiers |= ECORE_EVENT_MODIFIER_SHIFT;
291 if (dev->keyboard.ctrl) e->modifiers |= ECORE_EVENT_MODIFIER_CTRL; 289 if (dev->keyboard.ctrl) e->modifiers |= ECORE_EVENT_MODIFIER_CTRL;
292 if (dev->keyboard.alt) e->modifiers |= ECORE_EVENT_MODIFIER_SHIFT; 290 if (dev->keyboard.alt) e->modifiers |= ECORE_EVENT_MODIFIER_ALT;
293 if (dev->keyboard.lock) e->modifiers |= ECORE_EVENT_LOCK_CAPS; 291 if (dev->keyboard.lock) e->modifiers |= ECORE_EVENT_LOCK_CAPS;
294 292
295 e->timestamp = ecore_loop_time_get() * 1000.0; 293 e->timestamp = ecore_loop_time_get() * 1000.0;