Refactor cmd_output to use config_subcommand

1 files changed, 46 insertions, 0 deletions

diff --git a/sway/commands/output/position.c b/sway/commands/output/position.c
new file mode 100644
index 00000000..c2aeb281
--- /dev/null
+++ b/sway/commands/output/position.c
@@ -0,0 +1,46 @@
+#include <strings.h>
+#include "sway/commands.h"
+#include "sway/config.h"
+
+struct cmd_results *output_cmd_position(int argc, char **argv) {
+        if (!config->handler_context.output_config) {
+                return cmd_results_new(CMD_FAILURE, "output", "Missing output config");
+        }
+        if (!argc) {
+                return cmd_results_new(CMD_INVALID, "output",
+                        "Missing position argument.");
+        }
+
+        char *end;
+        config->handler_context.output_config->x = strtol(*argv, &end, 10);
+        if (*end) {
+                // Format is 1234,4321
+                if (*end != ',') {
+                        return cmd_results_new(CMD_INVALID, "output",
+                                "Invalid position x.");
+                }
+                ++end;
+                config->handler_context.output_config->y = strtol(end, &end, 10);
+                if (*end) {
+                        return cmd_results_new(CMD_INVALID, "output",
+                                "Invalid position y.");
+                }
+        } else {
+                // Format is 1234 4321 (legacy)
+                if (!argc) {
+                        return cmd_results_new(CMD_INVALID, "output",
+                                "Missing position argument (y).");
+                }
+                argc--; argv++;
+                config->handler_context.output_config->y = strtol(*argv, &end, 10);
+                if (*end) {
+                        return cmd_results_new(CMD_INVALID, "output",
+                                "Invalid position y.");
+                }
+        }
+
+        config->handler_context.leftovers.argc = argc - 1;
+        config->handler_context.leftovers.argv = argv + 1;
+        return NULL;
+}
+