mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-03 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

output: drop wlr_output_cursor.events.destroy

Browse source 
Compositors can just listen to wlr_output.events.destroy instead.
This commit is contained in:
Simon Ser 2022-05-27 18:42:51 +02:00 • committed by Isaac Freund
parent 1ab3e582ac
commit 638c5cda51
2 changed files with 0 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/wlr/types/wlr_output.h
View file

@ -40,10 +40,6 @@ struct wlr_output_cursor {
struct wlr_surface *surface; struct wlr_surface *surface;
struct wl_listener surface_commit; struct wl_listener surface_commit;
struct wl_listener surface_destroy; struct wl_listener surface_destroy;
struct {
struct wl_signal destroy;
} events;
}; };
enum wlr_output_adaptive_sync_status { enum wlr_output_adaptive_sync_status {

2
types/output/cursor.c
View file

@ -566,7 +566,6 @@ struct wlr_output_cursor *wlr_output_cursor_create(struct wlr_output *output) {
return NULL; return NULL;
} }
cursor->output = output; cursor->output = output;
wl_signal_init(&cursor->events.destroy);
wl_list_init(&cursor->surface_commit.link); wl_list_init(&cursor->surface_commit.link);
cursor->surface_commit.notify = output_cursor_handle_commit; cursor->surface_commit.notify = output_cursor_handle_commit;
wl_list_init(&cursor->surface_destroy.link); wl_list_init(&cursor->surface_destroy.link);
@ -581,7 +580,6 @@ void wlr_output_cursor_destroy(struct wlr_output_cursor *cursor) {
return; return;
} }
output_cursor_reset(cursor); output_cursor_reset(cursor);
wlr_signal_emit_safe(&cursor->events.destroy, 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_set_hardware_cursor(cursor->output, NULL, 0, 0); output_set_hardware_cursor(cursor->output, NULL, 0, 0);