From 069d37f987c4e323cdb9396f0d80ac83d00566ff Mon Sep 17 00:00:00 2001 From: Calvin Lee Date: Tue, 4 Apr 2017 21:20:27 -0600 Subject: 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. --- include/sway/criteria.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/sway/criteria.h') 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); // been set with `for_window` commands and have an associated cmdlist. list_t *criteria_for(swayc_t *cont); +// Returns a list of all containers that match the given list of tokens. +list_t *container_for(list_t *tokens); + #endif -- cgit v1.2.3-54-g00ecf