i3-nagbar: explicitly set cursor using libxcursor if available

[i3/i3] / src / match.c

diff --git a/src/match.c b/src/match.c
index ca64df6944455a3bf669d0f2eb861fb117506597..d072b85fabada5d5268af7d8a9dfb178edee8acd 100644 (file)
--- a/src/match.c
+++ b/src/match.c
@@ -223,11 +223,25 @@ bool match_matches_window(Match *match, i3Window *window) {
         }
     }
 
-    /* We don’t check the mark because this function is not even called when
-     * the mark would have matched - it is checked in cmdparse.y itself */
     if (match->mark != NULL) {
-        LOG("mark does not match\n");
-        return false;
+        if ((con = con_by_window_id(window->id)) == NULL)
+            return false;
+
+        bool matched = false;
+        mark_t *mark;
+        TAILQ_FOREACH(mark, &(con->marks_head), marks) {
+            if (regex_matches(match->mark, mark->name)) {
+                matched = true;
+                break;
+            }
+        }
+
+        if (matched) {
+            LOG("mark matches\n");
+        } else {
+            LOG("mark does not match\n");
+            return false;
+        }
     }
 
     return true;