aboutsummaryrefslogtreecommitdiffstats
path: root/include/sway/criteria.h
diff options
context:
space:
mode:
authorLibravatar Calvin Lee <cyrus296@gmail.com>2017-04-04 21:20:27 -0600
committerLibravatar Calvin Lee <cyrus296@gmail.com>2017-04-05 22:07:23 -0600
commit069d37f987c4e323cdb9396f0d80ac83d00566ff (patch)
treeb883a5553107ab24d5346db42062518f9e7bdca9 /include/sway/criteria.h
parentMerge pull request #1145 from 4e554c4c/marks (diff)
downloadsway-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 'include/sway/criteria.h')
-rw-r--r--include/sway/criteria.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/sway/criteria.h b/include/sway/criteria.h
index 5c71d172..022c48a8 100644
--- a/include/sway/criteria.h
+++ b/include/sway/criteria.h
@@ -33,4 +33,7 @@ char *extract_crit_tokens(list_t *tokens, const char *criteria);
33// been set with `for_window` commands and have an associated cmdlist. 33// been set with `for_window` commands and have an associated cmdlist.
34list_t *criteria_for(swayc_t *cont); 34list_t *criteria_for(swayc_t *cont);
35 35
36// Returns a list of all containers that match the given list of tokens.
37list_t *container_for(list_t *tokens);
38
36#endif 39#endif