From: InHong Han Date: Tue, 27 Dec 2016 06:47:56 +0000 (+0900) Subject: Removed remote input functions excluding the TV profile X-Git-Tag: accepted/tizen/3.0.m2/mobile/20170104.143002~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F04%2F107204%2F3;p=platform%2Fcore%2Fuifw%2Fisf.git Removed remote input functions excluding the TV profile Change-Id: Ie4fd23e93341cdc40001df51d1009fabf68c3743 --- diff --git a/ism/extras/efl_panel/remote_input.cpp b/ism/extras/efl_panel/remote_input.cpp index cf41a1c..14f31c9 100644 --- a/ism/extras/efl_panel/remote_input.cpp +++ b/ism/extras/efl_panel/remote_input.cpp @@ -29,6 +29,10 @@ #include #include +#ifdef LOG_TAG +# undef LOG_TAG +#endif +#define LOG_TAG "ISF_REMOTE_INPUT" using namespace scim; extern std::vector _uuids; diff --git a/ism/extras/efl_panel/remote_input.h b/ism/extras/efl_panel/remote_input.h index cecb2c7..253d2f5 100644 --- a/ism/extras/efl_panel/remote_input.h +++ b/ism/extras/efl_panel/remote_input.h @@ -53,10 +53,6 @@ #include "scim.h" #include "websocketserver.h" -#ifdef LOG_TAG -# undef LOG_TAG -#endif -#define LOG_TAG "ISF_REMOTE_INPUT" using namespace scim; enum UINPUT_DEVICE{ diff --git a/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp b/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp index 515c537..0e5b792 100644 --- a/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp +++ b/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp @@ -985,8 +985,10 @@ check_input_resource (WSCContextISF* wsc_ctx, Input_Resource input_res) if (context_scim->impl->input_resource == input_res) return; +#if ENABLE_REMOTE_INPUT if (context_scim->impl->input_resource != input_res && input_res != INPUT_RESOURCE_NONE) g_info_manager->remoteinput_callback_input_resource (input_res); +#endif if (context_scim->impl->input_resource == INPUT_RESOURCE_REMOTE && input_res == INPUT_RESOURCE_LOCAL) { WideString wstr = context_scim->impl->preedit_string; @@ -1234,7 +1236,9 @@ isf_wsc_context_focus_in (WSCContextISF *wsc_ctx) g_info_manager->get_active_helper_option (WAYLAND_MODULE_CLIENT_ID, _active_helper_option); +#if ENABLE_REMOTE_INPUT g_info_manager->remoteinput_callback_focus_in (); +#endif context_scim->impl->init_remote_entry_metadata = false; context_scim->impl->init_remote_surrounding_text = false; @@ -1271,7 +1275,9 @@ isf_wsc_context_focus_out (WSCContextISF *wsc_ctx) _focused_ic = 0; +#if ENABLE_REMOTE_INPUT g_info_manager->remoteinput_callback_focus_out (); +#endif context_scim->impl->init_remote_entry_metadata = true; context_scim->impl->init_remote_surrounding_text = true; @@ -1368,8 +1374,10 @@ isf_wsc_context_send_surrounding_text (WSCContextISF* wsc_ctx, const char *text, context_scim->impl->surrounding_text = utf8_mbstowcs (String (text)); context_scim->impl->cursor_pos = cursor; +#if ENABLE_REMOTE_INPUT String _text(text); g_info_manager->remoteinput_callback_surrounding_text (_text, context_scim->impl->cursor_pos); +#endif context_scim->impl->init_remote_surrounding_text = true; } @@ -1395,8 +1403,10 @@ isf_wsc_context_send_entry_metadata (WSCContextISF* wsc_ctx, Ecore_IMF_Input_Hin context_scim->impl->autocapital_type = type; context_scim->impl->return_key_disabled = return_key_disabled; +#if ENABLE_REMOTE_INPUT g_info_manager->remoteinput_callback_entry_metadata (context_scim->impl->input_hint, context_scim->impl->panel_layout, context_scim->impl->variation, context_scim->impl->autocapital_type, context_scim->impl->return_key_disabled); +#endif context_scim->impl->init_remote_entry_metadata = true;