summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosef Gajdusek <atx@atx.name>2019-10-20 16:06:35 +0200
committerSimon Ser <contact@emersion.fr>2019-12-31 16:04:50 +0100
commitf501a60c14375132fae64d0a04d1a5523811ac5d (patch)
tree81f7fcfb43c64c3d5c3ab4cd027226886ab4ac80
parent2b5e75032b09922b0cc06eb0454e6beace8908d7 (diff)
Add virtual pointer protocol
-rw-r--r--include/sway/input/input-manager.h3
-rw-r--r--sway/input/input-manager.c38
2 files changed, 41 insertions, 0 deletions
diff --git a/include/sway/input/input-manager.h b/include/sway/input/input-manager.h
index 8d4a5b005..a5392c6b9 100644
--- a/include/sway/input/input-manager.h
+++ b/include/sway/input/input-manager.h
@@ -3,6 +3,7 @@
#include <libinput.h>
#include <wlr/types/wlr_input_inhibitor.h>
#include <wlr/types/wlr_virtual_keyboard_v1.h>
+#include <wlr/types/wlr_virtual_pointer_v1.h>
#include "sway/server.h"
#include "sway/config.h"
#include "list.h"
@@ -20,11 +21,13 @@ struct sway_input_manager {
struct wlr_input_inhibit_manager *inhibit;
struct wlr_virtual_keyboard_manager_v1 *virtual_keyboard;
+ struct wlr_virtual_pointer_manager_v1 *virtual_pointer;
struct wl_listener new_input;
struct wl_listener inhibit_activate;
struct wl_listener inhibit_deactivate;
struct wl_listener virtual_keyboard_new;
+ struct wl_listener virtual_pointer_new;
};
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 3d7f9e8be..a7b66b868 100644
--- a/sway/input/input-manager.c
+++ b/sway/input/input-manager.c
@@ -6,6 +6,7 @@
#include <wlr/backend/libinput.h>
#include <wlr/types/wlr_input_inhibitor.h>
#include <wlr/types/wlr_virtual_keyboard_v1.h>
+#include <wlr/types/wlr_virtual_pointer_v1.h>
#include "sway/config.h"
#include "sway/input/input-manager.h"
#include "sway/input/libinput.h"
@@ -310,6 +311,36 @@ void handle_virtual_keyboard(struct wl_listener *listener, void *data) {
seat_add_device(seat, input_device);
}
+void handle_virtual_pointer(struct wl_listener *listener, void *data) {
+ struct sway_input_manager *input_manager =
+ wl_container_of(listener, input_manager, virtual_pointer_new);
+ struct wlr_virtual_pointer_v1_new_pointer_event *event = data;
+ struct wlr_virtual_pointer_v1 *pointer = event->new_pointer;
+ struct wlr_input_device *device = &pointer->input_device;
+
+ /* TODO: Consider suggested seat when creating the pointer */
+ struct sway_seat *seat = input_manager_get_default_seat();
+
+ struct sway_input_device *input_device =
+ calloc(1, sizeof(struct sway_input_device));
+ if (!sway_assert(input_device, "could not allocate input device")) {
+ return;
+ }
+ device->data = input_device;
+
+ input_device->wlr_device = device;
+ input_device->identifier = input_device_get_identifier(device);
+ wl_list_insert(&input_manager->devices, &input_device->link);
+
+ sway_log(SWAY_DEBUG, "adding virtual pointer: '%s'",
+ input_device->identifier);
+
+ wl_signal_add(&device->events.destroy, &input_device->device_destroy);
+ input_device->device_destroy.notify = handle_device_destroy;
+
+ seat_add_device(seat, input_device);
+}
+
struct sway_input_manager *input_manager_create(struct sway_server *server) {
struct sway_input_manager *input =
calloc(1, sizeof(struct sway_input_manager));
@@ -329,6 +360,13 @@ struct sway_input_manager *input_manager_create(struct sway_server *server) {
&input->virtual_keyboard_new);
input->virtual_keyboard_new.notify = handle_virtual_keyboard;
+ input->virtual_pointer = wlr_virtual_pointer_manager_v1_create(
+ server->wl_display
+ );
+ wl_signal_add(&input->virtual_pointer->events.new_virtual_pointer,
+ &input->virtual_pointer_new);
+ input->virtual_pointer_new.notify = handle_virtual_pointer;
+
input->inhibit = wlr_input_inhibit_manager_create(server->wl_display);
input->inhibit_activate.notify = handle_inhibit_activate;
wl_signal_add(&input->inhibit->events.activate,