e_comp_wl: remove unused kbd structure

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

diff --git a/src/bin/server/e_comp_wl_input.c b/src/bin/server/e_comp_wl_input.c
index f60fa22427e50a3fc45041611efdc9d57cd8a903..91dbe61c2ef0cf0194eb02da8bcc98ddfc2acbbc 100644 (file)
--- a/src/bin/server/e_comp_wl_input.c
+++ b/src/bin/server/e_comp_wl_input.c
@@ -1547,9 +1547,6 @@ e_comp_wl_input_init(void)
    dont_set_e_input_keymap = e_secure_getenv("NO_E_INPUT_KEYMAP_CACHE") ? EINA_TRUE : EINA_FALSE;
    dont_use_xkb_cache = e_secure_getenv("NO_KEYMAP_CACHE") ? EINA_TRUE : EINA_FALSE;
 
-   g_mutex_init(&comp_wl->kbd.resource_mutex);
-   g_mutex_init(&comp_wl->xkb.keymap_mutex);
-
    /* get default keyboard repeat delay from configuration */
    atomic_store(&e_comp_input_key->kbd.repeat_delay, e_config->keyboard.repeat_delay);
    /* check for valid repeat_delay */
@@ -1666,14 +1663,12 @@ e_comp_wl_input_shutdown(void)
      wl_resource_destroy(res);
    e_comp_input_key->kbd.resources = eina_list_free(e_comp_input_key->kbd.resources);
 
-   g_mutex_clear(&comp_wl->kbd.resource_mutex);
-
    /* destroy touch resources */
    EINA_LIST_FREE(comp_wl->touch.resources, res)
      wl_resource_destroy(res);
 
    /* destroy e_comp_input_key->kbd.keys array */
-   wl_array_release(&comp_wl->kbd.keys);
+   wl_array_release(&e_comp_input_key->kbd.keys);
 
    wl_array_release(&e_comp_input_key->kbd.routed_keys);
 
@@ -1711,8 +1706,6 @@ e_comp_wl_input_shutdown(void)
 
    dont_set_e_input_keymap = EINA_FALSE;
    dont_use_xkb_cache = EINA_FALSE;
-
-   g_mutex_clear(&comp_wl->xkb.keymap_mutex);
 }
 
 EINTERN Eina_Bool

diff --git a/src/include/e_comp_wl.h b/src/include/e_comp_wl.h
index 3a6029e71f043a328e2c23b7a2f5a4d184c611ab..3bd565b8436c0a56f12d11ad880bfad5c6051c96 100644 (file)
--- a/src/include/e_comp_wl.h
+++ b/src/include/e_comp_wl.h
@@ -225,26 +225,6 @@ struct _E_Comp_Wl_Data
         struct wl_event_loop *loop;
      } wl;
 
-   struct
-     {
-        Eina_List *resources;
-        Eina_List *focused;
-        Eina_Bool enabled : 1;
-        xkb_mod_index_t mod_shift, mod_caps;
-        xkb_mod_index_t mod_ctrl, mod_alt;
-        xkb_mod_index_t mod_super;
-        xkb_mod_mask_t mod_depressed, mod_latched, mod_locked;
-        xkb_layout_index_t mod_group;
-        struct wl_array keys;
-        struct wl_array routed_keys;
-        struct wl_resource *focus;
-        int mod_changed;
-        atomic_int repeat_delay;
-        atomic_int repeat_rate;
-        unsigned int num_devices;
-        GMutex resource_mutex; /* for resources variable */
-     } kbd;
-
    struct
      {
         Eina_List *resources;