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. --- sway/commands/focus.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'sway/commands/focus.c') diff --git a/sway/commands/focus.c b/sway/commands/focus.c index 12c5d02c..defaba29 100644 --- a/sway/commands/focus.c +++ b/sway/commands/focus.c @@ -30,6 +30,9 @@ struct cmd_results *cmd_focus(int argc, char **argv) { } } return cmd_results_new(CMD_SUCCESS, NULL, NULL); + } else if (argc == 0) { + set_focused_container(current_container); + return cmd_results_new(CMD_SUCCESS, NULL, NULL); } else if ((error = checkarg(argc, "focus", EXPECTED_EQUAL_TO, 1))) { return error; } -- cgit v1.2.3