}
}
- /* 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;
*
*/
void match_free(Match *match) {
- /* First step: free the regex fields / patterns */
+ FREE(match->error);
regex_free(match->title);
regex_free(match->application);
regex_free(match->class);
regex_free(match->instance);
regex_free(match->mark);
regex_free(match->window_role);
-
- /* Second step: free the regex helper struct itself */
- FREE(match->title);
- FREE(match->application);
- FREE(match->class);
- FREE(match->instance);
- FREE(match->mark);
- FREE(match->window_role);
+ regex_free(match->workspace);
}
/*
DLOG("ctype=*%s*, cvalue=*%s*\n", ctype, cvalue);
if (strcmp(ctype, "class") == 0) {
+ regex_free(match->class);
match->class = regex_new(cvalue);
return;
}
if (strcmp(ctype, "instance") == 0) {
+ regex_free(match->instance);
match->instance = regex_new(cvalue);
return;
}
if (strcmp(ctype, "window_role") == 0) {
+ regex_free(match->window_role);
match->window_role = regex_new(cvalue);
return;
}
if (strcmp(ctype, "con_id") == 0) {
+ if (strcmp(cvalue, "__focused__") == 0) {
+ match->con_id = focused;
+ return;
+ }
+
char *end;
- long parsed = strtol(cvalue, &end, 10);
+ long parsed = strtol(cvalue, &end, 0);
if (parsed == LONG_MIN ||
parsed == LONG_MAX ||
parsed < 0 ||
(end && *end != '\0')) {
ELOG("Could not parse con id \"%s\"\n", cvalue);
+ match->error = sstrdup("invalid con_id");
} else {
match->con_id = (Con *)parsed;
DLOG("id as int = %p\n", match->con_id);
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 ||
(end && *end != '\0')) {
ELOG("Could not parse window id \"%s\"\n", cvalue);
+ match->error = sstrdup("invalid id");
} else {
match->id = parsed;
DLOG("window id as int = %d\n", match->id);
}
if (strcmp(ctype, "window_type") == 0) {
- if (strcasecmp(cvalue, "normal") == 0)
+ if (strcasecmp(cvalue, "normal") == 0) {
match->window_type = A__NET_WM_WINDOW_TYPE_NORMAL;
- else if (strcasecmp(cvalue, "dialog") == 0)
+ } else if (strcasecmp(cvalue, "dialog") == 0) {
match->window_type = A__NET_WM_WINDOW_TYPE_DIALOG;
- else if (strcasecmp(cvalue, "utility") == 0)
+ } else if (strcasecmp(cvalue, "utility") == 0) {
match->window_type = A__NET_WM_WINDOW_TYPE_UTILITY;
- else if (strcasecmp(cvalue, "toolbar") == 0)
+ } else if (strcasecmp(cvalue, "toolbar") == 0) {
match->window_type = A__NET_WM_WINDOW_TYPE_TOOLBAR;
- else if (strcasecmp(cvalue, "splash") == 0)
+ } else if (strcasecmp(cvalue, "splash") == 0) {
match->window_type = A__NET_WM_WINDOW_TYPE_SPLASH;
- else if (strcasecmp(cvalue, "menu") == 0)
+ } else if (strcasecmp(cvalue, "menu") == 0) {
match->window_type = A__NET_WM_WINDOW_TYPE_MENU;
- else if (strcasecmp(cvalue, "dropdown_menu") == 0)
+ } else if (strcasecmp(cvalue, "dropdown_menu") == 0) {
match->window_type = A__NET_WM_WINDOW_TYPE_DROPDOWN_MENU;
- else if (strcasecmp(cvalue, "popup_menu") == 0)
+ } else if (strcasecmp(cvalue, "popup_menu") == 0) {
match->window_type = A__NET_WM_WINDOW_TYPE_POPUP_MENU;
- else if (strcasecmp(cvalue, "tooltip") == 0)
+ } else if (strcasecmp(cvalue, "tooltip") == 0) {
match->window_type = A__NET_WM_WINDOW_TYPE_TOOLTIP;
- else
+ } else if (strcasecmp(cvalue, "notification") == 0) {
+ match->window_type = A__NET_WM_WINDOW_TYPE_NOTIFICATION;
+ } else {
ELOG("unknown window_type value \"%s\"\n", cvalue);
+ match->error = sstrdup("unknown window_type value");
+ }
return;
}
if (strcmp(ctype, "con_mark") == 0) {
+ regex_free(match->mark);
match->mark = regex_new(cvalue);
return;
}
if (strcmp(ctype, "title") == 0) {
+ regex_free(match->title);
match->title = regex_new(cvalue);
return;
}
}
if (strcmp(ctype, "workspace") == 0) {
+ regex_free(match->workspace);
match->workspace = regex_new(cvalue);
return;
}