[EGIT] [core/efl] master 02/06: ecore-wl2: remove ecore_wl2_window_input_get()

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=f4ad162eefa18235d68e9bd4c8cb8b15ba626bb4

commit f4ad162eefa18235d68e9bd4c8cb8b15ba626bb4
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Wed May 17 16:02:53 2017 -0400

    ecore-wl2: remove ecore_wl2_window_input_get()
    
    this function does not make sense within the context of wayland and seats,
    since a surface does not own and is not owned by a seat, nor is there a 1:1
    association between surfaces and seats
---
 src/lib/ecore_wl2/Ecore_Wl2.h         |  4 ----
 src/lib/ecore_wl2/ecore_wl2_input.c   |  1 -
 src/lib/ecore_wl2/ecore_wl2_private.h |  1 -
 src/lib/ecore_wl2/ecore_wl2_window.c  | 23 -----------------------
 4 files changed, 29 deletions(-)

diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h
index f8a1307..a401296 100644
--- a/src/lib/ecore_wl2/Ecore_Wl2.h
+++ b/src/lib/ecore_wl2/Ecore_Wl2.h
@@ -939,10 +939,6 @@ EAPI void ecore_wl2_window_iconified_set(Ecore_Wl2_Window 
*window, Eina_Bool ico
  */
 EAPI void ecore_wl2_window_type_set(Ecore_Wl2_Window *window, 
Ecore_Wl2_Window_Type type);
 
-/* TODO: doxy */
-/** @since 1.17 */
-EAPI Ecore_Wl2_Input *ecore_wl2_window_input_get(Ecore_Wl2_Window *window);
-
 /**
  * @defgroup Ecore_Wl2_Input_Group Wayland Library Input Functions
  * @ingroup Ecore_Wl2_Group
diff --git a/src/lib/ecore_wl2/ecore_wl2_input.c 
b/src/lib/ecore_wl2/ecore_wl2_input.c
index 3b55941..9ef1d82 100644
--- a/src/lib/ecore_wl2/ecore_wl2_input.c
+++ b/src/lib/ecore_wl2/ecore_wl2_input.c
@@ -634,7 +634,6 @@ _pointer_cb_enter(void *data, struct wl_pointer *pointer 
EINA_UNUSED, unsigned i
    window = _ecore_wl2_display_window_surface_find(input->display, surface);
    if (!window) return;
 
-   window->input = input;
    input->focus.prev_pointer = NULL;
    input->focus.pointer = window;
 
diff --git a/src/lib/ecore_wl2/ecore_wl2_private.h 
b/src/lib/ecore_wl2/ecore_wl2_private.h
index 08ec98b..f9aedf1 100644
--- a/src/lib/ecore_wl2/ecore_wl2_private.h
+++ b/src/lib/ecore_wl2/ecore_wl2_private.h
@@ -137,7 +137,6 @@ struct _Ecore_Wl2_Window
    EINA_INLIST;
 
    Ecore_Wl2_Display *display;
-   Ecore_Wl2_Input *input;
 
    Ecore_Wl2_Window *parent;
    Ecore_Wl2_Input *grab;
diff --git a/src/lib/ecore_wl2/ecore_wl2_window.c 
b/src/lib/ecore_wl2/ecore_wl2_window.c
index bda4f69..4e0b6b8 100644
--- a/src/lib/ecore_wl2/ecore_wl2_window.c
+++ b/src/lib/ecore_wl2/ecore_wl2_window.c
@@ -1150,29 +1150,6 @@ ecore_wl2_window_display_get(const Ecore_Wl2_Window 
*window)
    return window->display;
 }
 
-EAPI Ecore_Wl2_Input *
-ecore_wl2_window_input_get(Ecore_Wl2_Window *window)
-{
-   Ecore_Wl2_Input *input;
-
-   EINA_SAFETY_ON_NULL_RETURN_VAL(window, NULL);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(window->display, NULL);
-
-   if (window->input)
-     return window->input;
-   else if ((window->parent) && (window->parent->input))
-     return window->parent->input;
-
-   EINA_INLIST_FOREACH(window->display->inputs, input)
-     {
-        if ((input->wl.pointer) || (input->wl.keyboard) ||
-            (input->wl.touch))
-          return input;
-     }
-
-   return NULL;
-}
-
 EAPI Eina_Bool
 ecore_wl2_window_shell_surface_exists(Ecore_Wl2_Window *window)
 {

--