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

Merge remote-tracking branch 'upstream/master' into output-damage

Browse source
This commit is contained in:
emersion 2018-02-03 00:15:44 +01:00
commit 3d3ea32137
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
9 changed files with 144 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
types/wlr_output.c
View file

@ -873,6 +873,7 @@ struct wlr_output_cursor *wlr_output_cursor_create(struct wlr_output *output) {
return NULL;
}
cursor->output = output;
wl_signal_init(&cursor->events.destroy);
wl_list_init(&cursor->surface_commit.link);
cursor->surface_commit.notify = output_cursor_handle_commit;
wl_list_init(&cursor->surface_destroy.link);
@ -886,6 +887,7 @@ void wlr_output_cursor_destroy(struct wlr_output_cursor *cursor) {
return;
}
output_cursor_reset(cursor);
wl_signal_emit(&cursor->events.destroy, cursor);
if (cursor->output->hardware_cursor == cursor) {
// If this cursor was the hardware cursor, disable it
if (cursor->output->impl->set_cursor) {