Merge pull request #2087 from RedSoxFan/output-subcommand

Refactor cmd_output to use config_subcommand

1 files changed, 55 insertions, 0 deletions

diff --git a/sway/commands/output/mode.c b/sway/commands/output/mode.c
new file mode 100644
index 00000000..daec6d44
--- /dev/null
+++ b/sway/commands/output/mode.c
@@ -0,0 +1,55 @@
+#include <strings.h>
+#include "sway/commands.h"
+#include "sway/config.h"
+
+struct cmd_results *output_cmd_mode(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 mode argument.");
+	}
+
+	struct output_config *output = config->handler_context.output_config;
+
+	char *end;
+	output->width = strtol(*argv, &end, 10);
+	if (*end) {
+		// Format is 1234x4321
+		if (*end != 'x') {
+			return cmd_results_new(CMD_INVALID, "output",
+				"Invalid mode width.");
+		}
+		++end;
+		output->height = strtol(end, &end, 10);
+		if (*end) {
+			if (*end != '@') {
+				return cmd_results_new(CMD_INVALID, "output",
+					"Invalid mode height.");
+			}
+			++end;
+			output->refresh_rate = strtof(end, &end);
+			if (strcasecmp("Hz", end) != 0) {
+				return cmd_results_new(CMD_INVALID, "output",
+					"Invalid mode refresh rate.");
+			}
+		}
+	} else {
+		// Format is 1234 4321
+		if (!argc) {
+			return cmd_results_new(CMD_INVALID, "output",
+				"Missing mode argument (height).");
+		}
+		argc--; argv++;
+		output->height = strtol(*argv, &end, 10);
+		if (*end) {
+			return cmd_results_new(CMD_INVALID, "output",
+				"Invalid mode height.");
+		}
+	}
+
+	config->handler_context.leftovers.argc = argc - 1;
+	config->handler_context.leftovers.argv = argv + 1;
+	return NULL;
+}
+