diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-07-23 21:49:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-23 21:49:16 -0400 |
| commit | 71774ecd3658653328f3c903869b52c51c62e237 (patch) | |
| tree | bfc136252f81a5350f240c20161d2d0bfc2f80dd /sway/commands/focus_wrapping.c | |
| parent | 224ade138208e9aa525423cbfbd643aa9d9b63c3 (diff) | |
| parent | 9ec1d6cf79e6f9c3233f577c6fddeaeb21bb1bfc (diff) | |
Merge pull request #2340 from RedSoxFan/parse_boolean
Switch to using a function to parse booleans
Diffstat (limited to 'sway/commands/focus_wrapping.c')
| -rw-r--r-- | sway/commands/focus_wrapping.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sway/commands/focus_wrapping.c b/sway/commands/focus_wrapping.c index 0a9e0bf2..562ee4f9 100644 --- a/sway/commands/focus_wrapping.c +++ b/sway/commands/focus_wrapping.c @@ -1,6 +1,7 @@ #include <strings.h> #include "sway/commands.h" #include "sway/config.h" +#include "util.h" struct cmd_results *cmd_focus_wrapping(int argc, char **argv) { struct cmd_results *error = NULL; @@ -8,15 +9,12 @@ struct cmd_results *cmd_focus_wrapping(int argc, char **argv) { return error; } - if (strcasecmp(argv[0], "no") == 0) { - config->focus_wrapping = WRAP_NO; - } else if (strcasecmp(argv[0], "yes") == 0) { - config->focus_wrapping = WRAP_YES; - } else if (strcasecmp(argv[0], "force") == 0) { + if (strcasecmp(argv[0], "force") == 0) { config->focus_wrapping = WRAP_FORCE; + } else if (parse_boolean(argv[0], config->focus_wrapping == WRAP_YES)) { + config->focus_wrapping = WRAP_YES; } else { - return cmd_results_new(CMD_INVALID, "focus_wrapping", - "Expected 'focus_wrapping yes|no|force'"); + config->focus_wrapping = WRAP_NO; } return cmd_results_new(CMD_SUCCESS, NULL, NULL); |