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/move.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/move.c')
| -rw-r--r-- | sway/commands/move.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/commands/move.c b/sway/commands/move.c index 97e10f10..3c47cfe7 100644 --- a/sway/commands/move.c +++ b/sway/commands/move.c @@ -20,7 +20,7 @@ struct cmd_results *cmd_move(int argc, char **argv) { "'move <container|window> to workspace <name>' or " "'move <container|window|workspace> to output <name|direction>' or " "'move position mouse'"; - swayc_t *view = get_focused_container(&root_container); + swayc_t *view = current_container; if (argc == 2 || (argc == 3 && strcasecmp(argv[2], "px") == 0 )) { char *inv; @@ -125,7 +125,7 @@ struct cmd_results *cmd_move(int argc, char **argv) { if (view->type != C_CONTAINER && view->type != C_VIEW) { return cmd_results_new(CMD_FAILURE, "move scratchpad", "Can only move containers and views."); } - swayc_t *view = get_focused_container(&root_container); + swayc_t *view = current_container; int i; for (i = 0; i < scratchpad->length; i++) { if (scratchpad->items[i] == view) { |