Merge branch 'master' into next

[i3/i3] / src / assignments.c

diff --git a/src/assignments.c b/src/assignments.c
index f171dc3b2fe0cc48f51a49a6074ad9f65bb56ea3..09793c38d7b456f9f4375b760bde9b7a930c21db 100644 (file)
--- 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-2012 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;
@@ -38,8 +42,14 @@ void run_assignments(i3Window *window) {
         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);
+            struct CommandResult *command_output = parse_command(full_command);
+            free(full_command);
+
+            if (command_output->needs_tree_render)
+                needs_tree_render = true;
+
+            free(command_output->json_output);
         }
 
         /* Store that we ran this assignment to not execute it again */
@@ -47,6 +57,10 @@ void run_assignments(i3Window *window) {
         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();
 }
 
 /*