e_comp_wl_input: Add e_comp_wl_input_keymap_default_set()

Change-Id: I9f5925ec9d7b7cc26c7ab5703f7e7f1da6c6b5b2
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>

diff --git a/src/bin/inputmgr/e_keyrouter.c b/src/bin/inputmgr/e_keyrouter.c
index 2fa7c8a..ab98575 100644 (file)
--- a/src/bin/inputmgr/e_keyrouter.c
+++ b/src/bin/inputmgr/e_keyrouter.c
@@ -466,9 +466,7 @@ e_keyrouter_query_tizen_key_table(void)
         KLINF("Server create a new cache file: %s", e_comp_wl_input_keymap_path_get(names));
         res = unlink(e_comp_wl_input_keymap_path_get(names));
 
-        g_rec_mutex_lock(&e_comp_input_key->xkb.keymap_mutex);
-        e_comp_wl_input_keymap_set(NULL, NULL, NULL, NULL, NULL, xkb_context_ref(e_comp_input_key->xkb.context), xkb_keymap_ref(e_comp_input_key->xkb.keymap));
-        g_rec_mutex_unlock(&e_comp_input_key->xkb.keymap_mutex);
+        e_comp_wl_input_keymap_default_set();
      }
    else
      KLINF("Currently cache file is exist. Do not change it.");

diff --git a/src/bin/server/e_comp_wl_input.c b/src/bin/server/e_comp_wl_input.c
index ef8a007..91aed89 100644 (file)
--- a/src/bin/server/e_comp_wl_input.c
+++ b/src/bin/server/e_comp_wl_input.c
@@ -2119,6 +2119,14 @@ e_comp_wl_input_keymap_set(const char *rules, const char *model, const char *lay
    TRACE_INPUT_END();
 }
 
+E_API void
+e_comp_wl_input_keymap_default_set(void)
+{
+   g_rec_mutex_lock(&e_comp_input_key->xkb.keymap_mutex);
+   e_comp_wl_input_keymap_set(NULL, NULL, NULL, NULL, NULL, xkb_context_ref(e_comp_input_key->xkb.context), xkb_keymap_ref(e_comp_input_key->xkb.keymap));
+   g_rec_mutex_unlock(&e_comp_input_key->xkb.keymap_mutex);
+}
+
 EINTERN const char*
 e_comp_wl_input_keymap_default_rules_get(void)
 {

diff --git a/src/include/e_comp_wl_input.h b/src/include/e_comp_wl_input.h
index ac8cae4..5f0bac2 100644 (file)
--- a/src/include/e_comp_wl_input.h
+++ b/src/include/e_comp_wl_input.h
@@ -17,6 +17,7 @@ E_API Eina_Stringshare *e_comp_wl_input_keymap_path_get(struct xkb_rule_names na
 E_API void              e_comp_wl_input_keymap_set(const char *rules, const char *model, const char *layout, const char *variant, const char *options, struct xkb_context *dflt_ctx, struct xkb_keymap *dflt_map);
 E_API int               e_comp_wl_input_keymap_keyname_to_keycode(const char * name);
 E_API char             *e_comp_wl_input_keymap_keycode_to_keyname(int keycode);
+E_API void              e_comp_wl_input_keymap_default_set(void);
 
 E_API void      e_comp_wl_input_keyboard_repeat_set(int delay, int rate);
 E_API Eina_Bool e_comp_wl_input_pointer_constraint_activated_get(void);