Merge branch 'master' into next

[i3/i3] / src / assignments.c

diff --git a/src/assignments.c b/src/assignments.c
index 05da75546a39636f1939682f9d4a005b792d5bb1..96834f648539d4bcb06c1778a4b6be65117845f4 100644 (file)
--- a/src/assignments.c
+++ b/src/assignments.c
@@ -1,3 +1,5 @@
+#undef I3__FILE__
+#define I3__FILE__ "assignments.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *
@@ -17,6 +19,8 @@
 void run_assignments(i3Window *window) {
     DLOG("Checking if any assignments match this window\n");
 
+    bool needs_tree_render = false;
+
     /* Check if any assignments match */
     Assignment *current;
     TAILQ_FOREACH(current, &assignments, assignments) {
@@ -24,7 +28,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;
 
@@ -41,16 +45,24 @@ void run_assignments(i3Window *window) {
             DLOG("execute command %s\n", current->dest.command);
             char *full_command;
             sasprintf(&full_command, "[id=\"%d\"] %s", window->id, current->dest.command);
-            char *json_result = parse_command(full_command);
-            FREE(full_command);
-            FREE(json_result);
+            CommandResult *result = parse_command(full_command, NULL);
+            free(full_command);
+
+            if (result->needs_tree_render)
+                needs_tree_render = true;
+
+            command_result_free(result);
         }
 
         /* 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;
+        window->ran_assignments = srealloc(window->ran_assignments, sizeof(Assignment *) * window->nr_assignments);
+        window->ran_assignments[window->nr_assignments - 1] = current;
     }
+
+    /* If any of the commands required re-rendering, we will do that now. */
+    if (needs_tree_render)
+        tree_render();
 }
 
 /*