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/split.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sway/commands/split.c') diff --git a/sway/commands/split.c b/sway/commands/split.c index e7da93d7..e3045a4f 100644 --- a/sway/commands/split.c +++ b/sway/commands/split.c @@ -17,7 +17,7 @@ static struct cmd_results *_do_split(int argc, char **argv, int layout) { if ((error = checkarg(argc, name, EXPECTED_EQUAL_TO, 0))) { return error; } - swayc_t *focused = get_focused_container(&root_container); + swayc_t *focused = current_container; // Case of floating window, don't split if (focused->is_floating) { @@ -66,7 +66,7 @@ struct cmd_results *cmd_split(int argc, char **argv) { } else if (strcasecmp(argv[0], "h") == 0 || strcasecmp(argv[0], "horizontal") == 0) { _do_split(argc - 1, argv + 1, L_HORIZ); } else if (strcasecmp(argv[0], "t") == 0 || strcasecmp(argv[0], "toggle") == 0) { - swayc_t *focused = get_focused_container(&root_container); + swayc_t *focused = current_container; if (focused->parent->layout == L_VERT) { _do_split(argc - 1, argv + 1, L_HORIZ); } else { @@ -89,7 +89,7 @@ struct cmd_results *cmd_splith(int argc, char **argv) { } struct cmd_results *cmd_splitt(int argc, char **argv) { - swayc_t *focused = get_focused_container(&root_container); + swayc_t *focused = current_container; if (focused->parent->layout == L_VERT) { return _do_split(argc, argv, L_HORIZ); } else { -- cgit v1.2.3