diff options
-rw-r--r-- | include/sway/input/input-manager.h | 3 | ||||
-rw-r--r-- | sway/input/input-manager.c | 38 |
2 files changed, 41 insertions, 0 deletions
diff --git a/include/sway/input/input-manager.h b/include/sway/input/input-manager.h index 8d4a5b00..a5392c6b 100644 --- a/include/sway/input/input-manager.h +++ b/include/sway/input/input-manager.h | |||
@@ -3,6 +3,7 @@ | |||
3 | #include <libinput.h> | 3 | #include <libinput.h> |
4 | #include <wlr/types/wlr_input_inhibitor.h> | 4 | #include <wlr/types/wlr_input_inhibitor.h> |
5 | #include <wlr/types/wlr_virtual_keyboard_v1.h> | 5 | #include <wlr/types/wlr_virtual_keyboard_v1.h> |
6 | #include <wlr/types/wlr_virtual_pointer_v1.h> | ||
6 | #include "sway/server.h" | 7 | #include "sway/server.h" |
7 | #include "sway/config.h" | 8 | #include "sway/config.h" |
8 | #include "list.h" | 9 | #include "list.h" |
@@ -20,11 +21,13 @@ struct sway_input_manager { | |||
20 | 21 | ||
21 | struct wlr_input_inhibit_manager *inhibit; | 22 | struct wlr_input_inhibit_manager *inhibit; |
22 | struct wlr_virtual_keyboard_manager_v1 *virtual_keyboard; | 23 | struct wlr_virtual_keyboard_manager_v1 *virtual_keyboard; |
24 | struct wlr_virtual_pointer_manager_v1 *virtual_pointer; | ||
23 | 25 | ||
24 | struct wl_listener new_input; | 26 | struct wl_listener new_input; |
25 | struct wl_listener inhibit_activate; | 27 | struct wl_listener inhibit_activate; |
26 | struct wl_listener inhibit_deactivate; | 28 | struct wl_listener inhibit_deactivate; |
27 | struct wl_listener virtual_keyboard_new; | 29 | struct wl_listener virtual_keyboard_new; |
30 | struct wl_listener virtual_pointer_new; | ||
28 | }; | 31 | }; |
29 | 32 | ||
30 | struct sway_input_manager *input_manager_create(struct sway_server *server); | 33 | struct sway_input_manager *input_manager_create(struct sway_server *server); |
diff --git a/sway/input/input-manager.c b/sway/input/input-manager.c index 3d7f9e8b..a7b66b86 100644 --- a/sway/input/input-manager.c +++ b/sway/input/input-manager.c | |||
@@ -6,6 +6,7 @@ | |||
6 | #include <wlr/backend/libinput.h> | 6 | #include <wlr/backend/libinput.h> |
7 | #include <wlr/types/wlr_input_inhibitor.h> | 7 | #include <wlr/types/wlr_input_inhibitor.h> |
8 | #include <wlr/types/wlr_virtual_keyboard_v1.h> | 8 | #include <wlr/types/wlr_virtual_keyboard_v1.h> |
9 | #include <wlr/types/wlr_virtual_pointer_v1.h> | ||
9 | #include "sway/config.h" | 10 | #include "sway/config.h" |
10 | #include "sway/input/input-manager.h" | 11 | #include "sway/input/input-manager.h" |
11 | #include "sway/input/libinput.h" | 12 | #include "sway/input/libinput.h" |
@@ -310,6 +311,36 @@ void handle_virtual_keyboard(struct wl_listener *listener, void *data) { | |||
310 | seat_add_device(seat, input_device); | 311 | seat_add_device(seat, input_device); |
311 | } | 312 | } |
312 | 313 | ||
314 | void handle_virtual_pointer(struct wl_listener *listener, void *data) { | ||
315 | struct sway_input_manager *input_manager = | ||
316 | wl_container_of(listener, input_manager, virtual_pointer_new); | ||
317 | struct wlr_virtual_pointer_v1_new_pointer_event *event = data; | ||
318 | struct wlr_virtual_pointer_v1 *pointer = event->new_pointer; | ||
319 | struct wlr_input_device *device = &pointer->input_device; | ||
320 | |||
321 | /* TODO: Consider suggested seat when creating the pointer */ | ||
322 | struct sway_seat *seat = input_manager_get_default_seat(); | ||
323 | |||
324 | struct sway_input_device *input_device = | ||
325 | calloc(1, sizeof(struct sway_input_device)); | ||
326 | if (!sway_assert(input_device, "could not allocate input device")) { | ||
327 | return; | ||
328 | } | ||
329 | device->data = input_device; | ||
330 | |||
331 | input_device->wlr_device = device; | ||
332 | input_device->identifier = input_device_get_identifier(device); | ||
333 | wl_list_insert(&input_manager->devices, &input_device->link); | ||
334 | |||
335 | sway_log(SWAY_DEBUG, "adding virtual pointer: '%s'", | ||
336 | input_device->identifier); | ||
337 | |||
338 | wl_signal_add(&device->events.destroy, &input_device->device_destroy); | ||
339 | input_device->device_destroy.notify = handle_device_destroy; | ||
340 | |||
341 | seat_add_device(seat, input_device); | ||
342 | } | ||
343 | |||
313 | struct sway_input_manager *input_manager_create(struct sway_server *server) { | 344 | struct sway_input_manager *input_manager_create(struct sway_server *server) { |
314 | struct sway_input_manager *input = | 345 | struct sway_input_manager *input = |
315 | calloc(1, sizeof(struct sway_input_manager)); | 346 | calloc(1, sizeof(struct sway_input_manager)); |
@@ -329,6 +360,13 @@ struct sway_input_manager *input_manager_create(struct sway_server *server) { | |||
329 | &input->virtual_keyboard_new); | 360 | &input->virtual_keyboard_new); |
330 | input->virtual_keyboard_new.notify = handle_virtual_keyboard; | 361 | input->virtual_keyboard_new.notify = handle_virtual_keyboard; |
331 | 362 | ||
363 | input->virtual_pointer = wlr_virtual_pointer_manager_v1_create( | ||
364 | server->wl_display | ||
365 | ); | ||
366 | wl_signal_add(&input->virtual_pointer->events.new_virtual_pointer, | ||
367 | &input->virtual_pointer_new); | ||
368 | input->virtual_pointer_new.notify = handle_virtual_pointer; | ||
369 | |||
332 | input->inhibit = wlr_input_inhibit_manager_create(server->wl_display); | 370 | input->inhibit = wlr_input_inhibit_manager_create(server->wl_display); |
333 | input->inhibit_activate.notify = handle_inhibit_activate; | 371 | input->inhibit_activate.notify = handle_inhibit_activate; |
334 | wl_signal_add(&input->inhibit->events.activate, | 372 | wl_signal_add(&input->inhibit->events.activate, |