diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-09-28 19:05:38 -0400 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2017-09-28 19:05:38 -0400 |
| commit | 10240af6ea2e3cef474c2e79e9ca220f028cce2d (patch) | |
| tree | a06134da3772d57e9cc7462559afc964ea1263af | |
| parent | efadbf84249e419b52c3f4bca10f8cd5b7f3d942 (diff) | |
Handle input device removal
| -rw-r--r-- | include/rootston/input.h | 2 | ||||
| -rw-r--r-- | rootston/input.c | 4 | ||||
| -rw-r--r-- | rootston/keyboard.c | 9 | ||||
| -rw-r--r-- | rootston/pointer.c | 8 |
4 files changed, 21 insertions, 2 deletions
diff --git a/include/rootston/input.h b/include/rootston/input.h index b3ce84d7..0ace6cd1 100644 --- a/include/rootston/input.h +++ b/include/rootston/input.h @@ -97,7 +97,9 @@ struct roots_input *input_create(struct roots_server *server, void input_destroy(struct roots_input *input); void pointer_add(struct wlr_input_device *device, struct roots_input *input); +void pointer_remove(struct wlr_input_device *device, struct roots_input *input); void keyboard_add(struct wlr_input_device *device, struct roots_input *input); +void keyboard_remove(struct wlr_input_device *device, struct roots_input *input); void cursor_initialize(struct roots_input *input); void cursor_load_config(struct roots_config *config, diff --git a/rootston/input.c b/rootston/input.c index ac8e7396..b4427212 100644 --- a/rootston/input.c +++ b/rootston/input.c @@ -52,10 +52,10 @@ static void input_remove_notify(struct wl_listener *listener, void *data) { struct roots_input *input = wl_container_of(listener, input, input_remove); switch (device->type) { case WLR_INPUT_DEVICE_KEYBOARD: - //keyboard_remove(device, input); + keyboard_remove(device, input); break; case WLR_INPUT_DEVICE_POINTER: - //pointer_remove(device, input); + pointer_remove(device, input); break; case WLR_INPUT_DEVICE_TOUCH: //touch_remove(device, input); diff --git a/rootston/keyboard.c b/rootston/keyboard.c index 57e0d14e..c4c98c91 100644 --- a/rootston/keyboard.c +++ b/rootston/keyboard.c @@ -42,6 +42,7 @@ static void keyboard_key_notify(struct wl_listener *listener, void *data) { void keyboard_add(struct wlr_input_device *device, struct roots_input *input) { struct roots_keyboard *keyboard = calloc(sizeof(struct roots_keyboard), 1); + device->data = keyboard; keyboard->device = device; keyboard->input = input; wl_list_init(&keyboard->key.link); @@ -64,3 +65,11 @@ void keyboard_add(struct wlr_input_device *device, struct roots_input *input) { xkb_context_unref(context); wlr_seat_attach_keyboard(input->wl_seat, device); } + +void keyboard_remove(struct wlr_input_device *device, struct roots_input *input) { + struct roots_keyboard *keyboard = device->data; + wlr_seat_detach_keyboard(input->wl_seat, device->keyboard); + wl_list_remove(&keyboard->key.link); + wl_list_remove(&keyboard->link); + free(keyboard); +} diff --git a/rootston/pointer.c b/rootston/pointer.c index 1693893e..299ecdfc 100644 --- a/rootston/pointer.c +++ b/rootston/pointer.c @@ -6,6 +6,7 @@ void pointer_add(struct wlr_input_device *device, struct roots_input *input) { struct roots_pointer *pointer = calloc(sizeof(struct roots_pointer), 1); + device->data = pointer; pointer->device = device; pointer->input = input; wl_list_insert(&input->pointers, &pointer->link); @@ -13,3 +14,10 @@ void pointer_add(struct wlr_input_device *device, struct roots_input *input) { cursor_load_config(input->server->config, input->cursor, input, input->server->desktop); } + +void pointer_remove(struct wlr_input_device *device, struct roots_input *input) { + struct roots_pointer *pointer = device->data; + wlr_cursor_detach_input_device(input->cursor, device); + wl_list_remove(&pointer->link); + free(pointer); +} |