diff options
author | Drew DeVault <sir@cmpwn.com> | 2019-01-08 20:36:56 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-08 20:36:56 -0500 |
commit | da8f24de1d3d5843142be1164919ca6a49155ae9 (patch) | |
tree | 2860bf37ab36ec5e106fbd44c9751d3f5f626ddb | |
parent | Merge pull request #3275 from ianyfan/remove-readline (diff) | |
parent | cursor: allow mapping to all outputs (diff) | |
download | sway-da8f24de1d3d5843142be1164919ca6a49155ae9.tar.gz sway-da8f24de1d3d5843142be1164919ca6a49155ae9.tar.zst sway-da8f24de1d3d5843142be1164919ca6a49155ae9.zip |
Merge pull request #3385 from robertgzr/reset_output_mapping
cursor: allow mapping to all outputs
-rw-r--r-- | sway/input/seat.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c index 52790039..41a3a4df 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c | |||
@@ -428,6 +428,12 @@ static void seat_apply_input_config(struct sway_seat *seat, | |||
428 | if (mapped_to_output != NULL) { | 428 | if (mapped_to_output != NULL) { |
429 | wlr_log(WLR_DEBUG, "Mapping input device %s to output %s", | 429 | wlr_log(WLR_DEBUG, "Mapping input device %s to output %s", |
430 | sway_device->input_device->identifier, mapped_to_output); | 430 | sway_device->input_device->identifier, mapped_to_output); |
431 | if (strcmp("*", mapped_to_output) == 0) { | ||
432 | wlr_cursor_map_input_to_output(seat->cursor->cursor, | ||
433 | sway_device->input_device->wlr_device, NULL); | ||
434 | wlr_log(WLR_DEBUG, "Reset output mapping"); | ||
435 | return; | ||
436 | } | ||
431 | struct sway_output *output = output_by_name_or_id(mapped_to_output); | 437 | struct sway_output *output = output_by_name_or_id(mapped_to_output); |
432 | if (output) { | 438 | if (output) { |
433 | wlr_cursor_map_input_to_output(seat->cursor->cursor, | 439 | wlr_cursor_map_input_to_output(seat->cursor->cursor, |