diff options
author | taiyu <taiyu.len@gmail.com> | 2015-09-15 06:39:24 -0700 |
---|---|---|
committer | taiyu <taiyu.len@gmail.com> | 2015-09-15 06:39:24 -0700 |
commit | a18caf6706d9b5640247737ecd9c8589ccf4817b (patch) | |
tree | 7910b6d45b245530325be918ae77f47f666eafef | |
parent | multi command keybinds (diff) | |
download | sway-a18caf6706d9b5640247737ecd9c8589ccf4817b.tar.gz sway-a18caf6706d9b5640247737ecd9c8589ccf4817b.tar.zst sway-a18caf6706d9b5640247737ecd9c8589ccf4817b.zip |
nomacro
-rw-r--r-- | sway/commands.c | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/sway/commands.c b/sway/commands.c index c426928e..bbf0bde2 100644 --- a/sway/commands.c +++ b/sway/commands.c | |||
@@ -34,7 +34,6 @@ static sway_cmd cmd_floating; | |||
34 | static sway_cmd cmd_floating_mod; | 34 | static sway_cmd cmd_floating_mod; |
35 | static sway_cmd cmd_focus; | 35 | static sway_cmd cmd_focus; |
36 | static sway_cmd cmd_focus_follows_mouse; | 36 | static sway_cmd cmd_focus_follows_mouse; |
37 | static sway_cmd cmd_for_window; | ||
38 | static sway_cmd cmd_fullscreen; | 37 | static sway_cmd cmd_fullscreen; |
39 | static sway_cmd cmd_gaps; | 38 | static sway_cmd cmd_gaps; |
40 | static sway_cmd cmd_kill; | 39 | static sway_cmd cmd_kill; |
@@ -53,10 +52,6 @@ static sway_cmd cmd_splitv; | |||
53 | static sway_cmd cmd_workspace; | 52 | static sway_cmd cmd_workspace; |
54 | static sway_cmd cmd_ws_auto_back_and_forth; | 53 | static sway_cmd cmd_ws_auto_back_and_forth; |
55 | 54 | ||
56 | #define NO_BIND() if (!config->reading) return CMD_FAILURE; | ||
57 | #define NO_CONF() if (config->reading) return CMD_FAILURE; | ||
58 | #define DEFER() if (!config->active) return CMD_DEFER; | ||
59 | |||
60 | swayc_t *sp_view; | 55 | swayc_t *sp_view; |
61 | int sp_index = 0; | 56 | int sp_index = 0; |
62 | 57 | ||
@@ -184,7 +179,7 @@ static enum cmd_status cmd_bindsym(int argc, char **argv) { | |||
184 | } | 179 | } |
185 | 180 | ||
186 | static enum cmd_status cmd_exec_always(int argc, char **argv) { | 181 | static enum cmd_status cmd_exec_always(int argc, char **argv) { |
187 | DEFER(); | 182 | if (!config->active) return CMD_DEFER;; |
188 | if (!checkarg(argc, "exec_always", EXPECTED_MORE_THAN, 0)) { | 183 | if (!checkarg(argc, "exec_always", EXPECTED_MORE_THAN, 0)) { |
189 | return CMD_FAILURE; | 184 | return CMD_FAILURE; |
190 | } | 185 | } |
@@ -215,7 +210,8 @@ static enum cmd_status cmd_exec_always(int argc, char **argv) { | |||
215 | } | 210 | } |
216 | 211 | ||
217 | static enum cmd_status cmd_exec(int argc, char **argv) { | 212 | static enum cmd_status cmd_exec(int argc, char **argv) { |
218 | DEFER(); | 213 | if (!config->active) return CMD_DEFER;; |
214 | |||
219 | if (config->reloading) { | 215 | if (config->reloading) { |
220 | char *args = join_args(argv, argc); | 216 | char *args = join_args(argv, argc); |
221 | sway_log(L_DEBUG, "Ignoring 'exec %s' due to reload", args); | 217 | sway_log(L_DEBUG, "Ignoring 'exec %s' due to reload", args); |
@@ -420,7 +416,7 @@ static enum cmd_status cmd_mode(int argc, char **argv) { | |||
420 | int mode_len = strlen(mode_name); | 416 | int mode_len = strlen(mode_name); |
421 | bool mode_make = mode_name[mode_len-1] == '{'; | 417 | bool mode_make = mode_name[mode_len-1] == '{'; |
422 | if (mode_make) { | 418 | if (mode_make) { |
423 | NO_BIND(); | 419 | if (!config->reading) return CMD_FAILURE;; |
424 | // Trim trailing spaces | 420 | // Trim trailing spaces |
425 | do { | 421 | do { |
426 | mode_name[--mode_len] = 0; | 422 | mode_name[--mode_len] = 0; |
@@ -458,7 +454,7 @@ static enum cmd_status cmd_mode(int argc, char **argv) { | |||
458 | } | 454 | } |
459 | 455 | ||
460 | static enum cmd_status cmd_move(int argc, char **argv) { | 456 | static enum cmd_status cmd_move(int argc, char **argv) { |
461 | NO_CONF(); | 457 | if (config->reading) return CMD_FAILURE;; |
462 | if (!checkarg(argc, "move", EXPECTED_AT_LEAST, 1)) { | 458 | if (!checkarg(argc, "move", EXPECTED_AT_LEAST, 1)) { |
463 | return CMD_FAILURE; | 459 | return CMD_FAILURE; |
464 | } | 460 | } |
@@ -529,7 +525,7 @@ static enum cmd_status cmd_move(int argc, char **argv) { | |||
529 | } | 525 | } |
530 | 526 | ||
531 | static enum cmd_status cmd_orientation(int argc, char **argv) { | 527 | static enum cmd_status cmd_orientation(int argc, char **argv) { |
532 | NO_BIND(); | 528 | if (!config->reading) return CMD_FAILURE;; |
533 | if (!checkarg(argc, "orientation", EXPECTED_EQUAL_TO, 1)) { | 529 | if (!checkarg(argc, "orientation", EXPECTED_EQUAL_TO, 1)) { |
534 | return CMD_FAILURE; | 530 | return CMD_FAILURE; |
535 | } | 531 | } |
@@ -547,7 +543,7 @@ static enum cmd_status cmd_orientation(int argc, char **argv) { | |||
547 | } | 543 | } |
548 | 544 | ||
549 | static enum cmd_status cmd_output(int argc, char **argv) { | 545 | static enum cmd_status cmd_output(int argc, char **argv) { |
550 | NO_BIND(); | 546 | if (!config->reading) return CMD_FAILURE;; |
551 | if (!checkarg(argc, "output", EXPECTED_AT_LEAST, 1)) { | 547 | if (!checkarg(argc, "output", EXPECTED_AT_LEAST, 1)) { |
552 | return CMD_FAILURE; | 548 | return CMD_FAILURE; |
553 | } | 549 | } |
@@ -1007,11 +1003,6 @@ static enum cmd_status cmd_log_colors(int argc, char **argv) { | |||
1007 | return CMD_SUCCESS; | 1003 | return CMD_SUCCESS; |
1008 | } | 1004 | } |
1009 | 1005 | ||
1010 | __attribute__((unused)) | ||
1011 | enum cmd_status cmd_for_window(int argc, char **argv) { | ||
1012 | return CMD_FAILURE; | ||
1013 | } | ||
1014 | |||
1015 | static enum cmd_status cmd_fullscreen(int argc, char **argv) { | 1006 | static enum cmd_status cmd_fullscreen(int argc, char **argv) { |
1016 | if (!checkarg(argc, "fullscreen", EXPECTED_AT_LEAST, 0) | 1007 | if (!checkarg(argc, "fullscreen", EXPECTED_AT_LEAST, 0) |
1017 | || config->reading || !config->active) { | 1008 | || config->reading || !config->active) { |