mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-05-04 06:46:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove output pos <X,Y> syntax

Browse source
This commit is contained in:
Chengyu Zheng 2018-04-23 18:51:10 +02:00
parent 82cb379727
commit 73eb49cf81
2 changed files with 9 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

30
sway/commands/output.c
View file

@ -73,29 +73,15 @@ static struct cmd_results *cmd_output_position(struct output_config *output,
char *end;
output->x = strtol(argv[*i], &end, 10);
// Format is 1234 4321
if (++*i >= argc) {
return cmd_results_new(CMD_INVALID, "output",
"Missing position argument (y).");
}
output->y = strtol(argv[*i], &end, 10);
if (*end) {
// Format is 1234,4321
if (*end != ',') {
return cmd_results_new(CMD_INVALID, "output",
"Invalid position x.");
}
++end;
output->y = strtol(end, &end, 10);
if (*end) {
return cmd_results_new(CMD_INVALID, "output",
"Invalid position y.");
}
} else {
// Format is 1234 4321 (legacy)
if (++*i >= argc) {
return cmd_results_new(CMD_INVALID, "output",
"Missing position argument (y).");
}
output->y = strtol(argv[*i], &end, 10);
if (*end) {
return cmd_results_new(CMD_INVALID, "output",
"Invalid position y.");
}
return cmd_results_new(CMD_INVALID, "output",
"Invalid position y.");
}
return NULL;

2
sway/sway.5.txt
View file

@ -374,7 +374,7 @@ The default colors are:
+
output HDMI-A-1 mode 1920x1080@60Hz
**output** <name> position|pos <X,Y>::
**output** <name> position|pos <X> <Y>::
Configures the specified output to be arranged at the given position.
**output** <name> scale <I>::