diff options
| author | Calvin Lee <[email protected]> | 2017-04-04 21:20:27 -0600 |
|---|---|---|
| committer | Calvin Lee <[email protected]> | 2017-04-05 22:07:23 -0600 |
| commit | 069d37f987c4e323cdb9396f0d80ac83d00566ff (patch) | |
| tree | b883a5553107ab24d5346db42062518f9e7bdca9 /sway/commands/kill.c | |
| 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 'sway/commands/kill.c')
| -rw-r--r-- | sway/commands/kill.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/commands/kill.c b/sway/commands/kill.c index 2e94fb10..742e2b86 100644 --- a/sway/commands/kill.c +++ b/sway/commands/kill.c @@ -6,7 +6,7 @@ struct cmd_results *cmd_kill(int argc, char **argv) { if (config->reading) return cmd_results_new(CMD_FAILURE, "kill", "Can't be used in config file."); if (!config->active) return cmd_results_new(CMD_FAILURE, "kill", "Can only be used when sway is running."); - swayc_t *container = get_focused_container(&root_container); + swayc_t *container = current_container; close_views(container); return cmd_results_new(CMD_SUCCESS, NULL, NULL); } |