mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-02-11 04:27:49 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

wayland: don't destroy keyboard/pointer if they haven't been removed

Browse source 
When the seat capabilities change, we used to destroy all pointers and
keyboards, and then re-creating them as necessary.

This caused a crash on mutter - probably because we removed a keyboard
device the compositor had already sent an event for (or was about to).

Now, we only destroy and create devices when it's needed.
This commit is contained in:
Daniel Eklöf 2020-03-03 18:20:53 +01:00
parent e077290c56
commit f0892988c0
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 22 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

36
wayland.c
View file

@ -103,24 +103,32 @@ seat_handle_capabilities(void *data, struct wl_seat *wl_seat,
{
struct wayland *wayl = data;
if (wayl->keyboard != NULL) {
wl_keyboard_release(wayl->keyboard);
wayl->keyboard = NULL;
}
if (wayl->pointer.pointer != NULL) {
wl_pointer_release(wayl->pointer.pointer);
wayl->pointer.pointer = NULL;
}
if (caps & WL_SEAT_CAPABILITY_KEYBOARD) {
wayl->keyboard = wl_seat_get_keyboard(wl_seat);
wl_keyboard_add_listener(wayl->keyboard, &keyboard_listener, wayl);
if (wayl->keyboard == NULL) {
wayl->keyboard = wl_seat_get_keyboard(wl_seat);
LOG_INFO("got KBD %p", wayl->keyboard);
wl_keyboard_add_listener(wayl->keyboard, &keyboard_listener, wayl);
}
} else {
if (wayl->keyboard != NULL) {
LOG_INFO("releasing KBD %p", wayl->keyboard);
wl_keyboard_release(wayl->keyboard);
wayl->keyboard = NULL;
}
}
if (caps & WL_SEAT_CAPABILITY_POINTER) {
wayl->pointer.pointer = wl_seat_get_pointer(wl_seat);
wl_pointer_add_listener(wayl->pointer.pointer, &pointer_listener, wayl);
if (wayl->pointer.pointer == NULL) {
wayl->pointer.pointer = wl_seat_get_pointer(wl_seat);
LOG_INFO("got pointer %p", wayl->pointer.pointer);
wl_pointer_add_listener(wayl->pointer.pointer, &pointer_listener, wayl);
}
} else {
if (wayl->pointer.pointer != NULL) {
LOG_INFO("releasing pointer %p", wayl->pointer.pointer);
wl_pointer_release(wayl->pointer.pointer);
wayl->pointer.pointer = NULL;
}
}
}