summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Taiyu <taiyu.len@gmail.com>2015-08-13 07:48:03 -0700
committerLibravatar Taiyu <taiyu.len@gmail.com>2015-08-13 07:48:03 -0700
commitad21281540a0461c75d6a87c27c8e65c2dc6f002 (patch)
treee982707398e36c1f04a190f54a7f8be2fe8287d1
parentmoved signal handling to main (diff)
downloadsway-ad21281540a0461c75d6a87c27c8e65c2dc6f002.tar.gz
sway-ad21281540a0461c75d6a87c27c8e65c2dc6f002.tar.zst
sway-ad21281540a0461c75d6a87c27c8e65c2dc6f002.zip
style, spelling
-rw-r--r--sway/commands.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/sway/commands.c b/sway/commands.c
index e82462bf..c2458278 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -30,14 +30,14 @@ static struct modifier_key modifiers[] = {
30}; 30};
31 31
32enum expected_args { 32enum expected_args {
33 EXPECTED_MORE_THEN, 33 EXPECTED_MORE_THAN,
34 EXPECTED_LESS_THEN, 34 EXPECTED_LESS_THAN,
35 EXPECTED_SAME_AS 35 EXPECTED_SAME_AS
36}; 36};
37 37
38static bool checkarg(int argc, char *name, enum expected_args type, int val) { 38static bool checkarg(int argc, char *name, enum expected_args type, int val) {
39 switch (type) { 39 switch (type) {
40 case EXPECTED_MORE_THEN: 40 case EXPECTED_MORE_THAN:
41 if (argc > val) { 41 if (argc > val) {
42 return true; 42 return true;
43 } 43 }
@@ -45,7 +45,7 @@ static bool checkarg(int argc, char *name, enum expected_args type, int val) {
45 "(expected more then %d argument%s, got %d", 45 "(expected more then %d argument%s, got %d",
46 name, val, (char*[2]){"s", ""}[argc==1], argc); 46 name, val, (char*[2]){"s", ""}[argc==1], argc);
47 break; 47 break;
48 case EXPECTED_LESS_THEN: 48 case EXPECTED_LESS_THAN:
49 if (argc < val) { 49 if (argc < val) {
50 return true; 50 return true;
51 }; 51 };
@@ -66,7 +66,7 @@ static bool checkarg(int argc, char *name, enum expected_args type, int val) {
66 66
67 67
68static bool cmd_bindsym(struct sway_config *config, int argc, char **argv) { 68static bool cmd_bindsym(struct sway_config *config, int argc, char **argv) {
69 if (checkarg(argc, "bindsym", EXPECTED_MORE_THEN, 1) == false) { 69 if (!checkarg(argc, "bindsym", EXPECTED_MORE_THAN, 1)) {
70 return false; 70 return false;
71 }; 71 };
72 72
@@ -109,7 +109,7 @@ static bool cmd_bindsym(struct sway_config *config, int argc, char **argv) {
109} 109}
110 110
111static bool cmd_exec_always(struct sway_config *config, int argc, char **argv) { 111static bool cmd_exec_always(struct sway_config *config, int argc, char **argv) {
112 if (checkarg(argc, "exec_always", EXPECTED_MORE_THEN, 0) == false) { 112 if (!checkarg(argc, "exec_always", EXPECTED_MORE_THAN, 0)) {
113 return false; 113 return false;
114 } 114 }
115 115
@@ -144,7 +144,7 @@ static bool cmd_exec(struct sway_config *config, int argc, char **argv) {
144} 144}
145 145
146static bool cmd_exit(struct sway_config *config, int argc, char **argv) { 146static bool cmd_exit(struct sway_config *config, int argc, char **argv) {
147 if (checkarg(argc, "exit", EXPECTED_SAME_AS, 0) == false) { 147 if (!checkarg(argc, "exit", EXPECTED_SAME_AS, 0)) {
148 return false; 148 return false;
149 } 149 }
150 // TODO: Some kind of clean up is probably in order 150 // TODO: Some kind of clean up is probably in order
@@ -153,7 +153,7 @@ static bool cmd_exit(struct sway_config *config, int argc, char **argv) {
153} 153}
154 154
155static bool cmd_focus(struct sway_config *config, int argc, char **argv) { 155static bool cmd_focus(struct sway_config *config, int argc, char **argv) {
156 if (checkarg(argc, "focus", EXPECTED_SAME_AS, 1) == false) { 156 if (!checkarg(argc, "focus", EXPECTED_SAME_AS, 1)) {
157 return false; 157 return false;
158 } 158 }
159 if (strcasecmp(argv[0], "left") == 0) { 159 if (strcasecmp(argv[0], "left") == 0) {
@@ -171,7 +171,7 @@ static bool cmd_focus(struct sway_config *config, int argc, char **argv) {
171} 171}
172 172
173static bool cmd_focus_follows_mouse(struct sway_config *config, int argc, char **argv) { 173static bool cmd_focus_follows_mouse(struct sway_config *config, int argc, char **argv) {
174 if (checkarg(argc, "focus_follows_mouse", EXPECTED_SAME_AS, 1) == false) { 174 if (!checkarg(argc, "focus_follows_mouse", EXPECTED_SAME_AS, 1)) {
175 return false; 175 return false;
176 } 176 }
177 177
@@ -180,7 +180,7 @@ static bool cmd_focus_follows_mouse(struct sway_config *config, int argc, char *
180} 180}
181 181
182static bool cmd_layout(struct sway_config *config, int argc, char **argv) { 182static bool cmd_layout(struct sway_config *config, int argc, char **argv) {
183 if (checkarg(argc, "layout", EXPECTED_MORE_THEN, 0) == false) { 183 if (!checkarg(argc, "layout", EXPECTED_MORE_THAN, 0)) {
184 return false; 184 return false;
185 } 185 }
186 swayc_t *parent = get_focused_container(&root_container); 186 swayc_t *parent = get_focused_container(&root_container);
@@ -204,7 +204,7 @@ static bool cmd_layout(struct sway_config *config, int argc, char **argv) {
204} 204}
205 205
206static bool cmd_reload(struct sway_config *config, int argc, char **argv) { 206static bool cmd_reload(struct sway_config *config, int argc, char **argv) {
207 if (checkarg(argc, "reload", EXPECTED_SAME_AS, 0) == false) { 207 if (!checkarg(argc, "reload", EXPECTED_SAME_AS, 0)) {
208 return false; 208 return false;
209 } 209 }
210 if (!load_config()) { 210 if (!load_config()) {
@@ -215,7 +215,7 @@ static bool cmd_reload(struct sway_config *config, int argc, char **argv) {
215} 215}
216 216
217static bool cmd_set(struct sway_config *config, int argc, char **argv) { 217static bool cmd_set(struct sway_config *config, int argc, char **argv) {
218 if (checkarg(argc, "set", EXPECTED_SAME_AS, 2) == false) { 218 if (!checkarg(argc, "set", EXPECTED_SAME_AS, 2)) {
219 return false; 219 return false;
220 } 220 }
221 struct sway_variable *var = malloc(sizeof(struct sway_variable)); 221 struct sway_variable *var = malloc(sizeof(struct sway_variable));
@@ -231,7 +231,7 @@ static bool _do_split(struct sway_config *config, int argc, char **argv, int lay
231 char *name = layout == L_VERT ? "splitv": 231 char *name = layout == L_VERT ? "splitv":
232 layout == L_HORIZ ? "splith": 232 layout == L_HORIZ ? "splith":
233 "split"; 233 "split";
234 if (checkarg(argc, name, EXPECTED_SAME_AS, 0) == false) { 234 if (!checkarg(argc, name, EXPECTED_SAME_AS, 0)) {
235 return false; 235 return false;
236 } 236 }
237 swayc_t *focused = get_focused_container(&root_container); 237 swayc_t *focused = get_focused_container(&root_container);
@@ -263,7 +263,7 @@ static bool cmd_splith(struct sway_config *config, int argc, char **argv) {
263} 263}
264 264
265static bool cmd_log_colors(struct sway_config *config, int argc, char **argv) { 265static bool cmd_log_colors(struct sway_config *config, int argc, char **argv) {
266 if (checkarg(argc, "log_colors", EXPECTED_SAME_AS, 1) == false) { 266 if (!checkarg(argc, "log_colors", EXPECTED_SAME_AS, 1)) {
267 return false; 267 return false;
268 } 268 }
269 if (strcasecmp(argv[0], "no") != 0 && strcasecmp(argv[0], "yes") != 0) { 269 if (strcasecmp(argv[0], "no") != 0 && strcasecmp(argv[0], "yes") != 0) {
@@ -276,7 +276,7 @@ static bool cmd_log_colors(struct sway_config *config, int argc, char **argv) {
276} 276}
277 277
278static bool cmd_fullscreen(struct sway_config *config, int argc, char **argv) { 278static bool cmd_fullscreen(struct sway_config *config, int argc, char **argv) {
279 if (checkarg(argc, "fullscreen", EXPECTED_SAME_AS, 0) == false) { 279 if (!checkarg(argc, "fullscreen", EXPECTED_SAME_AS, 0)) {
280 return false; 280 return false;
281 } 281 }
282 282
@@ -289,7 +289,7 @@ static bool cmd_fullscreen(struct sway_config *config, int argc, char **argv) {
289} 289}
290 290
291static bool cmd_workspace(struct sway_config *config, int argc, char **argv) { 291static bool cmd_workspace(struct sway_config *config, int argc, char **argv) {
292 if (checkarg(argc, "workspace", EXPECTED_SAME_AS, 1) == false) { 292 if (!checkarg(argc, "workspace", EXPECTED_SAME_AS, 1)) {
293 return false; 293 return false;
294 } 294 }
295 295