mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

commands: gaps: Refactor, expected_syntax.

This commit is contained in:
S. Christoffer Eliesen 2015-11-04 01:05:19 +01:00
parent 58085226b3
commit 820681965d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sway/commands.c
View File

@ -760,6 +760,8 @@ static struct cmd_results *cmd_gaps(int argc, char **argv) {
if ((error = checkarg(argc, "gaps", EXPECTED_AT_LEAST, 1))) {
return error;
}
const char* expected_syntax =
"Expected 'gaps <inner|outer> <current|all|workspace> <set|plus|minus n>'";
const char *amount_str = argv[0];
// gaps amount
if (argc >= 1 && isdigit(*amount_str)) {
@ -793,7 +795,7 @@ static struct cmd_results *cmd_gaps(int argc, char **argv) {
}
// gaps inner|outer current|all set|plus|minus n
if (argc < 4 || config->reading) {
return cmd_results_new(CMD_INVALID, "gaps", "Expected 'gaps <inner|outer> <current|all|workspace> <set|plus|minus n>'");
return cmd_results_new(CMD_INVALID, "gaps", expected_syntax);
}
// gaps inner|outer ...
const char *inout_str = argv[0];
@ -803,7 +805,7 @@ static struct cmd_results *cmd_gaps(int argc, char **argv) {
} else if (strcasecmp(inout_str, "outer") == 0) {
inout = OUTER;
} else {
return cmd_results_new(CMD_INVALID, "gaps", "Expected 'gaps <inner|outer> <current|all|workspace> <set|plus|minus n>'");
return cmd_results_new(CMD_INVALID, "gaps", expected_syntax);
}
// gaps ... current|all ...
@ -821,7 +823,7 @@ static struct cmd_results *cmd_gaps(int argc, char **argv) {
target = WORKSPACE;
}
} else {
return cmd_results_new(CMD_INVALID, "gaps", "Expected 'gaps <inner|outer> <current|all|workspace> <set|plus|minus n>'");
return cmd_results_new(CMD_INVALID, "gaps", expected_syntax);
}
// gaps ... n
@ -843,7 +845,7 @@ static struct cmd_results *cmd_gaps(int argc, char **argv) {
method = ADD;
amount *= -1;
} else {
return cmd_results_new(CMD_INVALID, "gaps", "Expected 'gaps <inner|outer> <current|all> <set|plus|minus n>'");
return cmd_results_new(CMD_INVALID, "gaps", expected_syntax);
}
if (target == CURRENT) {