diff options
author | emersion <contact@emersion.fr> | 2017-12-18 14:13:07 +0100 |
---|---|---|
committer | emersion <contact@emersion.fr> | 2017-12-18 14:13:07 +0100 |
commit | c815d6d1a97fe940052f079bd8eb7f174f5ab004 (patch) | |
tree | a6b58e92550c237057b72e6fb6598f3fcca0730c /sway/commands/output.c | |
parent | Merge pull request #1503 from emersion/output-config (diff) | |
download | sway-c815d6d1a97fe940052f079bd8eb7f174f5ab004.tar.gz sway-c815d6d1a97fe940052f079bd8eb7f174f5ab004.tar.zst sway-c815d6d1a97fe940052f079bd8eb7f174f5ab004.zip |
Add support for fractional output scale
Diffstat (limited to 'sway/commands/output.c')
-rw-r--r-- | sway/commands/output.c | 4 |
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) { | |||
144 | goto fail; | 144 | goto fail; |
145 | } | 145 | } |
146 | char *end; | 146 | char *end; |
147 | output->scale = strtol(argv[i], &end, 10); | 147 | output->scale = strtof(argv[i], &end); |
148 | if (*end) { | 148 | if (*end) { |
149 | error = cmd_results_new(CMD_INVALID, "output", | 149 | error = cmd_results_new(CMD_INVALID, "output", |
150 | "Invalid scale."); | 150 | "Invalid scale."); |
@@ -278,7 +278,7 @@ struct cmd_results *cmd_output(int argc, char **argv) { | |||
278 | } | 278 | } |
279 | 279 | ||
280 | sway_log(L_DEBUG, "Config stored for output %s (enabled: %d) (%dx%d@%fHz " | 280 | sway_log(L_DEBUG, "Config stored for output %s (enabled: %d) (%dx%d@%fHz " |
281 | "position %d,%d scale %d transform %d) (bg %s %s)", | 281 | "position %d,%d scale %f transform %d) (bg %s %s)", |
282 | output->name, output->enabled, output->width, output->height, | 282 | output->name, output->enabled, output->width, output->height, |
283 | output->refresh_rate, output->x, output->y, output->scale, | 283 | output->refresh_rate, output->x, output->y, output->scale, |
284 | output->transform, output->background, output->background_option); | 284 | output->transform, output->background, output->background_option); |