+#undef I3__FILE__
+#define I3__FILE__ "match.c"
/*
* vim:ts=4:sw=4:expandtab
*
#include "all.h"
/* From sys/time.h, not sure if it’s available on all systems. */
-# define _i3_timercmp(a, b, CMP) \
- (((a).tv_sec == (b).tv_sec) ? \
- ((a).tv_usec CMP (b).tv_usec) : \
- ((a).tv_sec CMP (b).tv_sec))
+#define _i3_timercmp(a, b, CMP) \
+ (((a).tv_sec == (b).tv_sec) ? ((a).tv_usec CMP(b).tv_usec) : ((a).tv_sec CMP(b).tv_sec))
/*
* Initializes the Match data structure. This function is necessary because the
match->application == NULL &&
match->class == NULL &&
match->instance == NULL &&
- match->role == NULL &&
+ match->window_role == NULL &&
match->urgent == U_DONTCHECK &&
match->id == XCB_NONE &&
match->con_id == NULL &&
/* The DUPLICATE_REGEX macro creates a new regular expression from the
* ->pattern of the old one. It therefore does use a little more memory then
* with a refcounting system, but it’s easier this way. */
-#define DUPLICATE_REGEX(field) do { \
- if (src->field != NULL) \
- dest->field = regex_new(src->field->pattern); \
-} while (0)
+#define DUPLICATE_REGEX(field) \
+ do { \
+ if (src->field != NULL) \
+ dest->field = regex_new(src->field->pattern); \
+ } while (0)
DUPLICATE_REGEX(title);
DUPLICATE_REGEX(mark);
DUPLICATE_REGEX(application);
DUPLICATE_REGEX(class);
DUPLICATE_REGEX(instance);
- DUPLICATE_REGEX(role);
+ DUPLICATE_REGEX(window_role);
}
/*
}
if (match->title != NULL) {
- if (window->name_json != NULL &&
- regex_matches(match->title, window->name_json)) {
- LOG("title matches (%s)\n", window->name_json);
+ if (window->name != NULL &&
+ regex_matches(match->title, i3string_as_utf8(window->name))) {
+ LOG("title matches (%s)\n", i3string_as_utf8(window->name));
} else {
return false;
}
}
- if (match->role != NULL) {
+ if (match->window_role != NULL) {
if (window->role != NULL &&
- regex_matches(match->role, window->role)) {
+ regex_matches(match->window_role, window->role)) {
LOG("window_role matches (%s)\n", window->role);
} else {
return false;
/* if we find a window that is newer than this one, bail */
TAILQ_FOREACH(con, &all_cons, all_cons) {
if ((con->window != NULL) &&
- _i3_timercmp(con->window->urgent, window->urgent, >)) {
+ _i3_timercmp(con->window->urgent, window->urgent, > )) {
return false;
}
}
TAILQ_FOREACH(con, &all_cons, all_cons) {
if ((con->window != NULL) &&
(con->window->urgent.tv_sec != 0) &&
- _i3_timercmp(con->window->urgent, window->urgent, <)) {
+ _i3_timercmp(con->window->urgent, window->urgent, < )) {
return false;
}
}
if (match->dock != -1) {
if ((window->dock == W_DOCK_TOP && match->dock == M_DOCK_TOP) ||
- (window->dock == W_DOCK_BOTTOM && match->dock == M_DOCK_BOTTOM) ||
- ((window->dock == W_DOCK_TOP || window->dock == W_DOCK_BOTTOM) &&
- match->dock == M_DOCK_ANY) ||
- (window->dock == W_NODOCK && match->dock == M_NODOCK)) {
+ (window->dock == W_DOCK_BOTTOM && match->dock == M_DOCK_BOTTOM) ||
+ ((window->dock == W_DOCK_TOP || window->dock == W_DOCK_BOTTOM) &&
+ match->dock == M_DOCK_ANY) ||
+ (window->dock == W_NODOCK && match->dock == M_NODOCK)) {
LOG("dock status matches\n");
} else {
LOG("dock status does not match\n");
regex_free(match->class);
regex_free(match->instance);
regex_free(match->mark);
- regex_free(match->role);
+ regex_free(match->window_role);
/* Second step: free the regex helper struct itself */
FREE(match->title);
FREE(match->class);
FREE(match->instance);
FREE(match->mark);
- FREE(match->role);
+ FREE(match->window_role);
}