kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ecore_wl2: Remove ecore_wl2_display_window_find 

Summary:
This is now totally trivial and needs not exist.
Depends on D6522

Reviewers: devilhorns

Reviewed By: devilhorns

Subscribers: cedric, #committers, zmike

Tags: #efl

Differential Revision: https://phab.enlightenment.org/D6523
This commit is contained in:
Derek Foreman 2018-07-06 10:16:36 -04:00 committed by Chris Michael
parent 78f27a3eff
commit 0fe553cf06
5 changed files with 7 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/lib/ecore_wl2/Ecore_Wl2.h
View File

@ -671,19 +671,6 @@ EAPI Ecore_Wl2_Input *ecore_wl2_display_input_find(const Ecore_Wl2_Display *disp
*/ */
EAPI Ecore_Wl2_Input *ecore_wl2_display_input_find_by_name(const Ecore_Wl2_Display *display, const char *name); EAPI Ecore_Wl2_Input *ecore_wl2_display_input_find_by_name(const Ecore_Wl2_Display *display, const char *name);
/**
* Find an Ecore_Wl2_Window based on id
*
* @param display The display to search for the window
* @param id The id of the window to find
*
* @return The Ecore_Wl2_Window if found, or NULL if no such window exists
*
* @ingroup Ecore_Wl2_Display_Group
* @since 1.17
*/
EAPI Ecore_Wl2_Window *ecore_wl2_display_window_find(Ecore_Wl2_Display *display, uintptr_t id);
/** /**
* Retrieves the Wayland Registry used for the current Wayland display. * Retrieves the Wayland Registry used for the current Wayland display.
* *

6
src/lib/ecore_wl2/ecore_wl2_display.c
View File

@ -1083,12 +1083,6 @@ ecore_wl2_display_screen_size_get(Ecore_Wl2_Display *display, int *w, int *h)
if (h) *h = oh; if (h) *h = oh;
} }
EAPI Ecore_Wl2_Window *
ecore_wl2_display_window_find(Ecore_Wl2_Display *display EINA_UNUSED, uintptr_t id)
{
return (Ecore_Wl2_Window *)id;
}
EAPI struct wl_registry * EAPI struct wl_registry *
ecore_wl2_display_registry_get(Ecore_Wl2_Display *display) ecore_wl2_display_registry_get(Ecore_Wl2_Display *display)
{ {

15
src/lib/elementary/efl_selection_manager.c
View File

@ -2964,15 +2964,13 @@ _wl_dropable_find(Efl_Selection_Manager_Data *pd, Ecore_Wl2_Window *win)
{ {
Eina_List *l; Eina_List *l;
Sel_Manager_Dropable *dropable; Sel_Manager_Dropable *dropable;
Ecore_Wl2_Window *window;
if (!pd->drop_list) return NULL; if (!pd->drop_list) return NULL;
window = ecore_wl2_display_window_find(_elm_wl_display, (Ecore_Window)win); if (!win) return NULL;
if (!window) return NULL;
EINA_LIST_FOREACH(pd->drop_list, l, dropable) EINA_LIST_FOREACH(pd->drop_list, l, dropable)
if (_wl_window_get(dropable->obj) == window) if (_wl_window_get(dropable->obj) == win)
return dropable; return dropable;
return NULL; return NULL;
@ -3372,14 +3370,12 @@ _wl_dropable_all_clean(Sel_Manager_Seat_Selection *seat_sel, Ecore_Wl2_Window *w
{ {
Eina_List *l; Eina_List *l;
Sel_Manager_Dropable *dropable; Sel_Manager_Dropable *dropable;
Ecore_Wl2_Window *window;
window = ecore_wl2_display_window_find(_elm_wl_display, (Ecore_Window)win); if (!win) return;
if (!window) return;
EINA_LIST_FOREACH(seat_sel->pd->drop_list, l, dropable) EINA_LIST_FOREACH(seat_sel->pd->drop_list, l, dropable)
{ {
if (_wl_window_get(dropable->obj) == window) if (_wl_window_get(dropable->obj) == win)
{ {
dropable->last.pos.x = 0; dropable->last.pos.x = 0;
dropable->last.pos.y = 0; dropable->last.pos.y = 0;
@ -3718,8 +3714,7 @@ _wl_dnd_drop(void *data, int type EINA_UNUSED, void *event)
} }
} }
win = ecore_wl2_display_window_find(pd->wl_display, (Ecore_Window)ev->win); ecore_wl2_dnd_drag_end(_wl_seat_get(ev->win, NULL, seat_sel->seat));
ecore_wl2_dnd_drag_end(_wl_seat_get(win, NULL, seat_sel->seat));
return ECORE_CALLBACK_PASS_ON; return ECORE_CALLBACK_PASS_ON;
} }

6
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
View File

@ -2508,11 +2508,7 @@ _ecore_evas_wl_common_new_internal(const char *disp_name, Ecore_Window parent, i
else else
ee->can_async_render = 1; ee->can_async_render = 1;
if (parent) if (parent) ee->alpha = ecore_wl2_window_alpha_get((Ecore_Wl2_Window *)parent);
{
p = ecore_wl2_display_window_find(ewd, parent);
ee->alpha = ecore_wl2_window_alpha_get(p);
}
wdata->sync_done = EINA_FALSE; wdata->sync_done = EINA_FALSE;
wdata->parent = p; wdata->parent = p;

3
src/modules/ecore_imf/wayland/wayland_imcontext.c
View File

@ -906,8 +906,7 @@ wayland_im_context_client_window_set(Ecore_IMF_Context *ctx, void *window)
if (window != NULL) if (window != NULL)
{ {
imcontext->window = imcontext->window = window;
ecore_wl2_display_window_find(ewd, (Ecore_Window)window);
} }
} }