From 71a9b7f5e9f5cca64d94cbf419687131f47c2984 Mon Sep 17 00:00:00 2001 From: John Magolske Date: Fri, 28 Mar 2014 17:16:24 +0900 Subject: [PATCH] fix ecore_fb handling of escape and alt as per mail to enlightenment-users@lists.sourceforge.net by: John Magolske Date: Fri, 28 Mar 2014 01:03:40 -0700 --- src/lib/ecore_fb/ecore_fb_li.c | 14 ++++++-------- 1 file 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 strcpy((char *)e->compose, compose); e->modifiers = 0; - if (dev->keyboard.shift) - e->modifiers |= ECORE_EVENT_MODIFIER_SHIFT; + if (dev->keyboard.shift) e->modifiers |= ECORE_EVENT_MODIFIER_SHIFT; if (dev->keyboard.ctrl) e->modifiers |= ECORE_EVENT_MODIFIER_CTRL; - if (dev->keyboard.alt) e->modifiers |= ECORE_EVENT_MODIFIER_SHIFT; + if (dev->keyboard.alt) e->modifiers |= ECORE_EVENT_MODIFIER_ALT; if (dev->keyboard.lock) e->modifiers |= ECORE_EVENT_LOCK_CAPS; 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 e->same_screen = 1; e->modifiers = 0; - if (dev->keyboard.shift) - e->modifiers |= ECORE_EVENT_MODIFIER_SHIFT; + if (dev->keyboard.shift) e->modifiers |= ECORE_EVENT_MODIFIER_SHIFT; if (dev->keyboard.ctrl) e->modifiers |= ECORE_EVENT_MODIFIER_CTRL; - if (dev->keyboard.alt) e->modifiers |= ECORE_EVENT_MODIFIER_SHIFT; + if (dev->keyboard.alt) e->modifiers |= ECORE_EVENT_MODIFIER_ALT; if (dev->keyboard.lock) e->modifiers |= ECORE_EVENT_LOCK_CAPS; e->x = dev->mouse.x; @@ -251,7 +249,7 @@ _ecore_fb_li_device_event_rel(Ecore_Fb_Input_Device *dev, struct input_event *ie e->modifiers = 0; if (dev->keyboard.shift) e->modifiers |= ECORE_EVENT_MODIFIER_SHIFT; if (dev->keyboard.ctrl) e->modifiers |= ECORE_EVENT_MODIFIER_CTRL; - if (dev->keyboard.alt) e->modifiers |= ECORE_EVENT_MODIFIER_SHIFT; + if (dev->keyboard.alt) e->modifiers |= ECORE_EVENT_MODIFIER_ALT; if (dev->keyboard.lock) e->modifiers |= ECORE_EVENT_LOCK_CAPS; e->x = dev->mouse.x; @@ -289,7 +287,7 @@ _ecore_fb_li_device_event_rel(Ecore_Fb_Input_Device *dev, struct input_event *ie e->modifiers = 0; if (dev->keyboard.shift) e->modifiers |= ECORE_EVENT_MODIFIER_SHIFT; if (dev->keyboard.ctrl) e->modifiers |= ECORE_EVENT_MODIFIER_CTRL; - if (dev->keyboard.alt) e->modifiers |= ECORE_EVENT_MODIFIER_SHIFT; + if (dev->keyboard.alt) e->modifiers |= ECORE_EVENT_MODIFIER_ALT; if (dev->keyboard.lock) e->modifiers |= ECORE_EVENT_LOCK_CAPS; e->timestamp = ecore_loop_time_get() * 1000.0;