diff options
author | wil <william.barsse@gmail.com> | 2017-01-01 21:52:49 +0100 |
---|---|---|
committer | wil <william.barsse@gmail.com> | 2017-01-01 21:52:49 +0100 |
commit | 97f70987d70315c683fd1e16c731b396679f6b96 (patch) | |
tree | d8f9649c86010ed5e3c1f109e789af680aad717b /sway/commands/layout.c | |
parent | changed "layout promote" command to "move first" (diff) | |
download | sway-97f70987d70315c683fd1e16c731b396679f6b96.tar.gz sway-97f70987d70315c683fd1e16c731b396679f6b96.tar.zst sway-97f70987d70315c683fd1e16c731b396679f6b96.zip |
[fix] cleanups suggested by Sway community
Diffstat (limited to 'sway/commands/layout.c')
-rw-r--r-- | sway/commands/layout.c | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/sway/commands/layout.c b/sway/commands/layout.c index 2da65765..0cdac1b4 100644 --- a/sway/commands/layout.c +++ b/sway/commands/layout.c | |||
@@ -64,11 +64,18 @@ struct cmd_results *cmd_layout(int argc, char **argv) { | |||
64 | } else if (strcasecmp(argv[0], "auto_bot") == 0) { | 64 | } else if (strcasecmp(argv[0], "auto_bot") == 0) { |
65 | swayc_change_layout(parent, L_AUTO_BOTTOM); | 65 | swayc_change_layout(parent, L_AUTO_BOTTOM); |
66 | } else if (strcasecmp(argv[0], "incnmaster") == 0) { | 66 | } else if (strcasecmp(argv[0], "incnmaster") == 0) { |
67 | if ((error = checkarg(argc, "layout incnmaster", | 67 | const char *name = "layout incnmaster"; |
68 | if ((error = checkarg(argc, name, | ||
68 | EXPECTED_EQUAL_TO, 2))) { | 69 | EXPECTED_EQUAL_TO, 2))) { |
69 | return error; | 70 | return error; |
70 | } | 71 | } |
71 | int inc = (int) strtol(argv[1], NULL, 10); | 72 | char *end; |
73 | int inc = (int) strtol(argv[1], &end, 10); | ||
74 | if (*end) { | ||
75 | return cmd_results_new(CMD_INVALID, name, "Invalid %s command " | ||
76 | "(argument must be an integer)", name); | ||
77 | |||
78 | } | ||
72 | swayc_t *container = get_focused_view(swayc_active_workspace()); | 79 | swayc_t *container = get_focused_view(swayc_active_workspace()); |
73 | if (container && inc && | 80 | if (container && inc && |
74 | is_auto_layout(container->parent->layout) && | 81 | is_auto_layout(container->parent->layout) && |
@@ -83,11 +90,18 @@ struct cmd_results *cmd_layout(int argc, char **argv) { | |||
83 | container->parent->nb_master += inc; | 90 | container->parent->nb_master += inc; |
84 | } | 91 | } |
85 | } else if ((strcasecmp(argv[0], "incncol") == 0) && argc ==2) { | 92 | } else if ((strcasecmp(argv[0], "incncol") == 0) && argc ==2) { |
86 | if ((error = checkarg(argc, "layout incncol", | 93 | const char *name = "layout incncol"; |
94 | if ((error = checkarg(argc, name, | ||
87 | EXPECTED_EQUAL_TO, 2))) { | 95 | EXPECTED_EQUAL_TO, 2))) { |
88 | return error; | 96 | return error; |
89 | } | 97 | } |
90 | int inc = (int) strtol(argv[1], NULL, 10); | 98 | char *end; |
99 | int inc = (int) strtol(argv[1], &end, 10); | ||
100 | if (*end) { | ||
101 | return cmd_results_new(CMD_INVALID, name, "Invalid %s command " | ||
102 | "(argument must be an integer)", name); | ||
103 | |||
104 | } | ||
91 | swayc_t *container = get_focused_view(swayc_active_workspace()); | 105 | swayc_t *container = get_focused_view(swayc_active_workspace()); |
92 | if (container && inc && is_auto_layout(container->parent->layout) && | 106 | if (container && inc && is_auto_layout(container->parent->layout) && |
93 | ((int)container->parent->nb_slave_groups + inc >= 1)) { | 107 | ((int)container->parent->nb_slave_groups + inc >= 1)) { |