summaryrefslogtreecommitdiff
path: root/ism/extras
diff options
context:
space:
mode:
authorInhong Han <inhong1.han@samsung.com>2019-02-25 18:35:31 +0900
committerInHong Han <inhong1.han@samsung.com>2019-03-11 07:48:58 +0000
commit5e3e27d3d9d90e8a56bc9d80ec28431d88d66d33 (patch)
tree1c3399797bf6d106de364430e2b7af1a17fcb7c9 /ism/extras
parent14f0112ed4906f18470214727d2638f083c72f76 (diff)
downloadisf-5e3e27d3d9d90e8a56bc9d80ec28431d88d66d33.tar.gz
isf-5e3e27d3d9d90e8a56bc9d80ec28431d88d66d33.tar.bz2
isf-5e3e27d3d9d90e8a56bc9d80ec28431d88d66d33.zip
Add keycode in the filter_key event
Change-Id: I99272cb98ceb059c43f20ad8b22849abaa940912
Diffstat (limited to 'ism/extras')
-rw-r--r--ism/extras/wayland_immodule/wayland_imcontext.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/ism/extras/wayland_immodule/wayland_imcontext.c b/ism/extras/wayland_immodule/wayland_imcontext.c
index 822873a2..d37b8eb9 100644
--- a/ism/extras/wayland_immodule/wayland_imcontext.c
+++ b/ism/extras/wayland_immodule/wayland_imcontext.c
@@ -3296,6 +3296,7 @@ wayland_im_context_filter_event(Ecore_IMF_Context *ctx,
key_dev_name = (char *)key_ev->dev_name;
key_dev_class = key_ev->dev_class;
key_dev_subclass = key_ev->dev_subclass;
+ ecore_key_ev.keycode = key_ev->keycode;
}
else if (type == ECORE_IMF_EVENT_KEY_DOWN) {
Ecore_IMF_Event_Key_Down *key_ev = (Ecore_IMF_Event_Key_Down *)imf_event;
@@ -3309,6 +3310,7 @@ wayland_im_context_filter_event(Ecore_IMF_Context *ctx,
key_dev_name = (char *)key_ev->dev_name;
key_dev_class = key_ev->dev_class;
key_dev_subclass = key_ev->dev_subclass;
+ ecore_key_ev.keycode = key_ev->keycode;
}
if (type == ECORE_IMF_EVENT_KEY_UP || type == ECORE_IMF_EVENT_KEY_DOWN) {
@@ -3357,11 +3359,11 @@ wayland_im_context_filter_event(Ecore_IMF_Context *ctx,
if (ecore_key_ev.modifiers & ECORE_EVENT_LOCK_NUM)
modifiers |= imcontext->num_mask;
- SECURE_LOGD ("ev:modifiers=0x%x, modifiers=0x%x, shift_mask=0x%x, control_mask=0x%0x, alt_mask=0x%x, caps_mask=0x%x, num_mask=0x%x", ecore_key_ev.modifiers, modifiers, imcontext->shift_mask, imcontext->control_mask, imcontext->alt_mask, imcontext->caps_mask, imcontext->num_mask);
+ SECURE_LOGD ("ev:modifiers=0x%x, modifiers=0x%x, shift_mask=0x%x, control_mask=0x%0x, alt_mask=0x%x, caps_mask=0x%x, num_mask=0x%x, keycode=%u", ecore_key_ev.modifiers, modifiers, imcontext->shift_mask, imcontext->control_mask, imcontext->alt_mask, imcontext->caps_mask, imcontext->num_mask, ecore_key_ev.keycode);
//Send key event to IME.
wl_text_input_filter_key_event(imcontext->text_input, serial, ecore_key_ev.timestamp, ecore_key_ev.key,
type == ECORE_IMF_EVENT_KEY_UP? WL_KEYBOARD_KEY_STATE_RELEASED : WL_KEYBOARD_KEY_STATE_PRESSED,
- modifiers, (key_dev_name ? key_dev_name : ""), key_dev_class, key_dev_subclass);
+ modifiers, (key_dev_name ? key_dev_name : ""), key_dev_class, key_dev_subclass, ecore_key_ev.keycode);
//Waiting for filter_key_event_done from IME.
//This function should return IME filtering result with boolean type.
Ecore_Wl2_Display *wl2_display = ecore_wl2_connected_display_get(NULL);