misc cursor: Adjust a few cursor names.

Author: mtwebster

src/backends/meta-cursor-sprite-xcursor.c

@@ -111,15 +111,15 @@ meta_cursor_get_name (MetaCursor cursor)
     case META_CURSOR_ROW_RESIZE:
       return "v_double_arrow";
     case META_CURSOR_ALL_SCROLL:
-      return "left_ptr";
+      return "all-scroll";
     case META_CURSOR_ZOOM_IN:
       return "left_ptr";
     case META_CURSOR_ZOOM_OUT:
       return "left_ptr";
     case META_CURSOR_DND_ASK:
       return "dnd-copy";
     case META_CURSOR_ALL_RESIZE:
-      return "dnd-move";
+      return "fleur";
     case META_CURSOR_INVALID:
     case META_CURSOR_NONE:
       break;
@@ -197,15 +197,15 @@ meta_cursor_get_legacy_name (MetaCursor cursor)
     case META_CURSOR_ROW_RESIZE:
       return "v_double_arrow";
     case META_CURSOR_ALL_SCROLL:
-      return "left_ptr";
+      return "all-scroll";
     case META_CURSOR_ZOOM_IN:
       return "left_ptr";
     case META_CURSOR_ZOOM_OUT:
       return "left_ptr";
     case META_CURSOR_DND_ASK:
       return "dnd-copy";
     case META_CURSOR_ALL_RESIZE:
-      return "dnd-move";
+      return "fleur";
     case META_CURSOR_INVALID:
     case META_CURSOR_NONE:
       break;

src/backends/meta-cursor-tracker.c

@@ -219,11 +219,19 @@ set_window_cursor (MetaCursorTracker *tracker,
                    gboolean           has_cursor,
                    MetaCursorSprite  *cursor_sprite)
 {
-  g_clear_object (&tracker->window_cursor);
+  g_autoptr (MetaCursorSprite) old_cursor = g_steal_pointer (&tracker->window_cursor);
+
   if (cursor_sprite)
     tracker->window_cursor = g_object_ref (cursor_sprite);
   tracker->has_window_cursor = has_cursor;
   sync_cursor (tracker);
+
+  /* old_cursor is released here, after sync_cursor has realized the new
+   * cursor sprite's GBM bo. This ensures the old GBM bo (and its DRM
+   * handle) stays alive while the new bo is allocated, preventing the
+   * kernel from recycling the same DRM handle and skipping the cursor
+   * plane update.
+   */
 }
 
 gboolean

src/core/display.c

@@ -1672,7 +1672,7 @@ meta_cursor_for_grab_op (MetaGrabOp op)
     case META_GRAB_OP_MOVING:
     case META_GRAB_OP_KEYBOARD_MOVING:
     case META_GRAB_OP_KEYBOARD_RESIZING_UNKNOWN:
-      return META_CURSOR_MOVE;
+      return META_CURSOR_ALL_RESIZE;
       break;
     default:
       break;

src/core/frame.c

@@ -28,6 +28,7 @@
 #include "backends/x11/meta-backend-x11.h"
 #include "core/bell.h"
 #include "core/keybindings-private.h"
+#include "meta/display.h"
 #include "meta/meta-x11-errors.h"
 #include "x11/meta-x11-display-private.h"
 
@@ -423,6 +424,9 @@ meta_frame_set_screen_cursor (MetaFrame	*frame,
       XFlush (x11_display->xdisplay);
       XFreeCursor (x11_display->xdisplay, xcursor);
     }
+
+  if (meta_is_wayland_compositor ())
+    meta_display_set_cursor (frame->window->display, cursor);
 }
 
 Window