blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #599 from emersion/output-cursor-destroy-signal 

output: add destroy signal for wlr_output_cursor
This commit is contained in:
emersion 2018-02-01 15:04:54 +01:00 committed by GitHub
parent 429f06d3f1 8eed857292
commit 42ec696b82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,6 +29,10 @@ 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;
}; };
struct wlr_output_impl; struct wlr_output_impl;

2
types/wlr_output.c
View File

@ -694,6 +694,7 @@ 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);
@ -707,6 +708,7 @@ void wlr_output_cursor_destroy(struct wlr_output_cursor *cursor) {
return; return;
} }
output_cursor_reset(cursor); output_cursor_reset(cursor);
wl_signal_emit(&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
if (cursor->output->impl->set_cursor) { if (cursor->output->impl->set_cursor) {