From 83defff02888bd8ba10197767e3586150a2eeaf9 Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Fri, 13 Jan 2017 09:52:24 -0500 Subject: [PATCH] ecore-wl2: Use input serial for move and resize functions This is a partial revert of 2bd880c6c7 which changed to use wl_display_get_serial function. When can do that for most things, however things like window move/resize need to use the input serial which started the move/resize. Signed-off-by: Chris Michael --- src/lib/ecore_wl2/ecore_wl2_window.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/lib/ecore_wl2/ecore_wl2_window.c b/src/lib/ecore_wl2/ecore_wl2_window.c index 91c1e6448f..444b5c3f43 100644 --- a/src/lib/ecore_wl2/ecore_wl2_window.c +++ b/src/lib/ecore_wl2/ecore_wl2_window.c @@ -760,13 +760,13 @@ ecore_wl2_window_move(Ecore_Wl2_Window *window, int x EINA_UNUSED, int y EINA_UN if (window->zxdg_toplevel) zxdg_toplevel_v6_move(window->zxdg_toplevel, input->wl.seat, - wl_display_get_serial(window->display->wl.display)); + window->display->serial); else if (window->xdg_surface) xdg_surface_move(window->xdg_surface, input->wl.seat, - wl_display_get_serial(window->display->wl.display)); + window->display->serial); else if (window->wl_shell_surface) wl_shell_surface_move(window->wl_shell_surface, input->wl.seat, - wl_display_get_serial(window->display->wl.display)); + window->display->serial); } EAPI void @@ -786,16 +786,13 @@ ecore_wl2_window_resize(Ecore_Wl2_Window *window, int w EINA_UNUSED, int h EINA_ if (window->zxdg_toplevel) zxdg_toplevel_v6_resize(window->zxdg_toplevel, input->wl.seat, - wl_display_get_serial(window->display->wl.display), - location); + window->display->serial, location); else if (window->xdg_surface) xdg_surface_resize(window->xdg_surface, input->wl.seat, - wl_display_get_serial(window->display->wl.display), - location); + window->display->serial, location); else if (window->wl_shell_surface) wl_shell_surface_resize(window->wl_shell_surface, input->wl.seat, - wl_display_get_serial(window->display->wl.display), - location); + window->display->serial, location); } EAPI void