mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-10-31 22:25:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

output/cursor: drop output_cursor_reset()

Browse source 
This function is ill-named: it doesn't reset anything. It probably
contained more logic in the past and got stripped down.
This commit is contained in:
Simon Ser 2025-03-06 11:30:55 +01:00 • committed by Simon Zeni
parent 3505079823
commit 3c76b93272
1 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
types/output/cursor.c
View file

@ -149,12 +149,6 @@ static void output_cursor_damage_whole(struct wlr_output_cursor *cursor) {
pixman_region32_fini(&damage); pixman_region32_fini(&damage);
} }
static void output_cursor_reset(struct wlr_output_cursor *cursor) {
if (cursor->output->hardware_cursor != cursor) {
output_cursor_damage_whole(cursor);
}
}
static void output_cursor_update_visible(struct wlr_output_cursor *cursor) { static void output_cursor_update_visible(struct wlr_output_cursor *cursor) {
struct wlr_box output_box; struct wlr_box output_box;
output_box.x = output_box.y = 0; output_box.x = output_box.y = 0;
@ -382,7 +376,9 @@ bool output_cursor_set_texture(struct wlr_output_cursor *cursor,
struct wlr_drm_syncobj_timeline *wait_timeline, uint64_t wait_point) { struct wlr_drm_syncobj_timeline *wait_timeline, uint64_t wait_point) {
struct wlr_output *output = cursor->output; struct wlr_output *output = cursor->output;
output_cursor_reset(cursor); if (cursor->output->hardware_cursor != cursor) {
output_cursor_damage_whole(cursor);
}
cursor->enabled = texture != NULL; cursor->enabled = texture != NULL;
if (texture != NULL) { if (texture != NULL) {
@ -481,10 +477,11 @@ void wlr_output_cursor_destroy(struct wlr_output_cursor *cursor) {
if (cursor == NULL) { if (cursor == NULL) {
return; return;
} }
output_cursor_reset(cursor);
if (cursor->output->hardware_cursor == cursor) { if (cursor->output->hardware_cursor == cursor) {
// If this cursor was the hardware cursor, disable it // If this cursor was the hardware cursor, disable it
output_disable_hardware_cursor(cursor->output); output_disable_hardware_cursor(cursor->output);
} else {
output_cursor_damage_whole(cursor);
} }
wl_list_remove(&cursor->renderer_destroy.link); wl_list_remove(&cursor->renderer_destroy.link);
if (cursor->own_texture) { if (cursor->own_texture) {