diff options
author | Mike Blumenkrantz <zmike@osg.samsung.com> | 2015-05-20 14:38:38 -0400 |
---|---|---|
committer | Mike Blumenkrantz <zmike@osg.samsung.com> | 2015-05-20 14:50:46 -0400 |
commit | c3f3c4eba80f0a7f388de608f2b1566213e73603 (patch) | |
tree | f47883d1cb3f203dfea3b764b30523b42dc41515 | |
parent | ae6ec069916c17df7525e060b23356a48912738a (diff) |
ecore-input: add keysym to Ecore_Event_Key struct
currently only functional for x11, wl, drm
@feature
-rw-r--r-- | src/lib/ecore_drm/ecore_drm_evdev.c | 1 | ||||
-rw-r--r-- | src/lib/ecore_input/Ecore_Input.h | 1 | ||||
-rwxr-xr-x | src/lib/ecore_wayland/ecore_wl_input.c | 1 | ||||
-rw-r--r-- | src/lib/ecore_x/xcb/ecore_xcb_events.c | 1 | ||||
-rw-r--r-- | src/lib/ecore_x/xlib/ecore_x_events.c | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/src/lib/ecore_drm/ecore_drm_evdev.c b/src/lib/ecore_drm/ecore_drm_evdev.c index e40ad400b3..ec50509264 100644 --- a/src/lib/ecore_drm/ecore_drm_evdev.c +++ b/src/lib/ecore_drm/ecore_drm_evdev.c | |||
@@ -361,6 +361,7 @@ _device_handle_key(struct libinput_device *device, struct libinput_event_keyboar | |||
361 | e->timestamp = timestamp; | 361 | e->timestamp = timestamp; |
362 | e->same_screen = 1; | 362 | e->same_screen = 1; |
363 | e->keycode = code; | 363 | e->keycode = code; |
364 | e->keysym = sym; | ||
364 | 365 | ||
365 | _device_modifiers_update(edev); | 366 | _device_modifiers_update(edev); |
366 | 367 | ||
diff --git a/src/lib/ecore_input/Ecore_Input.h b/src/lib/ecore_input/Ecore_Input.h index f58c56e767..f944006353 100644 --- a/src/lib/ecore_input/Ecore_Input.h +++ b/src/lib/ecore_input/Ecore_Input.h | |||
@@ -152,6 +152,7 @@ extern "C" { | |||
152 | unsigned int keycode; /**< Key scan code numeric value @since 1.10 */ | 152 | unsigned int keycode; /**< Key scan code numeric value @since 1.10 */ |
153 | 153 | ||
154 | void *data; /**< User data associated with an Ecore_Event_Key @since 1.10 */ | 154 | void *data; /**< User data associated with an Ecore_Event_Key @since 1.10 */ |
155 | unsigned int keysym; /**< Encoding of keyboard symbold @since 1.15 */ | ||
155 | }; | 156 | }; |
156 | 157 | ||
157 | /** | 158 | /** |
diff --git a/src/lib/ecore_wayland/ecore_wl_input.c b/src/lib/ecore_wayland/ecore_wl_input.c index 7813a15b1b..58d1030fce 100755 --- a/src/lib/ecore_wayland/ecore_wl_input.c +++ b/src/lib/ecore_wayland/ecore_wl_input.c | |||
@@ -827,6 +827,7 @@ _ecore_wl_input_cb_keyboard_key(void *data, struct wl_keyboard *keyboard EINA_UN | |||
827 | e->timestamp = timestamp; | 827 | e->timestamp = timestamp; |
828 | e->modifiers = input->modifiers; | 828 | e->modifiers = input->modifiers; |
829 | e->keycode = code; | 829 | e->keycode = code; |
830 | e->keysym = sym; | ||
830 | 831 | ||
831 | if (state) | 832 | if (state) |
832 | ecore_event_add(ECORE_EVENT_KEY_DOWN, e, NULL, NULL); | 833 | ecore_event_add(ECORE_EVENT_KEY_DOWN, e, NULL, NULL); |
diff --git a/src/lib/ecore_x/xcb/ecore_xcb_events.c b/src/lib/ecore_x/xcb/ecore_xcb_events.c index 0b71451e4b..fdd17da0da 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) | |||
2422 | e->same_screen = xevent->same_screen; | 2422 | e->same_screen = xevent->same_screen; |
2423 | e->root_window = xevent->root; | 2423 | e->root_window = xevent->root; |
2424 | e->keycode = keycode; | 2424 | e->keycode = keycode; |
2425 | e->keysym = sym; | ||
2425 | 2426 | ||
2426 | DBG("Sending Key Down Event: %s", e->keyname); | 2427 | DBG("Sending Key Down Event: %s", e->keyname); |
2427 | ecore_event_add(ECORE_EVENT_KEY_DOWN, e, NULL, NULL); | 2428 | ecore_event_add(ECORE_EVENT_KEY_DOWN, 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 8ab79a4582..98640746ec 100644 --- a/src/lib/ecore_x/xlib/ecore_x_events.c +++ b/src/lib/ecore_x/xlib/ecore_x_events.c | |||
@@ -393,6 +393,7 @@ _ecore_key_press(int event, | |||
393 | e->same_screen = xevent->same_screen; | 393 | e->same_screen = xevent->same_screen; |
394 | e->root_window = xevent->root; | 394 | e->root_window = xevent->root; |
395 | e->keycode = xevent->keycode; | 395 | e->keycode = xevent->keycode; |
396 | e->keysym = sym; | ||
396 | 397 | ||
397 | ecore_event_add(event, e, NULL, NULL); | 398 | ecore_event_add(event, e, NULL, NULL); |
398 | 399 | ||