diff options
Diffstat (limited to 'backend')
| -rw-r--r-- | backend/drm/drm.c | 1 | ||||
| -rw-r--r-- | backend/libinput/backend.c | 5 | ||||
| -rw-r--r-- | backend/libinput/events.c | 17 | ||||
| -rw-r--r-- | backend/wayland/backend.c | 1 | ||||
| -rw-r--r-- | backend/wayland/output.c | 1 | ||||
| -rw-r--r-- | backend/wayland/wl_seat.c | 4 |
6 files changed, 25 insertions, 4 deletions
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 19fe8fe7..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; } @@ -84,7 +85,9 @@ static void wlr_libinput_backend_destroy(struct wlr_backend_state *state) { for (size_t i = 0; i < state->devices->length; i++) { list_t *wlr_devices = state->devices->items[i]; for (size_t j = 0; j < wlr_devices->length; j++) { - wlr_input_device_destroy(wlr_devices->items[j]); + struct wlr_input_device *wlr_device = wlr_devices->items[j]; + wl_signal_emit(&state->backend->events.input_remove, wlr_device); + wlr_input_device_destroy(wlr_device); } list_free(wlr_devices); } diff --git a/backend/libinput/events.c b/backend/libinput/events.c index 0cdf26ec..9afdab21 100644 --- a/backend/libinput/events.c +++ b/backend/libinput/events.c @@ -111,8 +111,21 @@ static void handle_device_added(struct wlr_backend_state *state, static void handle_device_removed(struct wlr_backend_state *state, struct libinput_device *device) { - wlr_log(L_DEBUG, "libinput device removed"); - // TODO + list_t *devices = libinput_device_get_user_data(device); + for (size_t i = 0; i < devices->length; i++) { + struct wlr_input_device *wlr_device = devices->items[i]; + wlr_log(L_DEBUG, "Removing %s [%d:%d]", wlr_device->name, + wlr_device->vendor, wlr_device->product); + wl_signal_emit(&state->backend->events.input_remove, wlr_device); + wlr_input_device_destroy(wlr_device); + } + for (size_t i = 0; i < state->devices->length; i++) { + if (state->devices->items[i] == devices) { + list_del(state->devices, i); + break; + } + } + list_free(devices); } void wlr_libinput_event(struct wlr_backend_state *state, diff --git a/backend/wayland/backend.c b/backend/wayland/backend.c index 1a156802..ddad1418 100644 --- a/backend/wayland/backend.c +++ b/backend/wayland/backend.c @@ -85,6 +85,7 @@ static void wlr_wl_backend_destroy(struct wlr_backend_state *state) { list_free(state->devices); list_free(state->outputs); + free(state->seatName); wlr_egl_free(&state->egl); if (state->seat) wl_seat_destroy(state->seat); diff --git a/backend/wayland/output.c b/backend/wayland/output.c index 2c7086e2..318f1f05 100644 --- a/backend/wayland/output.c +++ b/backend/wayland/output.c @@ -46,6 +46,7 @@ static void wlr_wl_output_transform(struct wlr_output_state *output, } static void wlr_wl_output_destroy(struct wlr_output_state *output) { + wl_signal_emit(&output->backend->backend->events.output_remove, output->wlr_output); if(output->frame_callback) wl_callback_destroy(output->frame_callback); eglDestroySurface(output->backend->egl.display, output->surface); wl_egl_window_destroy(output->egl_window); diff --git a/backend/wayland/wl_seat.c b/backend/wayland/wl_seat.c index ab3de74d..7fb63cbe 100644 --- a/backend/wayland/wl_seat.c +++ b/backend/wayland/wl_seat.c @@ -169,6 +169,7 @@ static struct wl_keyboard_listener keyboard_listener = { }; static void input_device_destroy(struct wlr_input_device_state *state) { + wl_signal_emit(&state->backend->backend->events.input_remove, state->wlr_device); if (state->resource) wl_proxy_destroy(state->resource); free(state); @@ -206,7 +207,7 @@ static struct wlr_input_device *allocate_device(struct wlr_backend_state *state, free(devstate); return NULL; } - + devstate->wlr_device = wlr_device; list_add(state->devices, wlr_device); return wlr_device; } @@ -257,6 +258,7 @@ static void seat_handle_capabilities(void *data, struct wl_seat *wl_seat, static void seat_handle_name(void *data, struct wl_seat *wl_seat, const char *name) { struct wlr_backend_state *state = data; assert(state->seat == wl_seat); + // Do we need to check if seatName was previously set for name change? state->seatName = strdup(name); } |