X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fassignments.c;h=a0f5d5a747b79f02c23d1dfe478b5ef59c9e03ae;hb=363417e01067efe2fce43f9bb47a2607c455d0ea;hp=f171dc3b2fe0cc48f51a49a6074ad9f65bb56ea3;hpb=22bac9fd9a6b3a2bf12aea124c519e2c9f22f855;p=i3%2Fi3

diff --git a/src/assignments.c b/src/assignments.c
index f171dc3b..a0f5d5a7 100644
--- a/src/assignments.c
+++ b/src/assignments.c
@@ -2,7 +2,9 @@
  * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
- * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
+ * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
+ *
+ * assignments.c: Assignments for specific windows (for_window).
  *
  */
 #include "all.h"
@@ -13,7 +15,9 @@
  *
  */
 void run_assignments(i3Window *window) {
-    DLOG("Checking assignments...\n");
+    DLOG("Checking if any assignments match this window\n");
+
+    bool needs_tree_render = false;
 
     /* Check if any assignments match */
     Assignment *current;
@@ -22,7 +26,7 @@ void run_assignments(i3Window *window) {
             continue;
 
         bool skip = false;
-        for (int c = 0; c < window->nr_assignments; c++) {
+        for (uint32_t c = 0; c < window->nr_assignments; c++) {
             if (window->ran_assignments[c] != current)
                 continue;
 
@@ -34,19 +38,31 @@ void run_assignments(i3Window *window) {
         if (skip)
             continue;
 
+        /* Store that we ran this assignment to not execute it again. We have
+         * to do this before running the actual command to prevent infinite
+         * loops. */
+        window->nr_assignments++;
+        window->ran_assignments = srealloc(window->ran_assignments, sizeof(Assignment *) * window->nr_assignments);
+        window->ran_assignments[window->nr_assignments - 1] = current;
+
         DLOG("matching assignment, would do:\n");
         if (current->type == A_COMMAND) {
             DLOG("execute command %s\n", current->dest.command);
             char *full_command;
-            asprintf(&full_command, "[id=\"%d\"] %s", window->id, current->dest.command);
-            parse_cmd(full_command);
-        }
+            sasprintf(&full_command, "[id=\"%d\"] %s", window->id, current->dest.command);
+            CommandResult *result = parse_command(full_command, NULL);
+            free(full_command);
 
-        /* Store that we ran this assignment to not execute it again */
-        window->nr_assignments++;
-        window->ran_assignments = srealloc(window->ran_assignments, sizeof(Assignment*) * window->nr_assignments);
-        window->ran_assignments[window->nr_assignments-1] = current;
+            if (result->needs_tree_render)
+                needs_tree_render = true;
+
+            command_result_free(result);
+        }
     }
+
+    /* If any of the commands required re-rendering, we will do that now. */
+    if (needs_tree_render)
+        tree_render();
 }
 
 /*
@@ -60,7 +76,7 @@ Assignment *assignment_for(i3Window *window, int type) {
         if ((type != A_ANY && (assignment->type & type) == 0) ||
             !match_matches_window(&(assignment->match), window))
             continue;
-        DLOG("got a matching assignment (to %s)\n", assignment->dest.workspace);
+        DLOG("got a matching assignment\n");
         return assignment;
     }