From be3a0ad065a946c8dfe753368757f3d5744059e6 Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Fri, 11 Aug 2017 22:46:50 +0200 Subject: libinput backend: fill in handle_device_removed And fix input_remove_notify accordingly --- examples/shared.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'examples/shared.c') diff --git a/examples/shared.c b/examples/shared.c index 6efa1bef..0605dd72 100644 --- a/examples/shared.c +++ b/examples/shared.c @@ -384,14 +384,13 @@ static void tablet_pad_remove(struct wlr_input_device *device, struct compositor if (!pstate) { return; } - // TODO probably missing more actions + wl_list_remove(&pstate->button.link); free(pstate); } -// TODO missing something that calls this on teardown static void input_remove_notify(struct wl_listener *listener, void *data) { struct wlr_input_device *device = data; - struct compositor_state *state = wl_container_of(listener, state, input_add); + struct compositor_state *state = wl_container_of(listener, state, input_remove); switch (device->type) { case WLR_INPUT_DEVICE_KEYBOARD: keyboard_remove(device, state); -- cgit v1.2.3 From de86965174a5ccb6c204c52d6e57812c1fa64a24 Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Sat, 12 Aug 2017 00:02:04 +0200 Subject: Use libinput_event_destroy/xkb_*_unref Also sneak in a missing drmModeFreePlaneResources --- backend/drm/drm.c | 1 + backend/libinput/backend.c | 1 + examples/shared.c | 2 ++ 3 files changed, 4 insertions(+) (limited to 'examples/shared.c') diff --git a/backend/drm/drm.c b/backend/drm/drm.c index 8062a478..04822040 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -104,6 +104,7 @@ static bool init_planes(struct wlr_backend_state *drm) { drm->primary_planes = drm->overlay_planes + drm->num_overlay_planes; drm->cursor_planes = drm->primary_planes + drm->num_primary_planes; + drmModeFreePlaneResources(plane_res); return true; error_planes: diff --git a/backend/libinput/backend.c b/backend/libinput/backend.c index 58bd62f2..42c1eac9 100644 --- a/backend/libinput/backend.c +++ b/backend/libinput/backend.c @@ -33,6 +33,7 @@ static int wlr_libinput_readable(int fd, uint32_t mask, void *_state) { struct libinput_event *event; while ((event = libinput_get_event(state->libinput))) { wlr_libinput_event(state, event); + libinput_event_destroy(event); } return 0; } diff --git a/examples/shared.c b/examples/shared.c index 0605dd72..0738a548 100644 --- a/examples/shared.c +++ b/examples/shared.c @@ -311,6 +311,8 @@ static void keyboard_remove(struct wlr_input_device *device, struct compositor_s if (!kbstate) { return; } + xkb_state_unref(kbstate->xkb_state); + xkb_map_unref(kbstate->keymap); wl_list_remove(&kbstate->link); wl_list_remove(&kbstate->key.link); free(kbstate); -- cgit v1.2.3