From 44f7cb1c558e98403d811dbe1f757941848ed32a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 8 Dec 2023 14:09:48 +0400 Subject: [PATCH] wayland: Avoid more legacy cursor names Set the cursor from a standard name instead of relying on the X11 cursor font derived enum values. --- gdk/wayland/gdkcursor-wayland.c | 2 +- gdk/wayland/gdkdevice-wayland.c | 4 ++-- gdk/wayland/gdkprivate-wayland.h | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gdk/wayland/gdkcursor-wayland.c b/gdk/wayland/gdkcursor-wayland.c index 67faa2110e..d6a79baf5f 100644 --- a/gdk/wayland/gdkcursor-wayland.c +++ b/gdk/wayland/gdkcursor-wayland.c @@ -350,7 +350,7 @@ _gdk_wayland_cursor_init (GdkWaylandCursor *cursor) { } -static GdkCursor * +GdkCursor * _gdk_wayland_display_get_cursor_for_name_with_scale (GdkDisplay *display, const gchar *name, guint scale) diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c index 38c2e61efa..824e9aa93c 100644 --- a/gdk/wayland/gdkdevice-wayland.c +++ b/gdk/wayland/gdkdevice-wayland.c @@ -524,8 +524,8 @@ gdk_wayland_device_set_window_cursor (GdkDevice *device, { guint scale = pointer->current_output_scale; cursor = - _gdk_wayland_display_get_cursor_for_type_with_scale (seat->display, - GDK_LEFT_PTR, + _gdk_wayland_display_get_cursor_for_name_with_scale (seat->display, + "default", scale); } else diff --git a/gdk/wayland/gdkprivate-wayland.h b/gdk/wayland/gdkprivate-wayland.h index 5173873381..64aa708b2d 100644 --- a/gdk/wayland/gdkprivate-wayland.h +++ b/gdk/wayland/gdkprivate-wayland.h @@ -70,6 +70,9 @@ GdkCursor *_gdk_wayland_display_get_cursor_for_type_with_scale (GdkDisplay *d guint scale); GdkCursor *_gdk_wayland_display_get_cursor_for_name (GdkDisplay *display, const gchar *name); +GdkCursor *_gdk_wayland_display_get_cursor_for_name_with_scale (GdkDisplay *display, + const gchar *name, + guint scale); GdkCursor *_gdk_wayland_display_get_cursor_for_surface (GdkDisplay *display, cairo_surface_t *surface, gdouble x,