Merge branch 'release-4.16.1'

[i3/i3] / src / assignments.c

diff --git a/src/assignments.c b/src/assignments.c
index 96834f648539d4bcb06c1778a4b6be65117845f4..abacc0a3658990b0e752749e6ff8146afdf24039 100644 (file)
--- a/src/assignments.c
+++ b/src/assignments.c
@@ -1,10 +1,8 @@
-#undef I3__FILE__
-#define I3__FILE__ "assignments.c"
 /*
  * 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).
  *
@@ -24,7 +22,7 @@ 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;
@@ -40,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);
-            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 */
+        /* 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, 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);
+
+        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. */
@@ -76,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;
     }