[PATCH 5/7] winewayland.drv: Present cursors at their native pixel sizes.

[Alexandros Frantzis]

From: Alexandros Frantzis

Take into account the preferred scale factor and use wp_viewport to
instruct the compositor to present cursors at their native pixel
sizes. This effectively disables compositor side scaling for cursors.
---
 dlls/winewayland.drv/wayland_pointer.c | 56 ++++++++++++++++++++++++--
 dlls/winewayland.drv/wayland_surface.c |  1 +
 dlls/winewayland.drv/waylanddrv.h      |  2 +
 3 files changed, 55 insertions(+), 4 deletions(-)

diff --git a/dlls/winewayland.drv/wayland_pointer.c b/dlls/winewayland.drv/wayland_pointer.c
index 6a976c2ea31..4679d124499 100644
--- a/dlls/winewayland.drv/wayland_pointer.c
+++ b/dlls/winewayland.drv/wayland_pointer.c
@@ -413,7 +413,7 @@ static BOOL get_icon_info(HICON handle, ICONINFOEXW *ret)
     return TRUE;
 }

-static void wayland_pointer_update_cursor_buffer(HCURSOR hcursor)
+static void wayland_pointer_update_cursor_buffer(HCURSOR hcursor, double scale)
 {
     struct wayland_cursor *cursor = &process_wayland.pointer.cursor;
     ICONINFOEXW info = {0};
@@ -465,6 +465,9 @@ static void wayland_pointer_update_cursor_buffer(HCURSOR hcursor)
         cursor->hotspot_y = cursor->shm_buffer->height / 2;
     }

+    cursor->hotspot_x = round(cursor->hotspot_x / scale);
+    cursor->hotspot_y = round(cursor->hotspot_y / scale);
+
     return;

clear_cursor:
@@ -475,7 +478,7 @@ clear_cursor:
     }
 }

-static void wayland_pointer_update_cursor_surface(void)
+static void wayland_pointer_update_cursor_surface(double scale)
 {
     struct wayland_cursor *cursor = &process_wayland.pointer.cursor;

@@ -492,12 +495,32 @@ static void wayland_pointer_update_cursor_surface(void)
         }
     }

+    if (!cursor->wp_viewport && process_wayland.wp_viewporter)
+    {
+        cursor->wp_viewport =
+            wp_viewporter_get_viewport(process_wayland.wp_viewporter,
+                                       cursor->wl_surface);
+        if (!cursor->wp_viewport)
+            WARN("Failed to create wp_viewport for cursor\n");
+    }
+
     /* Commit the cursor buffer to the cursor surface. */
     wl_surface_attach(cursor->wl_surface,
                       cursor->shm_buffer->wl_buffer, 0, 0);
     wl_surface_damage_buffer(cursor->wl_surface, 0, 0,
                              cursor->shm_buffer->width,
                              cursor->shm_buffer->height);
+    /* Setting only the viewport is enough, but some compositors don't
+     * support wp_viewport for cursor surfaces, so also set the buffer
+     * scale. Note that setting the viewport destination overrides
+     * the buffer scale, so it's fine to set both. */
+    wl_surface_set_buffer_scale(cursor->wl_surface, round(scale));
+    if (cursor->wp_viewport)
+    {
+        wp_viewport_set_destination(cursor->wp_viewport,
+                                    round(cursor->shm_buffer->width / scale),
+                                    round(cursor->shm_buffer->height / scale));
+    }
     wl_surface_commit(cursor->wl_surface);

return;
@@ -508,6 +531,11 @@ clear_cursor:
         wayland_shm_buffer_unref(cursor->shm_buffer);
         cursor->shm_buffer = NULL;
     }
+    if (cursor->wp_viewport)
+    {
+        wp_viewport_destroy(cursor->wp_viewport);
+        cursor->wp_viewport = NULL;
+    }
     if (cursor->wl_surface)
     {
         wl_surface_destroy(cursor->wl_surface);
@@ -518,12 +546,24 @@ clear_cursor:
 static void wayland_set_cursor(HWND hwnd, HCURSOR hcursor, BOOL use_hcursor)
 {
     struct wayland_pointer *pointer = &process_wayland.pointer;
+    struct wayland_surface *surface;
+    double scale;
+
+    if ((surface = wayland_surface_lock_hwnd(hwnd)))
+    {
+        scale = surface->preferred_scale;
+        pthread_mutex_unlock(&surface->mutex);
+    }
+    else
+    {
+        scale = 1.0;
+    }

pthread_mutex_lock(&pointer->mutex);
     if (pointer->focused_hwnd == hwnd)
     {
-        if (use_hcursor) wayland_pointer_update_cursor_buffer(hcursor);
-        wayland_pointer_update_cursor_surface();
+        if (use_hcursor) wayland_pointer_update_cursor_buffer(hcursor, scale);
+        wayland_pointer_update_cursor_surface(scale);
         wl_pointer_set_cursor(pointer->wl_pointer,
                               pointer->enter_serial,
                               pointer->cursor.wl_surface,
@@ -543,3 +583,11 @@ void WAYLAND_SetCursor(HWND hwnd, HCURSOR hcursor)

wayland_set_cursor(hwnd, hcursor, TRUE);
 }
+
+/***********************************************************************
+ *           wayland_reapply_cursor
+ */
+void wayland_reapply_cursor(HWND hwnd)
+{
+    wayland_set_cursor(hwnd, NULL, FALSE);
+}
diff --git a/dlls/winewayland.drv/wayland_surface.c b/dlls/winewayland.drv/wayland_surface.c
index 72c60959a1b..354a7990245 100644
--- a/dlls/winewayland.drv/wayland_surface.c
+++ b/dlls/winewayland.drv/wayland_surface.c
@@ -146,6 +146,7 @@ static void wp_fractional_scale_v1_handle_preferred_scale(

/* Force a redraw so the new scale is applied. */
     NtUserRedrawWindow(hwnd, NULL, NULL, RDW_INVALIDATE | RDW_FRAME);
+    wayland_reapply_cursor(hwnd);
 }

static const struct wp_fractional_scale_v1_listener wp_fractional_scale_v1_listener =
diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h
index 0340fb85685..284d42ef8eb 100644
--- a/dlls/winewayland.drv/waylanddrv.h
+++ b/dlls/winewayland.drv/waylanddrv.h
@@ -71,6 +71,7 @@ struct wayland_cursor
 {
     struct wayland_shm_buffer *shm_buffer;
     struct wl_surface *wl_surface;
+    struct wp_viewport *wp_viewport;
     int hotspot_x, hotspot_y;
 };

@@ -240,6 +241,7 @@ void wayland_window_flush(HWND hwnd) DECLSPEC_HIDDEN;

void wayland_pointer_init(struct wl_pointer *wl_pointer) DECLSPEC_HIDDEN;
 void wayland_pointer_deinit(void) DECLSPEC_HIDDEN;
+void wayland_reapply_cursor(HWND hwnd) DECLSPEC_HIDDEN;

/**********************************************************************
  *          Helpers