Revert "Merge pull request #1943 from RyanDwyer/criteria-improvements"

This reverts commit 3e1bf721c69cb6df70c3dc3d3d4933e987339676, reversing
changes made to 2217518bd554d0f11dafa7ec4e8f35f2e4762fbd.

2 files changed, 55 insertions, 38 deletions

diff --git a/sway/commands/assign.c b/sway/commands/assign.c
index 9d15e166..eb7329aa 100644
--- a/sway/commands/assign.c
+++ b/sway/commands/assign.c
@@ -5,7 +5,6 @@
 #include "sway/criteria.h"
 #include "list.h"
 #include "log.h"
-#include "stringop.h"
 
 struct cmd_results *cmd_assign(int argc, char **argv) {
         struct cmd_results *error = NULL;
@@ -13,39 +12,46 @@ struct cmd_results *cmd_assign(int argc, char **argv) {
                 return error;
         }
 
-        // Create criteria
-        char *err_str = NULL;
-        struct criteria *criteria = criteria_parse(argv[0], &err_str);
-        if (!criteria) {
-                error = cmd_results_new(CMD_INVALID, "assign", err_str);
-                free(err_str);
-                return error;
-        }
-
-        ++argv;
-        int target_len = argc - 1;
+        char *criteria = *argv++;
 
         if (strncmp(*argv, "→", strlen("→")) == 0) {
                 if (argc < 3) {
                         return cmd_results_new(CMD_INVALID, "assign", "Missing workspace");
                 }
-                ++argv;
-                --target_len;
+                argv++;
         }
 
-        if (strcmp(*argv, "output") == 0) {
-                criteria->type = CT_ASSIGN_OUTPUT;
-                ++argv;
-                --target_len;
-        } else {
-                criteria->type = CT_ASSIGN_WORKSPACE;
+        char *movecmd = "move container to workspace ";
+        size_t arglen = strlen(movecmd) + strlen(*argv) + 1;
+        char *cmdlist = calloc(1, arglen);
+        if (!cmdlist) {
+                return cmd_results_new(CMD_FAILURE, "assign", "Unable to allocate command list");
         }
+        snprintf(cmdlist, arglen, "%s%s", movecmd, *argv);
 
-        criteria->target = join_args(argv, target_len);
-
-        list_add(config->criteria, criteria);
-        wlr_log(L_DEBUG, "assign: '%s' -> '%s' added", criteria->raw,
-                        criteria->target);
+        struct criteria *crit = malloc(sizeof(struct criteria));
+        if (!crit) {
+                free(cmdlist);
+                return cmd_results_new(CMD_FAILURE, "assign", "Unable to allocate criteria");
+        }
+        crit->crit_raw = strdup(criteria);
+        crit->cmdlist = cmdlist;
+        crit->tokens = create_list();
+        char *err_str = extract_crit_tokens(crit->tokens, crit->crit_raw);
 
-        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+        if (err_str) {
+                error = cmd_results_new(CMD_INVALID, "assign", err_str);
+                free(err_str);
+                free_criteria(crit);
+        } else if (crit->tokens->length == 0) {
+                error = cmd_results_new(CMD_INVALID, "assign", "Found no name/value pairs in criteria");
+                free_criteria(crit);
+        } else if (list_seq_find(config->criteria, criteria_cmp, crit) != -1) {
+                wlr_log(L_DEBUG, "assign: Duplicate, skipping.");
+                free_criteria(crit);
+        } else {
+                wlr_log(L_DEBUG, "assign: '%s' -> '%s' added", crit->crit_raw, crit->cmdlist);
+                list_add(config->criteria, crit);
+        }
+        return error ? error : cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }
diff --git a/sway/commands/for_window.c b/sway/commands/for_window.c
index 8c425a1d..dd5461f0 100644
--- a/sway/commands/for_window.c
+++ b/sway/commands/for_window.c
@@ -11,20 +11,31 @@ struct cmd_results *cmd_for_window(int argc, char **argv) {
         if ((error = checkarg(argc, "for_window", EXPECTED_AT_LEAST, 2))) {
                 return error;
         }
+        // add command to a criteria/command pair that is run against views when they appear.
+        char *criteria = argv[0], *cmdlist = join_args(argv + 1, argc - 1);
 
-        char *err_str = NULL;
-        struct criteria *criteria = criteria_parse(argv[0], &err_str);
-        if (!criteria) {
+        struct criteria *crit = calloc(sizeof(struct criteria), 1);
+        if (!crit) {
+                return cmd_results_new(CMD_FAILURE, "for_window", "Unable to allocate criteria");
+        }
+        crit->crit_raw = strdup(criteria);
+        crit->cmdlist = cmdlist;
+        crit->tokens = create_list();
+        char *err_str = extract_crit_tokens(crit->tokens, crit->crit_raw);
+
+        if (err_str) {
                 error = cmd_results_new(CMD_INVALID, "for_window", err_str);
                 free(err_str);
-                return error;
+                free_criteria(crit);
+        } else if (crit->tokens->length == 0) {
+                error = cmd_results_new(CMD_INVALID, "for_window", "Found no name/value pairs in criteria");
+                free_criteria(crit);
+        } else if (list_seq_find(config->criteria, criteria_cmp, crit) != -1) {
+                wlr_log(L_DEBUG, "for_window: Duplicate, skipping.");
+                free_criteria(crit);
+        } else {
+                wlr_log(L_DEBUG, "for_window: '%s' -> '%s' added", crit->crit_raw, crit->cmdlist);
+                list_add(config->criteria, crit);
         }
-
-        criteria->type = CT_COMMAND;
-        criteria->cmdlist = join_args(argv + 1, argc - 1);
-
-        list_add(config->criteria, criteria);
-        wlr_log(L_DEBUG, "for_window: '%s' -> '%s' added", criteria->raw, criteria->cmdlist);
-
-        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+        return error ? error : cmd_results_new(CMD_SUCCESS, NULL, NULL);
 }