aboutsummaryrefslogtreecommitdiffstats
path: root/sway/commands/fullscreen.c
diff options
context:
space:
mode:
authorLibravatar Calvin Lee <cyrus296@gmail.com>2017-04-04 21:20:27 -0600
committerLibravatar Calvin Lee <cyrus296@gmail.com>2017-04-05 22:07:23 -0600
commit069d37f987c4e323cdb9396f0d80ac83d00566ff (patch)
treeb883a5553107ab24d5346db42062518f9e7bdca9 /sway/commands/fullscreen.c
parentMerge pull request #1145 from 4e554c4c/marks (diff)
downloadsway-069d37f987c4e323cdb9396f0d80ac83d00566ff.tar.gz
sway-069d37f987c4e323cdb9396f0d80ac83d00566ff.tar.zst
sway-069d37f987c4e323cdb9396f0d80ac83d00566ff.zip
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/fullscreen.c')
-rw-r--r--sway/commands/fullscreen.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/commands/fullscreen.c b/sway/commands/fullscreen.c
index 321d6f59..bfff82f9 100644
--- a/sway/commands/fullscreen.c
+++ b/sway/commands/fullscreen.c
@@ -14,7 +14,7 @@ struct cmd_results *cmd_fullscreen(int argc, char **argv) {
14 if ((error = checkarg(argc, "fullscreen", EXPECTED_AT_LEAST, 0))) { 14 if ((error = checkarg(argc, "fullscreen", EXPECTED_AT_LEAST, 0))) {
15 return error; 15 return error;
16 } 16 }
17 swayc_t *container = get_focused_view(&root_container); 17 swayc_t *container = current_container;
18 if(container->type != C_VIEW){ 18 if(container->type != C_VIEW){
19 return cmd_results_new(CMD_INVALID, "fullscreen", "Only views can fullscreen"); 19 return cmd_results_new(CMD_INVALID, "fullscreen", "Only views can fullscreen");
20 } 20 }