summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek Foreman <derekf@osg.samsung.com>2018-07-06 10:16:36 -0400
committerChris Michael <cp.michael@samsung.com>2018-07-06 10:16:36 -0400
commit0fe553cf06a328ac589a1494cd24e420b494b985 (patch)
tree68eec4132bd9dd70a9d747e39201e8ec7094c2db
parent78f27a3efff24ba3b935cc9e2620718e51af9304 (diff)
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
-rw-r--r--src/lib/ecore_wl2/Ecore_Wl2.h13
-rw-r--r--src/lib/ecore_wl2/ecore_wl2_display.c6
-rw-r--r--src/lib/elementary/efl_selection_manager.c15
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c6
-rw-r--r--src/modules/ecore_imf/wayland/wayland_imcontext.c3
5 files changed, 7 insertions, 36 deletions
diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h
index 00cf2f79b4..bbc7e1ccac 100644
--- a/src/lib/ecore_wl2/Ecore_Wl2.h
+++ b/src/lib/ecore_wl2/Ecore_Wl2.h
@@ -672,19 +672,6 @@ EAPI Ecore_Wl2_Input *ecore_wl2_display_input_find(const Ecore_Wl2_Display *disp
672EAPI Ecore_Wl2_Input *ecore_wl2_display_input_find_by_name(const Ecore_Wl2_Display *display, const char *name); 672EAPI Ecore_Wl2_Input *ecore_wl2_display_input_find_by_name(const Ecore_Wl2_Display *display, const char *name);
673 673
674/** 674/**
675 * Find an Ecore_Wl2_Window based on id
676 *
677 * @param display The display to search for the window
678 * @param id The id of the window to find
679 *
680 * @return The Ecore_Wl2_Window if found, or NULL if no such window exists
681 *
682 * @ingroup Ecore_Wl2_Display_Group
683 * @since 1.17
684 */
685EAPI Ecore_Wl2_Window *ecore_wl2_display_window_find(Ecore_Wl2_Display *display, uintptr_t id);
686
687/**
688 * Retrieves the Wayland Registry used for the current Wayland display. 675 * Retrieves the Wayland Registry used for the current Wayland display.
689 * 676 *
690 * @param display The display to get the registry of 677 * @param display The display to get the registry of
diff --git a/src/lib/ecore_wl2/ecore_wl2_display.c b/src/lib/ecore_wl2/ecore_wl2_display.c
index e759e11ce1..54af642d8d 100644
--- a/src/lib/ecore_wl2/ecore_wl2_display.c
+++ b/src/lib/ecore_wl2/ecore_wl2_display.c
@@ -1083,12 +1083,6 @@ ecore_wl2_display_screen_size_get(Ecore_Wl2_Display *display, int *w, int *h)
1083 if (h) *h = oh; 1083 if (h) *h = oh;
1084} 1084}
1085 1085
1086EAPI Ecore_Wl2_Window *
1087ecore_wl2_display_window_find(Ecore_Wl2_Display *display EINA_UNUSED, uintptr_t id)
1088{
1089 return (Ecore_Wl2_Window *)id;
1090}
1091
1092EAPI struct wl_registry * 1086EAPI struct wl_registry *
1093ecore_wl2_display_registry_get(Ecore_Wl2_Display *display) 1087ecore_wl2_display_registry_get(Ecore_Wl2_Display *display)
1094{ 1088{
diff --git a/src/lib/elementary/efl_selection_manager.c b/src/lib/elementary/efl_selection_manager.c
index 0bd501e8fa..e59a7559ff 100644
--- a/src/lib/elementary/efl_selection_manager.c
+++ b/src/lib/elementary/efl_selection_manager.c
@@ -2964,15 +2964,13 @@ _wl_dropable_find(Efl_Selection_Manager_Data *pd, Ecore_Wl2_Window *win)
2964{ 2964{
2965 Eina_List *l; 2965 Eina_List *l;
2966 Sel_Manager_Dropable *dropable; 2966 Sel_Manager_Dropable *dropable;
2967 Ecore_Wl2_Window *window;
2968 2967
2969 if (!pd->drop_list) return NULL; 2968 if (!pd->drop_list) return NULL;
2970 2969
2971 window = ecore_wl2_display_window_find(_elm_wl_display, (Ecore_Window)win); 2970 if (!win) return NULL;
2972 if (!window) return NULL;
2973 2971
2974 EINA_LIST_FOREACH(pd->drop_list, l, dropable) 2972 EINA_LIST_FOREACH(pd->drop_list, l, dropable)
2975 if (_wl_window_get(dropable->obj) == window) 2973 if (_wl_window_get(dropable->obj) == win)
2976 return dropable; 2974 return dropable;
2977 2975
2978 return NULL; 2976 return NULL;
@@ -3372,14 +3370,12 @@ _wl_dropable_all_clean(Sel_Manager_Seat_Selection *seat_sel, Ecore_Wl2_Window *w
3372{ 3370{
3373 Eina_List *l; 3371 Eina_List *l;
3374 Sel_Manager_Dropable *dropable; 3372 Sel_Manager_Dropable *dropable;
3375 Ecore_Wl2_Window *window;
3376 3373
3377 window = ecore_wl2_display_window_find(_elm_wl_display, (Ecore_Window)win); 3374 if (!win) return;
3378 if (!window) return;
3379 3375
3380 EINA_LIST_FOREACH(seat_sel->pd->drop_list, l, dropable) 3376 EINA_LIST_FOREACH(seat_sel->pd->drop_list, l, dropable)
3381 { 3377 {
3382 if (_wl_window_get(dropable->obj) == window) 3378 if (_wl_window_get(dropable->obj) == win)
3383 { 3379 {
3384 dropable->last.pos.x = 0; 3380 dropable->last.pos.x = 0;
3385 dropable->last.pos.y = 0; 3381 dropable->last.pos.y = 0;
@@ -3718,8 +3714,7 @@ _wl_dnd_drop(void *data, int type EINA_UNUSED, void *event)
3718 } 3714 }
3719 } 3715 }
3720 3716
3721 win = ecore_wl2_display_window_find(pd->wl_display, (Ecore_Window)ev->win); 3717 ecore_wl2_dnd_drag_end(_wl_seat_get(ev->win, NULL, seat_sel->seat));
3722 ecore_wl2_dnd_drag_end(_wl_seat_get(win, NULL, seat_sel->seat));
3723 return ECORE_CALLBACK_PASS_ON; 3718 return ECORE_CALLBACK_PASS_ON;
3724} 3719}
3725 3720
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index a3c01bf509..15c275c8df 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -2508,11 +2508,7 @@ _ecore_evas_wl_common_new_internal(const char *disp_name, Ecore_Window parent, i
2508 else 2508 else
2509 ee->can_async_render = 1; 2509 ee->can_async_render = 1;
2510 2510
2511 if (parent) 2511 if (parent) ee->alpha = ecore_wl2_window_alpha_get((Ecore_Wl2_Window *)parent);
2512 {
2513 p = ecore_wl2_display_window_find(ewd, parent);
2514 ee->alpha = ecore_wl2_window_alpha_get(p);
2515 }
2516 2512
2517 wdata->sync_done = EINA_FALSE; 2513 wdata->sync_done = EINA_FALSE;
2518 wdata->parent = p; 2514 wdata->parent = p;
diff --git a/src/modules/ecore_imf/wayland/wayland_imcontext.c b/src/modules/ecore_imf/wayland/wayland_imcontext.c
index 8dc905f22d..d7bcfe7994 100644
--- a/src/modules/ecore_imf/wayland/wayland_imcontext.c
+++ b/src/modules/ecore_imf/wayland/wayland_imcontext.c
@@ -906,8 +906,7 @@ wayland_im_context_client_window_set(Ecore_IMF_Context *ctx, void *window)
906 906
907 if (window != NULL) 907 if (window != NULL)
908 { 908 {
909 imcontext->window = 909 imcontext->window = window;
910 ecore_wl2_display_window_find(ewd, (Ecore_Window)window);
911 } 910 }
912} 911}
913 912