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/floating.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/floating.c')
-rw-r--r-- | sway/commands/floating.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/commands/floating.c b/sway/commands/floating.c index 113c8b71..ccfde532 100644 --- a/sway/commands/floating.c +++ b/sway/commands/floating.c | |||
@@ -13,7 +13,7 @@ struct cmd_results *cmd_floating(int argc, char **argv) { | |||
13 | if ((error = checkarg(argc, "floating", EXPECTED_EQUAL_TO, 1))) { | 13 | if ((error = checkarg(argc, "floating", EXPECTED_EQUAL_TO, 1))) { |
14 | return error; | 14 | return error; |
15 | } | 15 | } |
16 | swayc_t *view = get_focused_container(&root_container); | 16 | swayc_t *view = current_container; |
17 | bool wants_floating; | 17 | bool wants_floating; |
18 | if (strcasecmp(argv[0], "enable") == 0) { | 18 | if (strcasecmp(argv[0], "enable") == 0) { |
19 | wants_floating = true; | 19 | wants_floating = true; |