alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

input device destroy

Browse source
This commit is contained in:
Tony Crisci 2018-02-14 14:42:06 -05:00
parent b28602aa74
commit 06c71f115b
2 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/sway/input/input-manager.h
View file

@ -16,6 +16,7 @@ struct sway_input_device {
struct wlr_input_device *wlr_device; struct wlr_input_device *wlr_device;
struct input_config *config; struct input_config *config;
struct wl_list link; struct wl_list link;
struct wl_listener device_destroy;
}; };
struct sway_input_manager { struct sway_input_manager {

61
sway/input/input-manager.c
View file

@ -160,7 +160,32 @@ static void sway_input_manager_libinput_config_pointer(struct sway_input_device
} }
} }
static void input_add_notify(struct wl_listener *listener, void *data) { static void handle_device_destroy(struct wl_listener *listener, void *data) {
struct wlr_input_device *device = data;
struct sway_input_device *input_device =
input_sway_device_from_wlr(input_manager, device);
if (!sway_assert(input_device, "could not find sway device")) {
return;
}
wlr_log(L_DEBUG, "removing device: '%s'",
input_device->identifier);
struct sway_seat *seat = NULL;
wl_list_for_each(seat, &input_manager->seats, link) {
sway_seat_remove_device(seat, input_device);
}
wl_list_remove(&input_device->link);
wl_list_remove(&input_device->device_destroy.link);
free_input_config(input_device->config);
free(input_device->identifier);
free(input_device);
}
static void handle_new_input(struct wl_listener *listener, void *data) {
struct sway_input_manager *input = struct sway_input_manager *input =
wl_container_of(listener, input, input_add); wl_container_of(listener, input, input_add);
struct wlr_input_device *device = data; struct wlr_input_device *device = data;
@ -226,32 +251,9 @@ static void input_add_notify(struct wl_listener *listener, void *data) {
"device '%s' is not configured on any seats", "device '%s' is not configured on any seats",
input_device->identifier); input_device->identifier);
} }
}
static void input_remove_notify(struct wl_listener *listener, void *data) { wl_signal_add(&device->events.destroy, &input_device->device_destroy);
struct sway_input_manager *input = input_device->device_destroy.notify = handle_device_destroy;
wl_container_of(listener, input, input_remove);
struct wlr_input_device *device = data;
struct sway_input_device *input_device =
input_sway_device_from_wlr(input, device);
if (!sway_assert(input_device, "could not find sway device")) {
return;
}
wlr_log(L_DEBUG, "removing device: '%s'",
input_device->identifier);
struct sway_seat *seat = NULL;
wl_list_for_each(seat, &input->seats, link) {
sway_seat_remove_device(seat, input_device);
}
wl_list_remove(&input_device->link);
free_input_config(input_device->config);
free(input_device->identifier);
free(input_device);
} }
struct sway_input_manager *sway_input_manager_create( struct sway_input_manager *sway_input_manager_create(
@ -269,11 +271,8 @@ struct sway_input_manager *sway_input_manager_create(
// create the default seat // create the default seat
input_manager_get_seat(input, default_seat); input_manager_get_seat(input, default_seat);
input->input_add.notify = input_add_notify; input->input_add.notify = handle_new_input;
wl_signal_add(&server->backend->events.input_add, &input->input_add); wl_signal_add(&server->backend->events.new_input, &input->input_add);
input->input_remove.notify = input_remove_notify;
wl_signal_add(&server->backend->events.input_remove, &input->input_remove);
return input; return input;
} }