Refactor parse_command

[i3/i3] / src / assignments.c

diff --git a/src/assignments.c b/src/assignments.c
index f171dc3b2fe0cc48f51a49a6074ad9f65bb56ea3..23c91081d6f7fe326848b162b3b952d648ba4de7 100644 (file)
--- a/src/assignments.c
+++ b/src/assignments.c
@@ -1,8 +1,12 @@
+#undef I3__FILE__
+#define I3__FILE__ "assignments.c"
 /*
  * 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 +17,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 +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;
 
@@ -38,8 +44,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);
+            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 */
@@ -47,6 +59,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();
 }
 
 /*