Add map_from_region command

2 files changed, 80 insertions, 1 deletions

diff --git a/sway/commands/input/map_from_region.c b/sway/commands/input/map_from_region.c
new file mode 100644
index 00000000..80bb856d
--- /dev/null
+++ b/sway/commands/input/map_from_region.c
@@ -0,0 +1,79 @@
+#define _POSIX_C_SOURCE 200809L
+#include <stdbool.h>
+#include <string.h>
+#include <strings.h>
+#include "log.h"
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/input/input-manager.h"
+
+static bool parse_coords(const char *str, double *x, double *y, bool *mm) {
+        *mm = false;
+
+        char *end;
+        *x = strtod(str, &end);
+        if (end[0] != 'x') {
+                return false;
+        }
+        ++end;
+
+        *y = strtod(end, &end);
+        if (end[0] == 'm') {
+                // Expect mm
+                if (end[1] != 'm') {
+                        return false;
+                }
+                *mm = true;
+                end = &end[2];
+        }
+        if (end[0] != '\0') {
+                return false;
+        }
+
+        return true;
+}
+
+struct cmd_results *input_cmd_map_from_region(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "map_from_region", EXPECTED_EQUAL_TO, 2))) {
+                return error;
+        }
+        struct input_config *current_input_config =
+                config->handler_context.input_config;
+        if (!current_input_config) {
+                return cmd_results_new(CMD_FAILURE, "map_from_region",
+                        "No input device defined");
+        }
+
+        struct input_config *new_config =
+                new_input_config(current_input_config->identifier);
+
+        new_config->mapped_from_region =
+                calloc(1, sizeof(struct input_config_mapped_from_region));
+
+        bool mm1, mm2;
+        if (!parse_coords(argv[0], &new_config->mapped_from_region->x1,
+                        &new_config->mapped_from_region->y1, &mm1)) {
+                return cmd_results_new(CMD_FAILURE, "map_from_region",
+                        "Invalid top-left coordinates");
+        }
+        if (!parse_coords(argv[1], &new_config->mapped_from_region->x2,
+                        &new_config->mapped_from_region->y2, &mm2)) {
+                return cmd_results_new(CMD_FAILURE, "map_from_region",
+                        "Invalid bottom-right coordinates");
+        }
+        if (new_config->mapped_from_region->x1 > new_config->mapped_from_region->x2 ||
+                        new_config->mapped_from_region->y1 > new_config->mapped_from_region->y2) {
+                return cmd_results_new(CMD_FAILURE, "map_from_region",
+                        "Invalid rectangle");
+        }
+        if (mm1 != mm2) {
+                return cmd_results_new(CMD_FAILURE, "map_from_region",
+                        "Both coordinates must be in the same unit");
+        }
+        new_config->mapped_from_region->mm = mm1;
+
+        apply_input_config(new_config);
+
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/input/map_to_output.c b/sway/commands/input/map_to_output.c
index 60e4608e..68439bec 100644
--- a/sway/commands/input/map_to_output.c
+++ b/sway/commands/input/map_to_output.c
@@ -20,7 +20,7 @@ struct cmd_results *input_cmd_map_to_output(int argc, char **argv) {
         struct input_config *new_config =
                 new_input_config(current_input_config->identifier);
 
-        new_config->mapped_output = strdup(argv[0]);
+        new_config->mapped_to_output = strdup(argv[0]);
         apply_input_config(new_config);
 
         return cmd_results_new(CMD_SUCCESS, NULL, NULL);