Apply e_comp_wl_input's interfaces

Change-Id: I05d10e4ace459f757142408e74a68a3d58dd78df

diff --git a/src/e_dispatch_key_event.c b/src/e_dispatch_key_event.c
index 67636dc9cae66047fedba679dc3a970cbd733dd7..a8a893a6ca98160619f57b7f6977860554844918 100644 (file)
--- a/src/e_dispatch_key_event.c
+++ b/src/e_dispatch_key_event.c
@@ -128,7 +128,7 @@ _e_dispatch_key_event(KeyEventInfo kei, Eldbus_Connection *conn, const Eldbus_Me
    ked->info.keyname = _xstrdup(kei.keyname);
    ked->info.multiplicity = kei.multiplicity;
    ked->info.hold_time = kei.hold_time;
-   ked->keycode = _get_keycode_from_string(kei.keyname);
+   ked->keycode = e_comp_wl_input_keymap_keyname_to_keycode(kei.keyname);
    ked->reply = eldbus_message_method_return_new(msg);
    ked->conn = conn;
 

diff --git a/src/e_mod_utils.c b/src/e_mod_utils.c
index ade755b4768e3357ba5295e4f2c4c4d020d4977c..330e07fb6ab6aea43c4214b9e801c237034f4c55 100644 (file)
--- a/src/e_mod_utils.c
+++ b/src/e_mod_utils.c
@@ -89,16 +89,4 @@ _find_keycode(struct xkb_keymap *keymap, xkb_keycode_t key, void *data)
      {
         pair->keycode = key;
      }
-}
-
-int _get_keycode_from_string(const char *key)
-{
-   xkb_keysym_t keysym = xkb_keysym_from_name(key, XKB_KEYSYM_NO_FLAGS);
-   keycode_map_entry pair = {keysym, 0};
-
-   g_mutex_lock(&e_comp_wl->xkb.keymap_mutex);
-   xkb_keymap_key_for_each(e_comp_wl->xkb.keymap, _find_keycode, &pair);
-   g_mutex_unlock(&e_comp_wl->xkb.keymap_mutex);
-
-   return pair.keycode;
-}
+}
\ No newline at end of file

diff --git a/src/e_mod_utils.h b/src/e_mod_utils.h
index 37fb638d4da13ff8cd7ae76091a6d256241a8083..f57740a7a3fe1b87afc954d879163b72791c9e1c 100644 (file)
--- a/src/e_mod_utils.h
+++ b/src/e_mod_utils.h
@@ -8,6 +8,5 @@
 int _get_window_angle(void);
 void _transform_coordinates(int *ax, int *ay);
 Ecore_Device * _get_device(Ecore_Device_Class klass);
-int _get_keycode_from_string(const char *key);
 
 #endif