X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fmatch.c;h=ba87eb236fb8fe737255b54391eb394f1268e801;hb=1437271e6568ab627536d85babd7a9f9f2fe7ae3;hp=bbb239ac7d0a2ae7119c617d733636de2dafed4b;hpb=33f017daa9f6c48e0d9c5bcb6135b47a0b32bf76;p=i3%2Fi3

diff --git a/src/match.c b/src/match.c
index bbb239ac..ba87eb23 100644
--- a/src/match.c
+++ b/src/match.c
@@ -27,7 +27,6 @@
  */
 void match_init(Match *match) {
     memset(match, 0, sizeof(Match));
-    match->dock = M_DONTCHECK;
     match->urgent = U_DONTCHECK;
     /* we use this as the placeholder value for "not set". */
     match->window_type = UINT32_MAX;
@@ -53,7 +52,7 @@ bool match_is_empty(Match *match) {
             match->id == XCB_NONE &&
             match->window_type == UINT32_MAX &&
             match->con_id == NULL &&
-            match->dock == -1 &&
+            match->dock == M_NODOCK &&
             match->floating == M_ANY);
 }
 
@@ -223,11 +222,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;
@@ -297,7 +310,7 @@ void match_parse_property(Match *match, const char *ctype, const char *cvalue) {
 
     if (strcmp(ctype, "id") == 0) {
         char *end;
-        long parsed = strtol(cvalue, &end, 10);
+        long parsed = strtol(cvalue, &end, 0);
         if (parsed == LONG_MIN ||
             parsed == LONG_MAX ||
             parsed < 0 ||