2 files changed, 59 insertions, 0 deletions
diff --git a/sway/commands/output.c b/sway/commands/output.c
index 4418f23f..d8ef2885 100644
--- a/sway/commands/output.c
+++ b/sway/commands/output.c
@@ -15,6 +15,7 @@ static const struct cmd_handler output_handlers[] = {
 	{ "enable", output_cmd_enable },
 	{ "max_render_time", output_cmd_max_render_time },
 	{ "mode", output_cmd_mode },
+	{ "modeline", output_cmd_modeline },
 	{ "pos", output_cmd_position },
 	{ "position", output_cmd_position },
 	{ "res", output_cmd_mode },
diff --git a/sway/commands/output/mode.c b/sway/commands/output/mode.c
index 5b710713..019d625a 100644
--- a/sway/commands/output/mode.c
+++ b/sway/commands/output/mode.c
@@ -20,6 +20,9 @@ struct cmd_results *output_cmd_mode(int argc, char **argv) {
 		output->custom_mode = 0;
 	}
 
+	// Reset custom modeline, if any
+	output->drm_mode.type = 0;
+
 	char *end;
 	output->width = strtol(*argv, &end, 10);
 	if (*end) {
@@ -58,3 +61,58 @@ struct cmd_results *output_cmd_mode(int argc, char **argv) {
 	return NULL;
 }
 
+static bool parse_modeline(char **argv, drmModeModeInfo *mode) {
+	mode->type = DRM_MODE_TYPE_USERDEF;
+	mode->clock = strtof(argv[0], NULL) * 1000;
+	mode->hdisplay = strtol(argv[1], NULL, 10);
+	mode->hsync_start = strtol(argv[2], NULL, 10);
+	mode->hsync_end = strtol(argv[3], NULL, 10);
+	mode->htotal = strtol(argv[4], NULL, 10);
+	mode->vdisplay = strtol(argv[5], NULL, 10);
+	mode->vsync_start = strtol(argv[6], NULL, 10);
+	mode->vsync_end = strtol(argv[7], NULL, 10);
+	mode->vtotal = strtol(argv[8], NULL, 10);
+
+	mode->vrefresh = mode->clock * 1000.0 * 1000.0
+		/ mode->htotal / mode->vtotal;
+	if (strcasecmp(argv[9], "+hsync") == 0) {
+		mode->flags |= DRM_MODE_FLAG_PHSYNC;
+	} else if (strcasecmp(argv[9], "-hsync") == 0) {
+		mode->flags |= DRM_MODE_FLAG_NHSYNC;
+	} else {
+		return false;
+	}
+
+	if (strcasecmp(argv[10], "+vsync") == 0) {
+		mode->flags |= DRM_MODE_FLAG_PVSYNC;
+	} else if (strcasecmp(argv[10], "-vsync") == 0) {
+		mode->flags |= DRM_MODE_FLAG_NVSYNC;
+	} else {
+		return false;
+	}
+
+	snprintf(mode->name, sizeof(mode->name), "%dx%d@%d",
+		 mode->hdisplay, mode->vdisplay, mode->vrefresh / 1000);
+
+	return true;
+}
+
+struct cmd_results *output_cmd_modeline(int argc, char **argv) {
+	if (!config->handler_context.output_config) {
+		return cmd_results_new(CMD_FAILURE, "Missing output config");
+	}
+	if (!argc) {
+		return cmd_results_new(CMD_INVALID, "Missing modeline argument.");
+	}
+
+	struct output_config *output = config->handler_context.output_config;
+
+	if (argc != 11 || !parse_modeline(argv, &output->drm_mode)) {
+		return cmd_results_new(CMD_INVALID, "Invalid modeline");
+	}
+
+	config->handler_context.leftovers.argc = argc - 12;
+	config->handler_context.leftovers.argv = argv + 12;
+	return NULL;
+}
+