Add configuration value for the on-demand ISE

Change-Id: Ie1d73f84a0ded14cb7d7a05dfe235b589c9e5aa5

diff --git a/ism/configs/global b/ism/configs/global
index d019251..3f2f937 100755 (executable)
--- a/ism/configs/global
+++ b/ism/configs/global
@@ -12,6 +12,7 @@
 /InitialIseName = Tizen Keyboard
 /PreloadKeyboardIse = true
 /LaunchIseOnRequest = false
+/EnableAutoDestroyIse = false
 /ChangeKeyboardModeByTouch = false
 /ChangeKeyboardModeByFocusMove = false
 /HideIseBasedOnFocus = false

diff --git a/ism/extras/efl_panel/isf_panel_efl.cpp b/ism/extras/efl_panel/isf_panel_efl.cpp
index b3b30a9..0dc70d8 100644 (file)
--- a/ism/extras/efl_panel/isf_panel_efl.cpp
+++ b/ism/extras/efl_panel/isf_panel_efl.cpp
@@ -466,6 +466,7 @@ static String               g_updated_helper_pkgid          = "";
 #endif
 
 static bool               _launch_ise_on_request            = false;
+static bool               _auto_destroy_ise                 = false;
 static bool               _soft_keyboard_launched           = false;
 static bool               _focus_in                         = false;
 
@@ -2147,6 +2148,7 @@ static void load_config (void)
         _info_manager->set_should_shared_ise (shared_ise);
     }
     _launch_ise_on_request = scim_global_config_read (String (SCIM_GLOBAL_CONFIG_LAUNCH_ISE_ON_REQUEST), _launch_ise_on_request);
+    _auto_destroy_ise = scim_global_config_read (String (SCIM_GLOBAL_CONFIG_ENABLE_AUTO_DESTROY_ISE), _auto_destroy_ise);
 
     isf_load_ise_information (ALL_ISE, _config);
 }
@@ -6425,7 +6427,7 @@ static void slot_stop_default_ise (void)
 {
     SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n";
 
-    if (_launch_ise_on_request && _soft_keyboard_launched) {
+    if (_launch_ise_on_request && _auto_destroy_ise && _soft_keyboard_launched) {
         String uuid = _info_manager->get_current_helper_uuid ();
 
         if (uuid.length () > 0) {

diff --git a/ism/src/scim_config_path.h b/ism/src/scim_config_path.h
index b372627..bce31fc 100644 (file)
--- a/ism/src/scim_config_path.h
+++ b/ism/src/scim_config_path.h
@@ -86,6 +86,7 @@ namespace scim {
 #define SCIM_GLOBAL_CONFIG_DEFAULT_ISE_UUID                         "/DefaultIseUuid"
 #define SCIM_GLOBAL_CONFIG_PRELOAD_KEYBOARD_ISE                     "/PreloadKeyboardIse"
 #define SCIM_GLOBAL_CONFIG_LAUNCH_ISE_ON_REQUEST                    "/LaunchIseOnRequest"
+#define SCIM_GLOBAL_CONFIG_ENABLE_AUTO_DESTROY_ISE                  "/EnableAutoDestroyIse"
 #define SCIM_GLOBAL_CONFIG_CHANGE_KEYBOARD_MODE_BY_TOUCH            "/ChangeKeyboardModeByTouch"
 #define SCIM_GLOBAL_CONFIG_CHANGE_KEYBOARD_MODE_BY_FOCUS_MOVE       "/ChangeKeyboardModeByFocusMove"
 #define SCIM_GLOBAL_CONFIG_HIDE_ISE_BASED_ON_FOCUS                  "/HideIseBasedOnFocus"