From 1ec3f879603bddb36ae7c10e16d7202bacea5c3d Mon Sep 17 00:00:00 2001 From: Wonkeun Oh Date: Fri, 12 Dec 2014 17:55:07 +0900 Subject: [PATCH] Fixed bug XF86MenuKB event couldn't catched in the key_up_cb fuction Change-Id: I71566f79fcdb038a985fc4157b984c7a2a4790c8 --- ism/extras/efl_immodule/isf_imf_context.cpp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/ism/extras/efl_immodule/isf_imf_context.cpp b/ism/extras/efl_immodule/isf_imf_context.cpp index a97dd80..0de518c 100644 --- a/ism/extras/efl_immodule/isf_imf_context.cpp +++ b/ism/extras/efl_immodule/isf_imf_context.cpp @@ -582,12 +582,11 @@ _key_down_cb (void *data, int type, void *event) Ecore_X_Window focus_win = ecore_x_window_focus_get (); if (client_win == focus_win && (_hide_ise_based_on_focus) ? (_focused_ic != 0):(true)) { - if (get_keyboard_mode () == TOOLBAR_HELPER_MODE) { - if (ecore_imf_context_input_panel_state_get (active_ctx) == ECORE_IMF_INPUT_PANEL_STATE_HIDE) - return ECORE_CALLBACK_PASS_ON; - } - if (filter_keys (ev->keyname, SCIM_CONFIG_HOTKEYS_FRONTEND_HIDE_ISE)) { + if (get_keyboard_mode () == TOOLBAR_HELPER_MODE) { + if (ecore_imf_context_input_panel_state_get (active_ctx) == ECORE_IMF_INPUT_PANEL_STATE_HIDE) + return ECORE_CALLBACK_PASS_ON; + } LOGD ("%s key is pressed.\n", ev->keyname); if (_active_helper_option & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT) { KeyEvent key; @@ -622,12 +621,11 @@ _key_up_cb (void *data, int type, void *event) Ecore_X_Window focus_win = ecore_x_window_focus_get (); if (client_win == focus_win && (_hide_ise_based_on_focus) ? (_focused_ic != 0):(true)) { - if (get_keyboard_mode () == TOOLBAR_HELPER_MODE) { - if (ecore_imf_context_input_panel_state_get (active_ctx) == ECORE_IMF_INPUT_PANEL_STATE_HIDE) - return ECORE_CALLBACK_PASS_ON; - } - if (filter_keys (ev->keyname, SCIM_CONFIG_HOTKEYS_FRONTEND_HIDE_ISE)) { + if (get_keyboard_mode () == TOOLBAR_HELPER_MODE) { + if (ecore_imf_context_input_panel_state_get (active_ctx) == ECORE_IMF_INPUT_PANEL_STATE_HIDE) + return ECORE_CALLBACK_PASS_ON; + } LOGD ("%s key is released.\n", ev->keyname); if (_active_helper_option & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT) { KeyEvent key; -- 2.7.4