Complete a few destroy functions

This adds missing free calls for:
 - drm outputs
 - libinput backend in general
 - final udev free
 - output mode state
master
Dominique Martinet 7 years ago
parent 0663b6d1e1
commit 0354aaeff2

@ -36,6 +36,7 @@ static void wlr_drm_backend_destroy(struct wlr_backend_state *drm) {
wlr_drm_resources_free(drm);
wlr_session_close_file(drm->session, drm->fd);
wl_event_source_remove(drm->drm_event);
list_free(drm->outputs);
free(drm);
}

@ -78,7 +78,19 @@ static bool wlr_libinput_backend_init(struct wlr_backend_state *state) {
}
static void wlr_libinput_backend_destroy(struct wlr_backend_state *state) {
// TODO
if (!state) {
return;
}
for (size_t i = 0; i < state->devices->length; i++) {
struct wlr_input_device *wlr_device = state->devices->items[i];
wlr_input_device_destroy(wlr_device);
}
list_free(state->devices);
libinput_unref(state->libinput);
free(state);
}
static struct wlr_backend_impl backend_impl = {

@ -24,6 +24,11 @@ struct wlr_input_device *get_appropriate_device(
}
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);
free(state);
}

@ -217,6 +217,7 @@ void wlr_udev_destroy(struct wlr_udev *udev) {
wl_event_source_remove(udev->event);
udev_monitor_unref(udev->mon);
udev_unref(udev->udev);
free(udev);
}
bool wlr_udev_signal_add(struct wlr_udev *udev, dev_t dev, struct wl_listener *listener) {

@ -171,10 +171,15 @@ bool wlr_output_move_cursor(struct wlr_output *output, int x, int y) {
}
void wlr_output_destroy(struct wlr_output *output) {
if (!output) return;
if (!output) {
return;
}
output->impl->destroy(output->state);
for (size_t i = 0; output->modes && i < output->modes->length; ++i) {
free(output->modes->items[i]);
struct wlr_output_mode *mode = output->modes->items[i];
free(mode->state);
free(mode);
}
list_free(output->modes);
free(output);

Loading…
Cancel
Save