aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Andri Yngvason <andri@yngvason.is>2020-01-01 17:14:37 +0000
committerLibravatar Drew DeVault <sir@cmpwn.com>2020-01-08 10:27:20 -0500
commitc35663772ab8b0a80cd7dc1b8d6f4cdbd369df6f (patch)
treee5afa4e10f5bf381ea8db75d408a21bb14b482f5
parentMake all the container dimensions integers (diff)
downloadsway-c35663772ab8b0a80cd7dc1b8d6f4cdbd369df6f.tar.gz
sway-c35663772ab8b0a80cd7dc1b8d6f4cdbd369df6f.tar.zst
sway-c35663772ab8b0a80cd7dc1b8d6f4cdbd369df6f.zip
input: Assign virtual input devices to their selected seats
-rw-r--r--sway/input/input-manager.c23
1 files changed, 19 insertions, 4 deletions
diff --git a/sway/input/input-manager.c b/sway/input/input-manager.c
index a7b66b86..592e6f45 100644
--- a/sway/input/input-manager.c
+++ b/sway/input/input-manager.c
@@ -45,6 +45,18 @@ struct sway_seat *input_manager_get_seat(const char *seat_name, bool create) {
45 return create ? seat_create(seat_name) : NULL; 45 return create ? seat_create(seat_name) : NULL;
46} 46}
47 47
48struct sway_seat *input_manager_sway_seat_from_wlr_seat(struct wlr_seat *wlr_seat) {
49 struct sway_seat *seat = NULL;
50
51 wl_list_for_each(seat, &server.input->seats, link) {
52 if (seat->wlr_seat == wlr_seat) {
53 return seat;
54 }
55 }
56
57 return NULL;
58}
59
48char *input_device_get_identifier(struct wlr_input_device *device) { 60char *input_device_get_identifier(struct wlr_input_device *device) {
49 int vendor = device->vendor; 61 int vendor = device->vendor;
50 int product = device->product; 62 int product = device->product;
@@ -288,9 +300,11 @@ void handle_virtual_keyboard(struct wl_listener *listener, void *data) {
288 struct wlr_virtual_keyboard_v1 *keyboard = data; 300 struct wlr_virtual_keyboard_v1 *keyboard = data;
289 struct wlr_input_device *device = &keyboard->input_device; 301 struct wlr_input_device *device = &keyboard->input_device;
290 302
291 struct sway_seat *seat = input_manager_get_default_seat(); 303 // TODO: Amend protocol to allow NULL seat
304 struct sway_seat *seat = keyboard->seat ?
305 input_manager_sway_seat_from_wlr_seat(keyboard->seat) :
306 input_manager_get_default_seat();
292 307
293 // TODO: The user might want this on a different seat
294 struct sway_input_device *input_device = 308 struct sway_input_device *input_device =
295 calloc(1, sizeof(struct sway_input_device)); 309 calloc(1, sizeof(struct sway_input_device));
296 if (!sway_assert(input_device, "could not allocate input device")) { 310 if (!sway_assert(input_device, "could not allocate input device")) {
@@ -318,8 +332,9 @@ void handle_virtual_pointer(struct wl_listener *listener, void *data) {
318 struct wlr_virtual_pointer_v1 *pointer = event->new_pointer; 332 struct wlr_virtual_pointer_v1 *pointer = event->new_pointer;
319 struct wlr_input_device *device = &pointer->input_device; 333 struct wlr_input_device *device = &pointer->input_device;
320 334
321 /* TODO: Consider suggested seat when creating the pointer */ 335 struct sway_seat *seat = event->suggested_seat ?
322 struct sway_seat *seat = input_manager_get_default_seat(); 336 input_manager_sway_seat_from_wlr_seat(event->suggested_seat) :
337 input_manager_get_default_seat();
323 338
324 struct sway_input_device *input_device = 339 struct sway_input_device *input_device =
325 calloc(1, sizeof(struct sway_input_device)); 340 calloc(1, sizeof(struct sway_input_device));