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.

1 files changed, 6 insertions, 6 deletions

diff --git a/sway/commands/resize.c b/sway/commands/resize.c
index 61af080c..ef52bb07 100644
--- a/sway/commands/resize.c
+++ b/sway/commands/resize.c
@@ -19,7 +19,7 @@ enum resize_dim_types {
 };
 
 static bool set_size_floating(int new_dimension, bool use_width) {
-        swayc_t *view = get_focused_float(swayc_active_workspace());
+        swayc_t *view = current_container;
         if (view) {
                 if (use_width) {
                         int current_width = view->width;
@@ -50,7 +50,7 @@ static bool set_size_floating(int new_dimension, bool use_width) {
 }
 
 static bool resize_floating(int amount, bool use_width) {
-        swayc_t *view = get_focused_float(swayc_active_workspace());
+        swayc_t *view = current_container;
 
         if (view) {
                 if (use_width) {
@@ -64,7 +64,7 @@ static bool resize_floating(int amount, bool use_width) {
 }
 
 static bool resize_tiled(int amount, bool use_width) {
-        swayc_t *container = get_focused_view(swayc_active_workspace());
+        swayc_t *container = current_container;
         swayc_t *parent = container->parent;
         int idx_focused = 0;
         bool use_major = false;
@@ -199,7 +199,7 @@ static bool resize_tiled(int amount, bool use_width) {
 
 static bool set_size_tiled(int amount, bool use_width) {
         int desired;
-        swayc_t *focused = get_focused_view(swayc_active_workspace());
+        swayc_t *focused = current_container;
 
         if (use_width) {
                 desired = amount - focused->width;
@@ -211,7 +211,7 @@ static bool set_size_tiled(int amount, bool use_width) {
 }
 
 static bool set_size(int dimension, bool use_width) {
-        swayc_t *focused = get_focused_view_include_floating(swayc_active_workspace());
+        swayc_t *focused = current_container;
 
         if (focused) {
                 if (focused->is_floating) {
@@ -225,7 +225,7 @@ static bool set_size(int dimension, bool use_width) {
 }
 
 static bool resize(int dimension, bool use_width, enum resize_dim_types dim_type) {
-        swayc_t *focused = get_focused_view_include_floating(swayc_active_workspace());
+        swayc_t *focused = current_container;
 
         // translate "10 ppt" (10%) to appropriate # of pixels in case we need it
         float ppt_dim = (float)dimension / 100;