[gtk+/wip/wayland-tablet: 10/23] wayland: Do not store the grab cursor separately

[Carlos Garnacho <carlosg src gnome org>]

commit a6ffd790d848f03402f9a0238c0f867d8c738d8c
Author: Carlos Garnacho <carlosg gnome org>
Date:   Fri Jun 19 14:02:42 2015 +0200

    wayland: Do not store the grab cursor separately
    
    After the grab is finished, we would expect an enter event, and
    GDK updating internally the cursor for that window and device.
    This means there is no need at all to store it separately in the
    backend.
    
    As a side effect, animated cursors are now also possible on grab
    icons.

 gdk/wayland/gdkdevice-wayland.c |   22 +++-------------------
 1 files changed, 3 insertions(+), 19 deletions(-)
---
diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c
index 9ef8968..15cae7f 100644
--- a/gdk/wayland/gdkdevice-wayland.c
+++ b/gdk/wayland/gdkdevice-wayland.c
@@ -87,7 +87,6 @@ struct _GdkWaylandDeviceData
   guint32 repeat_count;
   GSettings *keyboard_settings;
 
-  GdkCursor *grab_cursor;
   guint cursor_timeout_id;
   guint cursor_image_index;
 
@@ -189,12 +188,7 @@ gdk_wayland_device_update_window_cursor (GdkWaylandDeviceData *wd)
   int x, y, w, h, scale;
   guint next_image_index, next_image_delay;
 
-  if (wd->grab_cursor)
-    {
-      buffer = _gdk_wayland_cursor_get_buffer (wd->grab_cursor, 0,
-                                               &x, &y, &w, &h, &scale);
-    }
-  else if (wd->cursor)
+  if (wd->cursor)
     {
       buffer = _gdk_wayland_cursor_get_buffer (wd->cursor, wd->cursor_image_index,
                                                &x, &y, &w, &h, &scale);
@@ -220,13 +214,6 @@ gdk_wayland_device_update_window_cursor (GdkWaylandDeviceData *wd)
       wl_surface_commit (wd->pointer_surface);
     }
 
-  if (wd->grab_cursor)
-    {
-      /* We admit only static icons during drags so far */
-      gdk_wayland_device_stop_window_cursor_animation (wd);
-      return TRUE;
-    }
-
   next_image_index =
     _gdk_wayland_cursor_get_next_image_index (wd->cursor,
                                               wd->cursor_image_index,
@@ -394,10 +381,10 @@ gdk_wayland_device_grab (GdkDevice    *device,
                                               wayland_device->wl_seat,
                                               time_);
 
-      g_clear_object (&wayland_device->grab_cursor);
+      g_clear_object (&wayland_device->cursor);
 
       if (cursor)
-        wayland_device->grab_cursor = g_object_ref (cursor);
+        wayland_device->cursor = g_object_ref (cursor);
 
       gdk_wayland_device_update_window_cursor (wayland_device);
     }
@@ -427,7 +414,6 @@ gdk_wayland_device_ungrab (GdkDevice *device,
       if (grab)
         grab->serial_end = grab->serial_start;
 
-      g_clear_object (&wayland_device->grab_cursor);
       gdk_wayland_device_update_window_cursor (wayland_device);
 
       if (wayland_device->pointer_grab_window)
@@ -1794,8 +1780,6 @@ pointer_surface_update_scale (GdkWaylandDeviceData *device)
 
   device->current_output_scale = scale;
 
-  if (device->grab_cursor)
-    _gdk_wayland_cursor_set_scale (device->grab_cursor, scale);
   if (device->cursor)
     _gdk_wayland_cursor_set_scale (device->cursor, scale);