eden-emu/SDL
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wayland: Clean up the relative pointer if the seat capability is removed

Browse source 
Also use wl_pointer_release, when available, instead of destroy.
This commit is contained in:
Frank Praznik 2024-12-19 14:33:06 -05:00
parent 7c8171da92
commit 3ce68f80bc
No known key found for this signature in database
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/video/wayland/SDL_waylandevents.c
View file

@ -1980,11 +1980,19 @@ static void seat_handle_capabilities(void *data, struct wl_seat *seat,
input->pointer_id = SDL_GetNextObjectID(); input->pointer_id = SDL_GetNextObjectID();
SDL_AddMouse(input->pointer_id, WAYLAND_DEFAULT_POINTER_NAME, true); SDL_AddMouse(input->pointer_id, WAYLAND_DEFAULT_POINTER_NAME, true);
} else if (!(caps & WL_SEAT_CAPABILITY_POINTER) && input->pointer) { } else if (!(caps & WL_SEAT_CAPABILITY_POINTER) && input->pointer) {
if (input->relative_pointer) {
zwp_relative_pointer_v1_destroy(input->relative_pointer);
input->relative_pointer = NULL;
}
if (input->cursor_shape) { if (input->cursor_shape) {
wp_cursor_shape_device_v1_destroy(input->cursor_shape); wp_cursor_shape_device_v1_destroy(input->cursor_shape);
input->cursor_shape = NULL; input->cursor_shape = NULL;
} }
wl_pointer_destroy(input->pointer); if (wl_pointer_get_version(input->pointer) >= WL_POINTER_RELEASE_SINCE_VERSION) {
wl_pointer_release(input->pointer);
} else {
wl_pointer_destroy(input->pointer);
}
input->pointer = NULL; input->pointer = NULL;
input->display->pointer = NULL; input->display->pointer = NULL;