From 6994cb2a86dda3dc333dcf049c93de29976cf3a8 Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Tue, 6 May 2014 13:09:20 +0100 Subject: [PATCH] ecore-x: Set keycode in ecore_event structure during key press/release events bugfix@: As we have support in the Ecore_Event structure for storing keycode on key press/release, let's utilize it. This will simplify wayland compositor code as we won't have to parse key names to get the keycode. Signed-off-by: Chris Michael --- src/lib/ecore_x/xcb/ecore_xcb_events.c | 2 ++ src/lib/ecore_x/xlib/ecore_x_events.c | 1 + 2 files changed, 3 insertions(+) diff --git a/src/lib/ecore_x/xcb/ecore_xcb_events.c b/src/lib/ecore_x/xcb/ecore_xcb_events.c index fe30c0f468..ffcca53724 100644 --- a/src/lib/ecore_x/xcb/ecore_xcb_events.c +++ b/src/lib/ecore_x/xcb/ecore_xcb_events.c @@ -2422,6 +2422,7 @@ _ecore_xcb_event_key_press(xcb_generic_event_t *event) e->event_window = xevent->event; e->same_screen = xevent->same_screen; e->root_window = xevent->root; + e->keycode = keycode; DBG("Sending Key Down Event: %s", e->keyname); ecore_event_add(ECORE_EVENT_KEY_DOWN, e, NULL, NULL); @@ -2491,6 +2492,7 @@ _ecore_xcb_event_key_release(xcb_generic_event_t *event) e->event_window = xevent->event; e->same_screen = xevent->same_screen; e->root_window = xevent->root; + e->keycode = keycode; ecore_event_add(ECORE_EVENT_KEY_UP, e, NULL, NULL); } diff --git a/src/lib/ecore_x/xlib/ecore_x_events.c b/src/lib/ecore_x/xlib/ecore_x_events.c index bbb353403a..6a1f9a575c 100644 --- a/src/lib/ecore_x/xlib/ecore_x_events.c +++ b/src/lib/ecore_x/xlib/ecore_x_events.c @@ -342,6 +342,7 @@ _ecore_key_press(int event, e->event_window = xevent->window; e->same_screen = xevent->same_screen; e->root_window = xevent->root; + e->keycode = xevent->keycode; ecore_event_add(event, e, NULL, NULL);