diff options
author | Calvin Lee <cyrus296@gmail.com> | 2017-04-04 21:20:27 -0600 |
---|---|---|
committer | Calvin Lee <cyrus296@gmail.com> | 2017-04-05 22:07:23 -0600 |
commit | 069d37f987c4e323cdb9396f0d80ac83d00566ff (patch) | |
tree | b883a5553107ab24d5346db42062518f9e7bdca9 /sway/commands/split.c | |
parent | Merge pull request #1145 from 4e554c4c/marks (diff) | |
download | sway-069d37f987c4e323cdb9396f0d80ac83d00566ff.tar.gz sway-069d37f987c4e323cdb9396f0d80ac83d00566ff.tar.zst sway-069d37f987c4e323cdb9396f0d80ac83d00566ff.zip |
Improve criteria handling
This commit changes how commands decide what container to act on.
Commands get the current container though `current_container`, a global
defined in sway/commands.c. If a criteria is given before a command,
then the following command will be run once for every container the
criteria matches with a reference to the matching container in
'current_container'. Commands should use this instead of
`get_focused_container()` from now on.
This commit also fixes a few (minor) mistakes made in implementing marks
such as non-escaped arrows in sway(5) and calling the "mark" command
"floating" by accident. It also cleans up `criteria.c` in a few places.
Diffstat (limited to 'sway/commands/split.c')
-rw-r--r-- | sway/commands/split.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sway/commands/split.c b/sway/commands/split.c index e7da93d7..e3045a4f 100644 --- a/sway/commands/split.c +++ b/sway/commands/split.c | |||
@@ -17,7 +17,7 @@ static struct cmd_results *_do_split(int argc, char **argv, int layout) { | |||
17 | if ((error = checkarg(argc, name, EXPECTED_EQUAL_TO, 0))) { | 17 | if ((error = checkarg(argc, name, EXPECTED_EQUAL_TO, 0))) { |
18 | return error; | 18 | return error; |
19 | } | 19 | } |
20 | swayc_t *focused = get_focused_container(&root_container); | 20 | swayc_t *focused = current_container; |
21 | 21 | ||
22 | // Case of floating window, don't split | 22 | // Case of floating window, don't split |
23 | if (focused->is_floating) { | 23 | if (focused->is_floating) { |
@@ -66,7 +66,7 @@ struct cmd_results *cmd_split(int argc, char **argv) { | |||
66 | } else if (strcasecmp(argv[0], "h") == 0 || strcasecmp(argv[0], "horizontal") == 0) { | 66 | } else if (strcasecmp(argv[0], "h") == 0 || strcasecmp(argv[0], "horizontal") == 0) { |
67 | _do_split(argc - 1, argv + 1, L_HORIZ); | 67 | _do_split(argc - 1, argv + 1, L_HORIZ); |
68 | } else if (strcasecmp(argv[0], "t") == 0 || strcasecmp(argv[0], "toggle") == 0) { | 68 | } else if (strcasecmp(argv[0], "t") == 0 || strcasecmp(argv[0], "toggle") == 0) { |
69 | swayc_t *focused = get_focused_container(&root_container); | 69 | swayc_t *focused = current_container; |
70 | if (focused->parent->layout == L_VERT) { | 70 | if (focused->parent->layout == L_VERT) { |
71 | _do_split(argc - 1, argv + 1, L_HORIZ); | 71 | _do_split(argc - 1, argv + 1, L_HORIZ); |
72 | } else { | 72 | } else { |
@@ -89,7 +89,7 @@ struct cmd_results *cmd_splith(int argc, char **argv) { | |||
89 | } | 89 | } |
90 | 90 | ||
91 | struct cmd_results *cmd_splitt(int argc, char **argv) { | 91 | struct cmd_results *cmd_splitt(int argc, char **argv) { |
92 | swayc_t *focused = get_focused_container(&root_container); | 92 | swayc_t *focused = current_container; |
93 | if (focused->parent->layout == L_VERT) { | 93 | if (focused->parent->layout == L_VERT) { |
94 | return _do_split(argc, argv, L_HORIZ); | 94 | return _do_split(argc, argv, L_HORIZ); |
95 | } else { | 95 | } else { |