diff options
| author | Rob Bradford <rob@linux.intel.com> | 2012-07-11 17:10:40 +0100 |
|---|---|---|
| committer | Rob Bradford <rob@linux.intel.com> | 2012-07-12 15:58:38 +0100 |
| commit | 310fd40357a67784004f99e2a52dff9f85bdd024 (patch) | |
| tree | 14687a1237bcd4789c80d4a782be9b5afe2e99f9 /gdk | |
| parent | 9f039e5b747219eaa1dfc137f7835f2f7a6cbbdf (diff) | |
| download | gtk+-310fd40357a67784004f99e2a52dff9f85bdd024.tar.gz | |
wayland: Protocol update: wl_shell_surface_resize and _move take serials
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/wayland/gdkwindow-wayland.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c index 2544666cf8..f1530ebe15 100644 --- a/gdk/wayland/gdkwindow-wayland.c +++ b/gdk/wayland/gdkwindow-wayland.c @@ -1389,6 +1389,9 @@ gdk_wayland_window_begin_resize_drag (GdkWindow *window, guint32 timestamp) { GdkWindowImplWayland *impl; + GdkWaylandDisplay *wayland_display = + GDK_WAYLAND_DISPLAY (gdk_window_get_display (window)); + uint32_t grab_type; if (GDK_WINDOW_DESTROYED (window) || @@ -1439,7 +1442,8 @@ gdk_wayland_window_begin_resize_drag (GdkWindow *window, wl_shell_surface_resize (impl->shell_surface, _gdk_wayland_device_get_wl_seat (device), - timestamp, grab_type); + _gdk_wayland_display_get_serial (wayland_display), + grab_type); /* This is needed since Wayland will absorb all the pointer events after the * above function - FIXME: Is this always safe..? @@ -1456,6 +1460,8 @@ gdk_wayland_window_begin_move_drag (GdkWindow *window, guint32 timestamp) { GdkWindowImplWayland *impl; + GdkWaylandDisplay *wayland_display = + GDK_WAYLAND_DISPLAY (gdk_window_get_display (window)); if (GDK_WINDOW_DESTROYED (window) || !WINDOW_IS_TOPLEVEL (window)) @@ -1464,7 +1470,8 @@ 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_wl_seat (device), timestamp); + _gdk_wayland_device_get_wl_seat (device), + _gdk_wayland_display_get_serial (wayland_display)); /* This is needed since Wayland will absorb all the pointer events after the * above function - FIXME: Is this always safe..? |