diff options
Diffstat (limited to 'sway')
| -rw-r--r-- | sway/commands/input.c | 1 | ||||
| -rw-r--r-- | sway/commands/input/map_to_region.c | 56 | ||||
| -rw-r--r-- | sway/config/input.c | 8 | ||||
| -rw-r--r-- | sway/input/seat.c | 29 | ||||
| -rw-r--r-- | sway/meson.build | 1 | ||||
| -rw-r--r-- | sway/sway-input.5.scd | 2 |
6 files changed, 95 insertions, 2 deletions
diff --git a/sway/commands/input.c b/sway/commands/input.c index 2289ede5..a11ad79a 100644 --- a/sway/commands/input.c +++ b/sway/commands/input.c @@ -18,6 +18,7 @@ static struct cmd_handler input_handlers[] = { { "left_handed", input_cmd_left_handed }, { "map_from_region", input_cmd_map_from_region }, { "map_to_output", input_cmd_map_to_output }, + { "map_to_region", input_cmd_map_to_region }, { "middle_emulation", input_cmd_middle_emulation }, { "natural_scroll", input_cmd_natural_scroll }, { "pointer_accel", input_cmd_pointer_accel }, diff --git a/sway/commands/input/map_to_region.c b/sway/commands/input/map_to_region.c new file mode 100644 index 00000000..e0b69ed5 --- /dev/null +++ b/sway/commands/input/map_to_region.c @@ -0,0 +1,56 @@ +#define _POSIX_C_SOURCE 200809L +#include <stdlib.h> +#include <string.h> +#include <wlr/types/wlr_box.h> +#include "sway/commands.h" +#include "sway/config.h" + +struct cmd_results *input_cmd_map_to_region(int argc, char **argv) { + struct cmd_results *error = NULL; + if ((error = checkarg(argc, "map_to_region", EXPECTED_EQUAL_TO, 4))) { + return error; + } + struct input_config *ic = config->handler_context.input_config; + if (!ic) { + return cmd_results_new(CMD_FAILURE, "No input device defined"); + } + + // This is used to clear the current output mapping. + ic->mapped_to_output = strdup(""); + + ic->mapped_to_region = calloc(1, sizeof(struct wlr_box)); + + const char *errstr; + char *end; + + ic->mapped_to_region->x = strtol(argv[0], &end, 10); + if (end[0] != '\0') { + errstr = "Invalid X coordinate"; + goto error; + } + + ic->mapped_to_region->y = strtol(argv[1], &end, 10); + if (end[0] != '\0') { + errstr = "Invalid Y coordinate"; + goto error; + } + + ic->mapped_to_region->width = strtol(argv[2], &end, 10); + if (end[0] != '\0' || ic->mapped_to_region->width < 1) { + errstr = "Invalid width"; + goto error; + } + + ic->mapped_to_region->height = strtol(argv[3], &end, 10); + if (end[0] != '\0' || ic->mapped_to_region->height < 1) { + errstr = "Invalid height"; + goto error; + } + + return cmd_results_new(CMD_SUCCESS, NULL); + +error: + free(ic->mapped_to_region); + ic->mapped_to_region = NULL; + return cmd_results_new(CMD_FAILURE, errstr); +} diff --git a/sway/config/input.c b/sway/config/input.c index ad4a64ee..294ed08f 100644 --- a/sway/config/input.c +++ b/sway/config/input.c @@ -138,6 +138,13 @@ void merge_input_config(struct input_config *dst, struct input_config *src) { free(dst->mapped_to_output); dst->mapped_to_output = strdup(src->mapped_to_output); } + if (src->mapped_to_region) { + free(dst->mapped_to_region); + dst->mapped_to_region = + malloc(sizeof(struct wlr_box)); + memcpy(dst->mapped_to_region, src->mapped_to_region, + sizeof(struct wlr_box)); + } if (src->calibration_matrix.configured) { dst->calibration_matrix.configured = src->calibration_matrix.configured; memcpy(dst->calibration_matrix.matrix, src->calibration_matrix.matrix, @@ -323,6 +330,7 @@ void free_input_config(struct input_config *ic) { free(ic->xkb_variant); free(ic->mapped_from_region); free(ic->mapped_to_output); + free(ic->mapped_to_region); free(ic); } diff --git a/sway/input/seat.c b/sway/input/seat.c index dc21ce61..5fc23a19 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c @@ -576,6 +576,7 @@ static void seat_reset_input_config(struct sway_seat *seat, static void seat_apply_input_config(struct sway_seat *seat, struct sway_seat_device *sway_device) { const char *mapped_to_output = NULL; + struct wlr_box *mapped_to_region = NULL; struct input_config *ic = input_device_get_config( sway_device->input_device); @@ -583,12 +584,31 @@ static void seat_apply_input_config(struct sway_seat *seat, sway_log(SWAY_DEBUG, "Applying input config to %s", sway_device->input_device->identifier); + // We use an empty string as a marker to clear the mapped_to_output + // property, because a NULL set in a handler_context isn't preserved. + if (ic->mapped_to_output != NULL && ic->mapped_to_output[0] == '\0') { + free(ic->mapped_to_output); + ic->mapped_to_output = NULL; + wlr_cursor_map_input_to_output(seat->cursor->cursor, + sway_device->input_device->wlr_device, NULL); + } + mapped_to_output = ic->mapped_to_output; + if (mapped_to_output != NULL) { + // Output has just been set, clear region setting. + free(ic->mapped_to_region); + ic->mapped_to_region = NULL; + wlr_cursor_map_input_to_region(seat->cursor->cursor, + sway_device->input_device->wlr_device, NULL); + } + + mapped_to_region = ic->mapped_to_region; } - if (mapped_to_output == NULL) { + if (mapped_to_output == NULL && mapped_to_region == NULL) { mapped_to_output = sway_device->input_device->wlr_device->output_name; } + if (mapped_to_output != NULL) { sway_log(SWAY_DEBUG, "Mapping input device %s to output %s", sway_device->input_device->identifier, mapped_to_output); @@ -604,6 +624,13 @@ static void seat_apply_input_config(struct sway_seat *seat, sway_device->input_device->wlr_device, output->wlr_output); sway_log(SWAY_DEBUG, "Mapped to output %s", output->wlr_output->name); } + } else if (mapped_to_region != NULL) { + sway_log(SWAY_DEBUG, "Mapping input device %s to %d,%d %dx%d", + sway_device->input_device->identifier, + mapped_to_region->x, mapped_to_region->y, + mapped_to_region->width, mapped_to_region->height); + wlr_cursor_map_input_to_region(seat->cursor->cursor, + sway_device->input_device->wlr_device, mapped_to_region); } } diff --git a/sway/meson.build b/sway/meson.build index 24628100..8fcf841c 100644 --- a/sway/meson.build +++ b/sway/meson.build @@ -150,6 +150,7 @@ sway_sources = files( 'commands/input/left_handed.c', 'commands/input/map_from_region.c', 'commands/input/map_to_output.c', + 'commands/input/map_to_region.c', 'commands/input/middle_emulation.c', 'commands/input/natural_scroll.c', 'commands/input/pointer_accel.c', diff --git a/sway/sway-input.5.scd b/sway/sway-input.5.scd index 2ee95c0b..d0bf648b 100644 --- a/sway/sway-input.5.scd +++ b/sway/sway-input.5.scd @@ -88,7 +88,7 @@ The following commands may only be used in the configuration file. Maps inputs from this device to the specified output. Only meaningful if the device is a pointer, touch, or drawing tablet device. -*input* <identifier> map_to_region <WxH@X,Y> +*input* <identifier> map_to_region <X> <Y> <width> <height> Maps inputs from this device to the specified region of the global output layout. Only meaningful if the device is a pointer, touch, or drawing tablet device. |