From d9e2c84c49aba48de48a70295c3fb1e0b9a2be97 Mon Sep 17 00:00:00 2001 From: yuiiio Date: Mon, 17 Nov 2025 17:58:06 +0900 Subject: [PATCH] cursor_move defer when enable ADAPTIVE_SYNC split out from https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4340 Co-authored-by: Daniel Hill --- include/wlr/types/wlr_output.h | 4 ++++ types/output/cursor.c | 32 +++++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h index 3cf8778a5..8ad741a3d 100644 --- a/include/wlr/types/wlr_output.h +++ b/include/wlr/types/wlr_output.h @@ -51,6 +51,9 @@ struct wlr_output_cursor { uint64_t wait_point; struct wl_list link; + bool deferred; + double deferred_x, deferred_y; + struct { struct wl_listener renderer_destroy; } WLR_PRIVATE; @@ -459,6 +462,7 @@ bool wlr_output_cursor_set_buffer(struct wlr_output_cursor *cursor, struct wlr_buffer *buffer, int32_t hotspot_x, int32_t hotspot_y); bool wlr_output_cursor_move(struct wlr_output_cursor *cursor, double x, double y); +void wlr_output_cursor_move_all_deferred(struct wlr_output *output); void wlr_output_cursor_destroy(struct wlr_output_cursor *cursor); /** diff --git a/types/output/cursor.c b/types/output/cursor.c index a24f4abd1..290168557 100644 --- a/types/output/cursor.c +++ b/types/output/cursor.c @@ -440,8 +440,10 @@ bool output_cursor_set_texture(struct wlr_output_cursor *cursor, return true; } -bool wlr_output_cursor_move(struct wlr_output_cursor *cursor, +static bool output_cursor_move(struct wlr_output_cursor *cursor, double x, double y) { + cursor->deferred = false; + // Scale coordinates for the output x *= cursor->output->scale; y *= cursor->output->scale; @@ -472,6 +474,34 @@ bool wlr_output_cursor_move(struct wlr_output_cursor *cursor, return output_move_hardware_cursor(cursor->output, (int)x, (int)y); } +bool wlr_output_cursor_move(struct wlr_output_cursor *cursor, + double x, double y) { + // Scale coordinates for the output + x *= cursor->output->scale; + y *= cursor->output->scale; + + if (cursor->x == x && cursor->y == y) { + return true; + } + + if (cursor->output->adaptive_sync_status == WLR_OUTPUT_ADAPTIVE_SYNC_ENABLED) { + cursor->deferred_x = x; + cursor->deferred_y = y; + cursor->deferred = true; + return true; + } + + return output_cursor_move(cursor, x, y); +} + +void wlr_output_cursor_move_all_deferred(struct wlr_output *output) { + struct wlr_output_cursor *cursor; + wl_list_for_each(cursor, &output->cursors, link) { + if (cursor->deferred) + output_cursor_move(cursor, cursor->deferred_x, cursor->deferred_y); + } +} + struct wlr_output_cursor *wlr_output_cursor_create(struct wlr_output *output) { struct wlr_output_cursor *cursor = calloc(1, sizeof(*cursor)); if (cursor == NULL) {