summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2014-05-12 13:53:01 +0100
committerChris Michael <cp.michael@samsung.com>2014-05-12 13:55:02 +0100
commitcd5f8d0d2586c279a874ed88c2cd8cd0b3cb2817 (patch)
tree5e2d74879669d530f3f42780e08af95ac15ff822
parentd497cd4364711b5067ff91a12d056957815e81c6 (diff)
downloadefl-cd5f8d0d2586c279a874ed88c2cd8cd0b3cb2817.tar.gz
ecore-drm: Send proper keycode to ecore key event, and remove
erroneous variable. @bugfix: Since later functions which process the ecore key event will end up subtracting X's broken keycode values from This original keycode value, we had better send the proper code with the offset already added. Signed-off-by: Chris Michael <cp.michael@samsung.com>
-rw-r--r--src/lib/ecore_drm/ecore_drm_evdev.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/lib/ecore_drm/ecore_drm_evdev.c b/src/lib/ecore_drm/ecore_drm_evdev.c
index fc43f30e01..6095e05ab8 100644
--- a/src/lib/ecore_drm/ecore_drm_evdev.c
+++ b/src/lib/ecore_drm/ecore_drm_evdev.c
@@ -297,14 +297,9 @@ _device_notify_key(Ecore_Drm_Evdev *dev, struct input_event *event, unsigned int
char key[256], keyname[256], compose[256];
Ecore_Event_Key *e;
Ecore_Drm_Input *input;
- int evtype;
if (!(input = dev->seat->input)) return;
- /* DBG("Key Event"); */
- /* DBG("\tCode: %d", event->code); */
- /* DBG("\tValue: %d", event->value); */
-
/* xkb rules reflect X broken keycodes, so offset by 8 */
code = event->code + 8;
@@ -356,18 +351,17 @@ _device_notify_key(Ecore_Drm_Evdev *dev, struct input_event *event, unsigned int
e->root_window = (Ecore_Window)input->dev->window;
e->timestamp = timestamp;
e->same_screen = 1;
- e->keycode = event->code;
+ e->keycode = code;
e->data = NULL;
_device_modifiers_update(dev);
e->modifiers = dev->xkb.modifiers;
if (event->value)
- evtype = ECORE_EVENT_KEY_DOWN;
+ ecore_event_add(ECORE_EVENT_KEY_DOWN, e, NULL, NULL);
else
- evtype = ECORE_EVENT_KEY_UP;
+ ecore_event_add(ECORE_EVENT_KEY_UP, e, NULL, NULL);
- ecore_event_add(evtype, e, NULL, NULL);
}
static void