From 4e0d7de6679387a4676060d1e8d115007442401c Mon Sep 17 00:00:00 2001 From: InHong Han Date: Thu, 23 Feb 2023 14:26:41 +0900 Subject: [PATCH] Support to apply boosting mode when launching IME in TV Change-Id: Idb7aad3f74bbc32216396b98db5ff13772542186 (cherry picked from commit c6cb39a9ccbcfb14c84b88e91d213f68a135c791) --- ism/extras/efl_panel/isf_panel_efl.cpp | 14 ++------------ ism/src/isf_info_manager.cpp | 23 ++--------------------- ism/src/isf_info_manager.h | 2 -- 3 files changed, 4 insertions(+), 35 deletions(-) diff --git a/ism/extras/efl_panel/isf_panel_efl.cpp b/ism/extras/efl_panel/isf_panel_efl.cpp index 7471e5d..81f6860 100644 --- a/ism/extras/efl_panel/isf_panel_efl.cpp +++ b/ism/extras/efl_panel/isf_panel_efl.cpp @@ -246,7 +246,6 @@ static void slot_stop_default_ise (bool is_exist); static void slot_run_helper (const String &uuid, const String &config, const String &display); static bool slot_launch_option_application (String ime_appid); static bool slot_get_ise_setting_appid (String ime_appid, String &ime_setting_appid); -static void slot_set_preloading_ise (bool preloading); #if ENABLE_REMOTE_INPUT static void slot_send_remote_input_message (const String &msg, bool len); @@ -449,7 +448,6 @@ static bool _auto_destroy_ise = false; static bool _soft_keyboard_launched = false; static bool _focus_in = false; static bool _enable_auto_restart = true; -static bool _preloading_ise = true; #if ISF_BUILD_CANDIDATE_UI static bool candidate_expanded = false; @@ -4095,7 +4093,6 @@ static bool initialize_panel_agent (const ConfigPointer& config, const String &d _info_manager->signal_connect_run_helper (slot (slot_run_helper)); _info_manager->signal_connect_launch_option_application (slot (slot_launch_option_application)); _info_manager->signal_connect_get_ise_setting_appid (slot (slot_get_ise_setting_appid)); - _info_manager->signal_connect_set_preloading_ise (slot (slot_set_preloading_ise)); LOGD ("initializing panel agent succeeded"); @@ -6280,8 +6277,8 @@ static bool app_control_launch (const char *app_id) return false; } - if (_TV && _preloading_ise) { - ret = app_control_add_extra_data(app_control, "Preloading", "true"); + if (_TV) { + ret = app_control_add_extra_data(app_control, "__K_EX_FORCE_BOOST", "enable"); if (ret != APP_CONTROL_ERROR_NONE) { LOGW ("app_control_add_extra_data returned %08x", ret); } @@ -6438,11 +6435,6 @@ static bool slot_get_ise_setting_appid (String ime_appid, String &ime_setting_ap return ime_setting_appid.length () > 0 ? true : false; } -static void slot_set_preloading_ise (bool preloading) -{ - _preloading_ise = preloading; -} - ////////////////////////////////////////////////////////////////////// // End of PanelAgent-Functions ////////////////////////////////////////////////////////////////////// @@ -7662,8 +7654,6 @@ int main (int argc, char *argv []) /* Request to terminate active IME */ terminate_active_ise (_initial_ise_uuid); - _preloading_ise = !_launch_ise_on_request; - /* Launches default soft keyboard when all conditions are satisfied */ launch_default_soft_keyboard (); diff --git a/ism/src/isf_info_manager.cpp b/ism/src/isf_info_manager.cpp index 9d82146..0c4320e 100644 --- a/ism/src/isf_info_manager.cpp +++ b/ism/src/isf_info_manager.cpp @@ -425,8 +425,6 @@ class InfoManager::InfoManagerImpl InfoManagerSignalBoolString m_signal_launch_option_application; InfoManagerSignalBoolString2 m_signal_get_ise_setting_appid; - InfoManagerSignalBool m_signal_connect_set_preloading_ise; - PanelAgentManager m_panel_agent_manager; void delete_ise_context_buffer (void) { @@ -1544,10 +1542,8 @@ public: } else { bool launch_ise_on_request = scim_global_config_read (String (SCIM_GLOBAL_CONFIG_LAUNCH_ISE_ON_REQUEST), false); bool enable_auto_restart = scim_global_config_read (String (SCIM_GLOBAL_CONFIG_ENABLE_AUTO_RESTART_ISE), true); - if (launch_ise_on_request || !enable_auto_restart) { - m_signal_connect_set_preloading_ise (false); + if (launch_ise_on_request || !enable_auto_restart) m_signal_start_default_ise (); - } } } @@ -1603,7 +1599,6 @@ public: m_panel_agent_manager.set_helper_optimization_hint(it->second.id, ctx, m_current_helper_uuid, ISE_OPTIMIZATION_HINT_SHOW_PREPARE); } - m_signal_connect_set_preloading_ise (true); m_signal_start_default_ise(); } @@ -2739,11 +2734,6 @@ public: return m_signal_remoteinput_send_surrounding_text.connect (slot); } - Connection signal_connect_set_preloading_ise (InfoManagerSlotBool* slot) - { - return m_signal_connect_set_preloading_ise.connect (slot); - } - //ISM_TRANS_CMD_REGISTER_PANEL_CLIENT void register_panel_client (uint32 client_id, uint32 id) { m_panel_client_map [client_id] = (int)id; @@ -2794,10 +2784,8 @@ public: void focus_in (int client_id, uint32 context, String uuid) { m_refocus_needed = true; bool launch_ise_on_request = scim_global_config_read (String (SCIM_GLOBAL_CONFIG_LAUNCH_ISE_ON_REQUEST), false); - if (launch_ise_on_request) { - m_signal_connect_set_preloading_ise (false); + if (launch_ise_on_request) m_signal_start_default_ise (); - } m_signal_focus_in (); focus_in_helper (m_current_helper_uuid, m_panel_client_map[client_id], context); @@ -3070,7 +3058,6 @@ public: } m_start_helper_ic_index[uuid].push_back(std::make_pair(ic, ic_uuid)); - m_signal_connect_set_preloading_ise (true); m_signal_run_helper (uuid, m_config_name, m_display_name); restart_uuid = uuid; LOGE ("Auto restart soft ISE:%s", uuid.c_str ()); @@ -6210,12 +6197,6 @@ InfoManager::signal_connect_remoteinput_send_surrounding_text (InfoManagerSlotI return m_impl->signal_connect_remoteinput_send_surrounding_text (slot); } -Connection -InfoManager::signal_connect_set_preloading_ise (InfoManagerSlotBool* slot) -{ - return m_impl->signal_connect_set_preloading_ise (slot); -} - } /* namespace scim */ /* diff --git a/ism/src/isf_info_manager.h b/ism/src/isf_info_manager.h index 79d79e6..f204da5 100644 --- a/ism/src/isf_info_manager.h +++ b/ism/src/isf_info_manager.h @@ -1592,8 +1592,6 @@ public: Connection signal_connect_remoteinput_send_input_message (InfoManagerSlotStringBool* slot); Connection signal_connect_remoteinput_send_surrounding_text (InfoManagerSlotIntString* slot); - - Connection signal_connect_set_preloading_ise (InfoManagerSlotBool* slot); }; /** @} */ -- 2.7.4