mirror of
https://github.com/hyprwm/wlroots-hyprland.git
synced 2024-12-23 10:29:49 +01:00
Fix libinput destroy for devices with multiple capabilities
This commit is contained in:
parent
ce65a0c138
commit
c42674bc25
2 changed files with 6 additions and 11 deletions
|
@ -81,15 +81,15 @@ static void wlr_libinput_backend_destroy(struct wlr_backend_state *state) {
|
||||||
if (!state) {
|
if (!state) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (size_t i = 0; i < state->devices->length; i++) {
|
for (size_t i = 0; i < state->devices->length; i++) {
|
||||||
struct wlr_input_device *wlr_device = state->devices->items[i];
|
list_t *wlr_devices = state->devices->items[i];
|
||||||
|
for (size_t j = 0; j < wlr_devices->length; j++) {
|
||||||
wlr_input_device_destroy(wlr_device);
|
wlr_input_device_destroy(wlr_devices->items[j]);
|
||||||
|
}
|
||||||
|
list_free(wlr_devices);
|
||||||
}
|
}
|
||||||
list_free(state->devices);
|
list_free(state->devices);
|
||||||
libinput_unref(state->libinput);
|
libinput_unref(state->libinput);
|
||||||
|
|
||||||
free(state);
|
free(state);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -24,11 +24,6 @@ struct wlr_input_device *get_appropriate_device(
|
||||||
}
|
}
|
||||||
|
|
||||||
static void wlr_libinput_device_destroy(struct wlr_input_device_state *state) {
|
static void wlr_libinput_device_destroy(struct wlr_input_device_state *state) {
|
||||||
list_t *devices = libinput_device_get_user_data(state->handle);
|
|
||||||
// devices themselves are freed in wlr_libinput_backend_destroy
|
|
||||||
// this list only has a part of the same elements so just free list
|
|
||||||
list_free(devices);
|
|
||||||
|
|
||||||
libinput_device_unref(state->handle);
|
libinput_device_unref(state->handle);
|
||||||
free(state);
|
free(state);
|
||||||
}
|
}
|
||||||
|
@ -51,7 +46,6 @@ static struct wlr_input_device *allocate_device(
|
||||||
type, &input_device_impl, devstate,
|
type, &input_device_impl, devstate,
|
||||||
name, vendor, product);
|
name, vendor, product);
|
||||||
list_add(devices, wlr_device);
|
list_add(devices, wlr_device);
|
||||||
list_add(state->devices, wlr_device);
|
|
||||||
return wlr_device;
|
return wlr_device;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -109,6 +103,7 @@ static void handle_device_added(struct wlr_backend_state *state,
|
||||||
|
|
||||||
if (devices->length > 0) {
|
if (devices->length > 0) {
|
||||||
libinput_device_set_user_data(device, devices);
|
libinput_device_set_user_data(device, devices);
|
||||||
|
list_add(state->devices, devices);
|
||||||
} else {
|
} else {
|
||||||
list_free(devices);
|
list_free(devices);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue