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 /include | |
| parent | 7d43a76b4e765eb8072c09cdec3847e877cf65d7 (diff) | |
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')
| -rw-r--r-- | include/sway/commands.h | 3 | ||||
| -rw-r--r-- | include/sway/criteria.h | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/sway/commands.h b/include/sway/commands.h index 35a2f92a..91f2ae01 100644 --- a/include/sway/commands.h +++ b/include/sway/commands.h @@ -5,6 +5,9 @@ #include <wlc/wlc.h> #include "config.h" +// Container that a called command should act upon. Only valid in command functions. +extern swayc_t *current_container; + /** * Indicates the result of a command's execution. */ 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 |