From 97b5ece7ab6283d64f416a33f095f889a382b84b Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Fri, 2 Oct 2015 21:58:48 +0900 Subject: [PATCH] Skip unnecessary job in H/W keyboard mode Change-Id: I17a14f6bcbf7f8c2d8a196962e59570c08d57976 --- ism/extras/efl_immodule/isf_imf_control_ui.cpp | 16 ++++++++-------- ism/extras/efl_wsc/isf_wsc_control_ui.cpp | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ism/extras/efl_immodule/isf_imf_control_ui.cpp b/ism/extras/efl_immodule/isf_imf_control_ui.cpp index de7849c..37783f1 100644 --- a/ism/extras/efl_immodule/isf_imf_control_ui.cpp +++ b/ism/extras/efl_immodule/isf_imf_control_ui.cpp @@ -523,6 +523,14 @@ void isf_imf_context_input_panel_show (Ecore_IMF_Context* ctx) input_panel_ctx = ctx; Ise_Context iseContext; + /* Set the current XID of the active window into the root window property */ + save_current_xid (ctx); + + if (kbd_mode == TOOLBAR_KEYBOARD_MODE) { + LOGD ("H/W keyboard is existed.\n"); + return; + } + scim_initialize(); _win_focus_out_handler_del (); @@ -556,14 +564,6 @@ void isf_imf_context_input_panel_show (Ecore_IMF_Context* ctx) active_context_canvas = (Evas *)ecore_imf_context_client_canvas_get (ctx); - /* Set the current XID of the active window into the root window property */ - save_current_xid (ctx); - - if (kbd_mode == TOOLBAR_KEYBOARD_MODE) { - LOGD ("H/W keyboard is existed.\n"); - return; - } - if (_clear_hide_timer ()) { hide_req_ic = NULL; } diff --git a/ism/extras/efl_wsc/isf_wsc_control_ui.cpp b/ism/extras/efl_wsc/isf_wsc_control_ui.cpp index 72e3f91..c619928 100644 --- a/ism/extras/efl_wsc/isf_wsc_control_ui.cpp +++ b/ism/extras/efl_wsc/isf_wsc_control_ui.cpp @@ -87,6 +87,11 @@ void isf_wsc_context_input_panel_show (WSCContextISF* ctx) if (!ctx || !ctx->ctx) return; + if (hw_kbd_num != 0) { + LOGD ("H/W keyboard is existed.\n"); + return; + } + /* set password mode */ iseContext.password_mode = wsc_context_input_panel_password_mode_get (ctx->ctx); @@ -113,11 +118,6 @@ void isf_wsc_context_input_panel_show (WSCContextISF* ctx) isf_wsc_context_prediction_allow_set (ctx, iseContext.prediction_allow); - if (hw_kbd_num != 0) { - LOGD ("H/W keyboard is existed.\n"); - return; - } - /* set return key type */ iseContext.return_key_type = (Ecore_IMF_Input_Panel_Return_Key_Type)ctx->ctx->return_key_type; -- 2.7.4