Merge remote-tracking branch 'origin/hidpi'

1 files changed, 9 insertions, 3 deletions

diff --git a/sway/commands.c b/sway/commands.c
index d572afa0..053b5792 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -1585,6 +1585,7 @@ static struct cmd_results *cmd_output(int argc, char **argv) {
 	output->x = output->y = output->width = output->height = -1;
 	output->name = strdup(name);
 	output->enabled = -1;
+	output->scale = 1;
 
 	// TODO: atoi doesn't handle invalid numbers
 
@@ -1642,6 +1643,11 @@ static struct cmd_results *cmd_output(int argc, char **argv) {
 			}
 			output->x = x;
 			output->y = y;
+		} else if (strcasecmp(command, "scale") == 0) {
+			if (++i >= argc) {
+				return cmd_results_new(CMD_INVALID, "output", "Missing scale parameter.");
+			}
+			output->scale = atoi(argv[i]);
 		} else if (strcasecmp(command, "background") == 0 || strcasecmp(command, "bg") == 0) {
 			wordexp_t p;
 			if (++i >= argc) {
@@ -1700,10 +1706,10 @@ static struct cmd_results *cmd_output(int argc, char **argv) {
 		list_add(config->output_configs, output);
 	}
 
-	sway_log(L_DEBUG, "Config stored for output %s (enabled:%d) (%d x %d @ %d, %d) (bg %s %s)",
+	sway_log(L_DEBUG, "Config stored for output %s (enabled:%d) (%d x %d @ %d, %d scale %d) (bg %s %s)",
 			output->name, output->enabled, output->width,
-			output->height, output->x, output->y, output->background,
-			output->background_option);
+			output->height, output->x, output->y, output->scale,
+			output->background, output->background_option);
 
 	if (output->name) {
 		// Try to find the output container and apply configuration now. If