X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fassignments.c;h=abacc0a3658990b0e752749e6ff8146afdf24039;hb=9380a75186f8d2adcf572a3741168f12351faa9b;hp=ae4affaa53ce82421562e9404911e38d63d2ddd6;hpb=bbe607899cac72d8cbc0222a1a8b502a5932fef8;p=i3%2Fi3

diff --git a/src/assignments.c b/src/assignments.c
index ae4affaa..abacc0a3 100644
--- a/src/assignments.c
+++ b/src/assignments.c
@@ -2,7 +2,7 @@
  * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
- * © 2009-2012 Michael Stapelberg and contributors (see also: LICENSE)
+ * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * assignments.c: Assignments for specific windows (for_window).
  *
@@ -22,11 +22,11 @@ void run_assignments(i3Window *window) {
     /* Check if any assignments match */
     Assignment *current;
     TAILQ_FOREACH(current, &assignments, assignments) {
-        if (!match_matches_window(&(current->match), window))
+        if (current->type != A_COMMAND || !match_matches_window(&(current->match), 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,24 +38,23 @@ void run_assignments(i3Window *window) {
         if (skip)
             continue;
 
-        DLOG("matching assignment, would do:\n");
-        if (current->type == A_COMMAND) {
-            DLOG("execute command %s\n", current->dest.command);
-            char *full_command;
-            sasprintf(&full_command, "[id=\"%d\"] %s", window->id, current->dest.command);
-            struct CommandResult *command_output = parse_command(full_command);
-            free(full_command);
+        /* 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;
 
-            if (command_output->needs_tree_render)
-                needs_tree_render = true;
+        DLOG("matching assignment, execute command %s\n", current->dest.command);
+        char *full_command;
+        sasprintf(&full_command, "[id=\"%d\"] %s", window->id, current->dest.command);
+        CommandResult *result = parse_command(full_command, NULL);
+        free(full_command);
 
-            yajl_gen_free(command_output->json_gen);
-        }
+        if (result->needs_tree_render)
+            needs_tree_render = true;
 
-        /* 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;
+        command_result_free(result);
     }
 
     /* If any of the commands required re-rendering, we will do that now. */
@@ -74,7 +73,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;
     }