diff options
| author | Simon Zeni <simon@bl4ckb0ne.ca> | 2022-03-08 17:01:54 -0500 |
|---|---|---|
| committer | Kirill Primak <vyivel@eclair.cafe> | 2022-03-17 21:52:59 +0300 |
| commit | 49b3ac9a2ce122daf8b57d37db09f4636feae28b (patch) | |
| tree | 0ccbd3d8467755803aca735d700ba71876103f63 /sway/input | |
| parent | 0345148ea667dbad29ad7b70072708f4733afc0c (diff) | |
sway/input/seat: take output name from specialized input device
Diffstat (limited to 'sway/input')
| -rw-r--r-- | sway/input/seat.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c index 8ab616de..5782478d 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c @@ -11,6 +11,7 @@ #include <wlr/types/wlr_output_layout.h> #include <wlr/types/wlr_primary_selection.h> #include <wlr/types/wlr_tablet_v2.h> +#include <wlr/types/wlr_touch.h> #include <wlr/types/wlr_xcursor_manager.h> #include "config.h" #include "list.h" @@ -725,14 +726,25 @@ static void seat_apply_input_config(struct sway_seat *seat, ic == NULL ? MAPPED_TO_DEFAULT : ic->mapped_to; switch (mapped_to) { - case MAPPED_TO_DEFAULT: + case MAPPED_TO_DEFAULT:; /* * If the wlroots backend provides an output name, use that. * - * Otherwise, try to map built-in touch and tablet tool devices to the + * Otherwise, try to map built-in touch and pointer devices to the * built-in output. */ - mapped_to_output = sway_device->input_device->wlr_device->output_name; + struct wlr_input_device *dev = sway_device->input_device->wlr_device; + switch (dev->type) { + case WLR_INPUT_DEVICE_POINTER: + mapped_to_output = dev->pointer->output_name; + break; + case WLR_INPUT_DEVICE_TOUCH: + mapped_to_output = dev->touch->output_name; + break; + default: + mapped_to_output = NULL; + break; + } if (mapped_to_output == NULL && is_touch_or_tablet_tool(sway_device) && sway_libinput_device_is_builtin(sway_device->input_device)) { mapped_to_output = get_builtin_output_name(); |