remove/shorten a lot of debugging messages

[i3/i3] / src / assignments.c

diff --git a/src/assignments.c b/src/assignments.c
index f41877f0a0b9eec59e56777f82f08499bc0fd427..1a586807b639d0b843241e3f58d1d802247a9091 100644 (file)
--- a/src/assignments.c
+++ b/src/assignments.c
@@ -4,6 +4,8 @@
  * i3 - an improved dynamic tiling window manager
  * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
  *
+ * assignments.c: Assignments for specific windows (for_window).
+ *
  */
 #include "all.h"
 
@@ -13,11 +15,11 @@
  *
  */
 void run_assignments(i3Window *window) {
-    DLOG("Checking assignments...\n");
+    DLOG("Checking if any assignments matches this window\n");
 
     /* Check if any assignments match */
     Assignment *current;
-    TAILQ_FOREACH(current, &real_assignments, real_assignments) {
+    TAILQ_FOREACH(current, &assignments, assignments) {
         if (!match_matches_window(&(current->match), window))
             continue;
 
@@ -39,7 +41,9 @@ void run_assignments(i3Window *window) {
             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);
+            char *json_result = parse_cmd(full_command);
+            FREE(full_command);
+            FREE(json_result);
         }
 
         /* Store that we ran this assignment to not execute it again */
@@ -48,3 +52,21 @@ void run_assignments(i3Window *window) {
         window->ran_assignments[window->nr_assignments-1] = current;
     }
 }
+
+/*
+ * Returns the first matching assignment for the given window.
+ *
+ */
+Assignment *assignment_for(i3Window *window, int type) {
+    Assignment *assignment;
+
+    TAILQ_FOREACH(assignment, &assignments, assignments) {
+        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);
+        return assignment;
+    }
+
+    return NULL;
+}