From 0fc532f8de498964431f054f4cc4b5329189fc81 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Fri, 23 Jun 2023 20:10:44 +0200 Subject: [PATCH] cursor: remove wlr_cursor_set_image() Superseded by wlr_cursor_set_buffer(). --- include/wlr/types/wlr_cursor.h | 11 ----------- types/wlr_cursor.c | 20 -------------------- 2 files changed, 31 deletions(-) diff --git a/include/wlr/types/wlr_cursor.h b/include/wlr/types/wlr_cursor.h index 96059255..004be0f1 100644 --- a/include/wlr/types/wlr_cursor.h +++ b/include/wlr/types/wlr_cursor.h @@ -136,17 +136,6 @@ void wlr_cursor_warp_absolute(struct wlr_cursor *cur, void wlr_cursor_move(struct wlr_cursor *cur, struct wlr_input_device *dev, double delta_x, double delta_y); -/** - * Set the cursor image. stride is given in bytes. If pixels is NULL, hides the - * cursor. - * - * If scale isn't zero, the image is only set on outputs having the provided - * scale. - */ -void wlr_cursor_set_image(struct wlr_cursor *cur, const uint8_t *pixels, - int32_t stride, uint32_t width, uint32_t height, int32_t hotspot_x, - int32_t hotspot_y, float scale); - /** * Set the cursor buffer. * diff --git a/types/wlr_cursor.c b/types/wlr_cursor.c index d5ad634b..0ae94c5b 100644 --- a/types/wlr_cursor.c +++ b/types/wlr_cursor.c @@ -418,26 +418,6 @@ static void cursor_output_cursor_reset_image(struct wlr_cursor_output_cursor *ou output_cursor->xcursor_timer = NULL; } -void wlr_cursor_set_image(struct wlr_cursor *cur, const uint8_t *pixels, - int32_t stride, uint32_t width, uint32_t height, int32_t hotspot_x, - int32_t hotspot_y, float scale) { - if (scale <= 0) { - cursor_reset_image(cur); - } - - struct wlr_cursor_output_cursor *output_cursor; - wl_list_for_each(output_cursor, &cur->state->output_cursors, link) { - float output_scale = output_cursor->output_cursor->output->scale; - if (scale > 0 && output_scale != scale) { - continue; - } - - cursor_output_cursor_reset_image(output_cursor); - wlr_output_cursor_set_image(output_cursor->output_cursor, pixels, - stride, width, height, hotspot_x, hotspot_y); - } -} - static void cursor_update_outputs(struct wlr_cursor *cur); void wlr_cursor_set_buffer(struct wlr_cursor *cur, struct wlr_buffer *buffer,