forked from enlightenment/efl
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
This commit is contained in:
parent
13cf5a1d43
commit
f4ad162eef
|
@ -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);
|
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
|
* @defgroup Ecore_Wl2_Input_Group Wayland Library Input Functions
|
||||||
* @ingroup Ecore_Wl2_Group
|
* @ingroup Ecore_Wl2_Group
|
||||||
|
|
|
@ -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);
|
window = _ecore_wl2_display_window_surface_find(input->display, surface);
|
||||||
if (!window) return;
|
if (!window) return;
|
||||||
|
|
||||||
window->input = input;
|
|
||||||
input->focus.prev_pointer = NULL;
|
input->focus.prev_pointer = NULL;
|
||||||
input->focus.pointer = window;
|
input->focus.pointer = window;
|
||||||
|
|
||||||
|
|
|
@ -137,7 +137,6 @@ struct _Ecore_Wl2_Window
|
||||||
EINA_INLIST;
|
EINA_INLIST;
|
||||||
|
|
||||||
Ecore_Wl2_Display *display;
|
Ecore_Wl2_Display *display;
|
||||||
Ecore_Wl2_Input *input;
|
|
||||||
|
|
||||||
Ecore_Wl2_Window *parent;
|
Ecore_Wl2_Window *parent;
|
||||||
Ecore_Wl2_Input *grab;
|
Ecore_Wl2_Input *grab;
|
||||||
|
|
|
@ -1150,29 +1150,6 @@ ecore_wl2_window_display_get(const Ecore_Wl2_Window *window)
|
||||||
return window->display;
|
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
|
EAPI Eina_Bool
|
||||||
ecore_wl2_window_shell_surface_exists(Ecore_Wl2_Window *window)
|
ecore_wl2_window_shell_surface_exists(Ecore_Wl2_Window *window)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue