From eedd1ec92f6c035c00f4deaef748173f0ed36f06 Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Mon, 9 Jan 2012 16:00:14 +0000 Subject: wayland: Make the resize and move functions use gdk_device_ungrab Now that grab and ungrab vfuncs are implemented on GdkDevice then we can use gdk_device_ungrab to break the implicit grab created by the button press that triggered the resize and move. --- gdk/wayland/gdkwindow-wayland.c | 38 +++++++++++++------------------------- 1 file changed, 13 insertions(+), 25 deletions(-) (limited to 'gdk') diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c index dec633842d..5da8b28269 100644 --- a/gdk/wayland/gdkwindow-wayland.c +++ b/gdk/wayland/gdkwindow-wayland.c @@ -1147,9 +1147,6 @@ gdk_wayland_window_begin_resize_drag (GdkWindow *window, { GdkWindowImplWayland *impl; uint32_t grab_type; - GdkDeviceGrabInfo *button_implicit_grab; - gulong serial; - GdkDisplay *display; if (GDK_WINDOW_DESTROYED (window) || !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window)) @@ -1197,28 +1194,14 @@ gdk_wayland_window_begin_resize_drag (GdkWindow *window, impl = GDK_WINDOW_IMPL_WAYLAND (window->impl); - wl_shell_surface_resize(impl->shell_surface, - _gdk_wayland_device_get_device (device), - timestamp, grab_type); + wl_shell_surface_resize (impl->shell_surface, + _gdk_wayland_device_get_device (device), + timestamp, grab_type); - /* We need to break the implicit grab that we created with the button press. - * This is because of the semantics on wl_shell_surface_resize. That will - * absorb all the events until the resize is completed by the compositor. - * This includes the release event that would ordinarily remove the implicit - * grab. + /* This is needed since Wayland will absorb all the pointer events after the + * above function - FIXME: Is this always safe..? */ - display = gdk_window_get_display (window); - serial = _gdk_display_get_next_serial (display); - button_implicit_grab = - _gdk_display_has_device_grab (display, device, serial); - - if (button_implicit_grab && - button_implicit_grab->implicit) - { - button_implicit_grab->serial_end = serial; - button_implicit_grab->implicit_ungrab = FALSE; - _gdk_display_device_grab_update (display, device, device, serial); - } + gdk_device_ungrab (device, timestamp); } static void @@ -1238,8 +1221,13 @@ gdk_wayland_window_begin_move_drag (GdkWindow *window, impl = GDK_WINDOW_IMPL_WAYLAND (window->impl); - wl_shell_surface_move(impl->shell_surface, - _gdk_wayland_device_get_device (device), timestamp); + wl_shell_surface_move (impl->shell_surface, + _gdk_wayland_device_get_device (device), timestamp); + + /* This is needed since Wayland will absorb all the pointer events after the + * above function - FIXME: Is this always safe..? + */ + gdk_device_ungrab (device, timestamp); } static void -- cgit v1.2.1