aboutsummaryrefslogtreecommitdiff
path: root/sway/commands/output.c
diff options
context:
space:
mode:
authorTony Crisci <tony@dubstepdish.com>2017-12-18 11:01:11 -0500
committerTony Crisci <tony@dubstepdish.com>2017-12-18 11:01:11 -0500
commita949d7de5a7df2a3eaf51f4993ea94cf0dbc4a9a (patch)
tree2278e3db6ca185c2f4789c65f4b42e96a44e3664 /sway/commands/output.c
parenta87960711a9587ed2f484c2ba8a5cb9e18d1d641 (diff)
parenteb4f66f7857d3e7cd8ac14a7fb43502fbc70de98 (diff)
Merge branch 'wlroots' into feature/input
Diffstat (limited to 'sway/commands/output.c')
-rw-r--r--sway/commands/output.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/commands/output.c b/sway/commands/output.c
index d71e4d8d..7988e3e4 100644
--- a/sway/commands/output.c
+++ b/sway/commands/output.c
@@ -144,7 +144,7 @@ struct cmd_results *cmd_output(int argc, char **argv) {
goto fail;
}
char *end;
- output->scale = strtol(argv[i], &end, 10);
+ output->scale = strtof(argv[i], &end);
if (*end) {
error = cmd_results_new(CMD_INVALID, "output",
"Invalid scale.");
@@ -278,7 +278,7 @@ struct cmd_results *cmd_output(int argc, char **argv) {
}
sway_log(L_DEBUG, "Config stored for output %s (enabled: %d) (%dx%d@%fHz "
- "position %d,%d scale %d transform %d) (bg %s %s)",
+ "position %d,%d scale %f transform %d) (bg %s %s)",
output->name, output->enabled, output->width, output->height,
output->refresh_rate, output->x, output->y, output->scale,
output->transform, output->background, output->background_option);