1 files changed, 20 insertions, 13 deletions

diff --git a/sway/criteria.c b/sway/criteria.c
index 97cf667e..e16b4fa8 100644
--- a/sway/criteria.c
+++ b/sway/criteria.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdbool.h>
@@ -19,6 +18,7 @@
 bool criteria_is_empty(struct criteria *criteria) {
         return !criteria->title
                 && !criteria->shell
+                && !criteria->all
                 && !criteria->app_id
                 && !criteria->con_mark
                 && !criteria->con_id
@@ -96,7 +96,8 @@ void criteria_destroy(struct criteria *criteria) {
         pattern_destroy(criteria->window_role);
 #endif
         pattern_destroy(criteria->con_mark);
-        free(criteria->workspace);
+        pattern_destroy(criteria->workspace);
+        free(criteria->target);
         free(criteria->cmdlist);
         free(criteria->raw);
         free(criteria);
@@ -189,7 +190,7 @@ static bool criteria_matches_view(struct criteria *criteria,
         if (criteria->title) {
                 const char *title = view_get_title(view);
                 if (!title) {
-                        return false;
+                        title = "";
                 }
 
                 switch (criteria->title->match_type) {
@@ -209,7 +210,7 @@ static bool criteria_matches_view(struct criteria *criteria,
         if (criteria->shell) {
                 const char *shell = view_get_shell(view);
                 if (!shell) {
-                        return false;
+                        shell = "";
                 }
 
                 switch (criteria->shell->match_type) {
@@ -229,7 +230,7 @@ static bool criteria_matches_view(struct criteria *criteria,
         if (criteria->app_id) {
                 const char *app_id = view_get_app_id(view);
                 if (!app_id) {
-                        return false;
+                        app_id = "";
                 }
 
                 switch (criteria->app_id->match_type) {
@@ -261,7 +262,7 @@ static bool criteria_matches_view(struct criteria *criteria,
         if (criteria->class) {
                 const char *class = view_get_class(view);
                 if (!class) {
-                        return false;
+                        class = "";
                 }
 
                 switch (criteria->class->match_type) {
@@ -281,12 +282,12 @@ static bool criteria_matches_view(struct criteria *criteria,
         if (criteria->instance) {
                 const char *instance = view_get_instance(view);
                 if (!instance) {
-                        return false;
+                        instance = "";
                 }
 
                 switch (criteria->instance->match_type) {
                 case PATTERN_FOCUSED:
-                        if (focused && strcmp(instance, view_get_instance(focused))) {
+                        if (focused && lenient_strcmp(instance, view_get_instance(focused))) {
                                 return false;
                         }
                         break;
@@ -301,12 +302,12 @@ static bool criteria_matches_view(struct criteria *criteria,
         if (criteria->window_role) {
                 const char *window_role = view_get_window_role(view);
                 if (!window_role) {
-                        return false;
+                        window_role = "";
                 }
 
                 switch (criteria->window_role->match_type) {
                 case PATTERN_FOCUSED:
-                        if (focused && strcmp(window_role, view_get_window_role(focused))) {
+                        if (focused && lenient_strcmp(window_role, view_get_window_role(focused))) {
                                 return false;
                         }
                         break;
@@ -455,6 +456,7 @@ static enum atom_name parse_window_type(const char *type) {
 #endif
 
 enum criteria_token {
+        T_ALL,
         T_APP_ID,
         T_CON_ID,
         T_CON_MARK,
@@ -477,7 +479,9 @@ enum criteria_token {
 };
 
 static enum criteria_token token_from_name(char *name) {
-        if (strcmp(name, "app_id") == 0) {
+        if (strcmp(name, "all") == 0) {
+                return T_ALL;
+        } else if (strcmp(name, "app_id") == 0) {
                 return T_APP_ID;
         } else if (strcmp(name, "con_id") == 0) {
                 return T_CON_ID;
@@ -523,8 +527,8 @@ static bool parse_token(struct criteria *criteria, char *name, char *value) {
                 return false;
         }
 
-        // Require value, unless token is floating or tiled
-        if (!value && token != T_FLOATING && token != T_TILING) {
+        // Require value, unless token is all, floating or tiled
+        if (!value && token != T_ALL && token != T_FLOATING && token != T_TILING) {
                 const char *fmt = "Token '%s' requires a value";
                 int len = strlen(fmt) + strlen(name) - 1;
                 error = malloc(len);
@@ -534,6 +538,9 @@ static bool parse_token(struct criteria *criteria, char *name, char *value) {
 
         char *endptr = NULL;
         switch (token) {
+        case T_ALL:
+                criteria->all = true;
+                break;
         case T_TITLE:
                 pattern_create(&criteria->title, value);
                 break;