summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2017-01-13 09:52:24 -0500
committerChris Michael <cp.michael@samsung.com>2017-01-13 09:53:52 -0500
commit83defff02888bd8ba10197767e3586150a2eeaf9 (patch)
treee3e7b8518310e5e3acd7aef2b264e3a7ecc923b3 /src
parent8146db3b77124a5a86a926b3733435898fe9b8fa (diff)
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 <cp.michael@samsung.com>
Diffstat (limited to 'src')
-rw-r--r--src/lib/ecore_wl2/ecore_wl2_window.c15
1 files 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
760 760
761 if (window->zxdg_toplevel) 761 if (window->zxdg_toplevel)
762 zxdg_toplevel_v6_move(window->zxdg_toplevel, input->wl.seat, 762 zxdg_toplevel_v6_move(window->zxdg_toplevel, input->wl.seat,
763 wl_display_get_serial(window->display->wl.display)); 763 window->display->serial);
764 else if (window->xdg_surface) 764 else if (window->xdg_surface)
765 xdg_surface_move(window->xdg_surface, input->wl.seat, 765 xdg_surface_move(window->xdg_surface, input->wl.seat,
766 wl_display_get_serial(window->display->wl.display)); 766 window->display->serial);
767 else if (window->wl_shell_surface) 767 else if (window->wl_shell_surface)
768 wl_shell_surface_move(window->wl_shell_surface, input->wl.seat, 768 wl_shell_surface_move(window->wl_shell_surface, input->wl.seat,
769 wl_display_get_serial(window->display->wl.display)); 769 window->display->serial);
770} 770}
771 771
772EAPI void 772EAPI void
@@ -786,16 +786,13 @@ ecore_wl2_window_resize(Ecore_Wl2_Window *window, int w EINA_UNUSED, int h EINA_
786 786
787 if (window->zxdg_toplevel) 787 if (window->zxdg_toplevel)
788 zxdg_toplevel_v6_resize(window->zxdg_toplevel, input->wl.seat, 788 zxdg_toplevel_v6_resize(window->zxdg_toplevel, input->wl.seat,
789 wl_display_get_serial(window->display->wl.display), 789 window->display->serial, location);
790 location);
791 else if (window->xdg_surface) 790 else if (window->xdg_surface)
792 xdg_surface_resize(window->xdg_surface, input->wl.seat, 791 xdg_surface_resize(window->xdg_surface, input->wl.seat,
793 wl_display_get_serial(window->display->wl.display), 792 window->display->serial, location);
794 location);
795 else if (window->wl_shell_surface) 793 else if (window->wl_shell_surface)
796 wl_shell_surface_resize(window->wl_shell_surface, input->wl.seat, 794 wl_shell_surface_resize(window->wl_shell_surface, input->wl.seat,
797 wl_display_get_serial(window->display->wl.display), 795 window->display->serial, location);
798 location);
799} 796}
800 797
801EAPI void 798EAPI void