Apply e_comp_wl_input's interface

Change-Id: I8fb2ced262d588749c5ea1ab82451a71713d4968

diff --git a/src/e_mod_keyrouter_events.c b/src/e_mod_keyrouter_events.c
index 7167910019be98196c4cf6a8ff52d9f294819893..d8fc5beb722c30ac3403ea479e4268913bf212e7 100644 (file)
--- a/src/e_mod_keyrouter_events.c
+++ b/src/e_mod_keyrouter_events.c
@@ -746,46 +746,6 @@ _e_keyrouter_keycode_get_from_keysym(struct xkb_keymap *keymap, xkb_keysym_t key
    return found_keycodes.keycode;
 }
 
-int
-e_keyrouter_util_keycode_get_from_string(char * name)
-{
-   struct xkb_keymap *keymap = NULL;
-   xkb_keysym_t keysym = 0x0;
-   int keycode = 0;
-
-   keymap = e_comp_wl->xkb.keymap;
-   EINA_SAFETY_ON_NULL_GOTO(keymap, finish);
-
-   keysym = xkb_keysym_from_name(name, XKB_KEYSYM_NO_FLAGS);
-   EINA_SAFETY_ON_FALSE_GOTO(keysym != XKB_KEY_NoSymbol, finish);
-
-   keycode = _e_keyrouter_keycode_get_from_keysym(keymap, keysym);
-
-   KLDBG("request name: %s, return value: %d", name, keycode);
-
-   return keycode;
-
-finish:
-   return 0;
-}
-
-char *
-e_keyrouter_util_keyname_get_from_keycode(int keycode)
-{
-   struct xkb_state *state;
-   xkb_keysym_t sym = XKB_KEY_NoSymbol;
-   char name[256] = {0, };
-
-   EINA_SAFETY_ON_NULL_RETURN_VAL(e_comp_wl, NULL);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(e_comp_wl->xkb.state, NULL);
-
-   state = e_comp_wl->xkb.state;
-   sym = xkb_state_key_get_one_sym(state, keycode);
-   xkb_keysym_get_name(sym, name, sizeof(name));
-
-   return strdup(name);
-}
-
 char *
 e_keyrouter_util_process_name_get_from_cmd(char *cmd)
 {

diff --git a/src/e_mod_main_wl.c b/src/e_mod_main_wl.c
index 2efe3b5ccaab9d5b9ba1127c5aac9efac62824da..5f5d3121a08f278866b33efb236d6b5113b19dd5 100644 (file)
--- a/src/e_mod_main_wl.c
+++ b/src/e_mod_main_wl.c
@@ -896,7 +896,7 @@ _e_keyrouter_info_print(void *data, const char *log_path)
      {
         if (!krt->HardKeys[i].keycode) continue;
 
-        keyname = e_keyrouter_util_keyname_get_from_keycode(i);
+        keyname = e_comp_wl_input_keymap_keycode_to_keyname(i);
 
         fprintf(log_fl, "         Key [%3d], Keyname: %s\n", i, keyname);
 
@@ -916,7 +916,7 @@ _e_keyrouter_info_print(void *data, const char *log_path)
         c = 0;
         EINA_LIST_FOREACH(rdata->keys, ll, idata)
           {
-             keyname = e_keyrouter_util_keyname_get_from_keycode(*idata);
+             keyname = e_comp_wl_input_keymap_keycode_to_keyname(*idata);
              if (c == 0)
                fprintf(log_fl, "            registered key: Key [%3d], Keyname: %s\n", *idata, keyname);
              else
@@ -988,7 +988,7 @@ _e_keyrouter_keygrab_print(void *data, const char *log_path)
             !krt->HardKeys[i].registered_ptr)
           continue;
 
-        keyname = e_keyrouter_util_keyname_get_from_keycode(i);
+        keyname = e_comp_wl_input_keymap_keycode_to_keyname(i);
 
         fprintf(log_fl, "        [ Keycode: %d, Keyname: %s ]\n", i, keyname);
 
@@ -1350,7 +1350,7 @@ _e_keyrouter_query_tizen_key_table(void)
           {
              if (krt->HardKeys[data->keycode].repeat == EINA_FALSE)
                {
-                  res = xkb_keymap_key_set_repeats(e_comp_wl->xkb.keymap, data->keycode, 0);
+                  res = xkb_keymap_key_set_repeats(e_comp_wl_input_xkb_keymap_get(), data->keycode, 0);
                   if (!res)
                     {
                        KLWRN("Failed to set repeat key(%d), value(%d)", data->keycode, 0);
@@ -1364,7 +1364,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));
 
-        e_comp_wl_input_keymap_set(NULL, NULL, NULL, NULL, NULL, xkb_context_ref(e_comp_wl->xkb.context), xkb_keymap_ref(e_comp_wl->xkb.keymap));
+        e_comp_wl_input_keymap_default_set();
      }
    else
      KLINF("Currently cache file is exist. Do not change it.");

diff --git a/src/e_mod_main_wl.h b/src/e_mod_main_wl.h
index 2172a7f672a7cedd1acce1fa8fb8a24852db55f5..7f9b99befd46da9c6e86c27988afeb08d42013ee 100644 (file)
--- a/src/e_mod_main_wl.h
+++ b/src/e_mod_main_wl.h
@@ -158,8 +158,6 @@ Eina_Bool IsInvisibleGetWindow(struct wl_resource *surface);
 struct wl_resource *e_keyrouter_util_get_surface_from_eclient(E_Client *client);
 int e_keyrouter_util_get_pid(struct wl_client *client, struct wl_resource *surface);
 char *e_keyrouter_util_cmd_get_from_pid(int pid);
-int e_keyrouter_util_keycode_get_from_string(char *name);
-char *e_keyrouter_util_keyname_get_from_keycode(int keycode);
 char *e_keyrouter_util_process_name_get_from_cmd(char *cmd);
 const char *e_keyrouter_mode_to_string(uint32_t mode);