e_input: move kbd structure to e_comp_input_intern.h

[platform/upstream/enlightenment.git] / src / bin / e_comp_wl_data.c

diff --git a/src/bin/e_comp_wl_data.c b/src/bin/e_comp_wl_data.c
index 4f95263..ec38ac5 100644 (file)
--- a/src/bin/e_comp_wl_data.c
+++ b/src/bin/e_comp_wl_data.c
@@ -3,6 +3,7 @@
 #include "e_comp_canvas_intern.h"
 #include "e_comp_wl_intern.h"
 #include "e_dnd_intern.h"
+#include "e_comp_input_intern.h"
 
 #include <fcntl.h>
 #include <unistd.h>
@@ -602,8 +603,8 @@ _e_comp_wl_data_device_destroy_selection_data_source(struct wl_listener *listene
         return;
      }
 
-   if (e_comp_wl->kbd.enabled)
-     focus = e_comp_wl->kbd.focus;
+   if (e_comp_input_key->kbd.enabled)
+     focus = e_comp_input_key->kbd.focus;
 
    if (focus)
      {
@@ -778,8 +779,8 @@ _e_comp_wl_data_device_selection_set(void *data EINA_UNUSED, E_Comp_Wl_Data_Sour
    e_comp_wl->clipboard.xwl_owner = NULL;
    e_comp_wl->selection.serial = serial;
 
-   if (e_comp_wl->kbd.enabled)
-     focus = e_comp_wl->kbd.focus;
+   if (e_comp_input_key->kbd.enabled)
+     focus = e_comp_input_key->kbd.focus;
 
    //if source is from cbhm_client do not create data offer for cbhm
    if ((cbhm_client) && (source_client != cbhm_client))
@@ -1382,13 +1383,13 @@ e_comp_wl_data_device_keyboard_focus_set(void)
    struct wl_resource *data_device_res, *offer_res = NULL, *focus;
    E_Comp_Wl_Data_Source *source;
 
-   if (!e_comp_wl->kbd.enabled)
+   if (!e_comp_input_key->kbd.enabled)
      {
         ERR("Keyboard not enabled");
         return;
      }
 
-   if (!(focus = e_comp_wl->kbd.focus))
+   if (!(focus = e_comp_input_key->kbd.focus))
      {
         ERR("No focused resource");
         return;
@@ -1603,7 +1604,7 @@ e_comp_wl_data_device_only_set(struct wl_resource *data_device_res, Eina_Bool se
         e_comp_wl->selection.data_only_list =
            eina_list_remove(e_comp_wl->selection.data_only_list, data_device_res);
 
-        focus = e_comp_wl->kbd.focus;
+        focus = e_comp_input_key->kbd.focus;
         if ((!focus) ||
             (wl_resource_get_client(focus) != wl_resource_get_client(data_device_res)))
           {