hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-26 06:35:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix segfaults on exit in examples/mutli-pointer

Browse source
This commit is contained in:
emersion 2017-10-31 15:02:41 +01:00
parent 7dc716a2bb
commit 6b6895168b
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
examples/multi-pointer.c
View file

@ -155,17 +155,21 @@ static void handle_input_add(struct compositor_state *state,
wl_list_insert(&sample->cursors, &cursor->link); wl_list_insert(&sample->cursors, &cursor->link);
} }
static void cursor_destroy(struct sample_cursor *cursor) {
wl_list_remove(&cursor->link);
wl_list_remove(&cursor->cursor_motion.link);
wl_list_remove(&cursor->cursor_motion_absolute.link);
wlr_cursor_destroy(cursor->cursor);
free(cursor);
}
static void handle_input_remove(struct compositor_state *state, static void handle_input_remove(struct compositor_state *state,
struct wlr_input_device *device) { struct wlr_input_device *device) {
struct sample_state *sample = state->data; struct sample_state *sample = state->data;
struct sample_cursor *cursor; struct sample_cursor *cursor;
wl_list_for_each(cursor, &sample->cursors, link) { wl_list_for_each(cursor, &sample->cursors, link) {
if (cursor->device == device) { if (cursor->device == device) {
wl_list_remove(&cursor->link); cursor_destroy(cursor);
wl_list_remove(&cursor->cursor_motion.link);
wl_list_remove(&cursor->cursor_motion_absolute.link);
wlr_cursor_destroy(cursor->cursor);
free(cursor);
break; break;
} }
} }
@ -212,9 +216,9 @@ int main(int argc, char *argv[]) {
wl_display_run(compositor.display); wl_display_run(compositor.display);
compositor_fini(&compositor); compositor_fini(&compositor);
struct sample_cursor *cursor; struct sample_cursor *cursor, *tmp_cursor;
wl_list_for_each(cursor, &state.cursors, link) { wl_list_for_each_safe(cursor, tmp_cursor, &state.cursors, link) {
// TODO cursor_destroy(cursor);
} }
wlr_xcursor_theme_destroy(theme); wlr_xcursor_theme_destroy(theme);