*/
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;
match->id == XCB_NONE &&
match->window_type == UINT32_MAX &&
match->con_id == NULL &&
- match->dock == -1 &&
+ match->dock == M_NODOCK &&
match->floating == M_ANY);
}
}
}
- /* 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;
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 ||