* vim:ts=4:sw=4:expandtab
*
* i3 - an improved dynamic tiling window manager
- * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
+ * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
*
* A "match" is a data structure which acts like a mask or expression to match
* certain windows or not. For example, when using commands, you can specify a
#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
*/
void match_init(Match *match) {
memset(match, 0, sizeof(Match));
- match->dock = -1;
+ match->dock = M_DONTCHECK;
match->urgent = U_DONTCHECK;
+ /* we use this as the placeholder value for "not set". */
+ match->window_type = UINT32_MAX;
}
/*
match->window_role == NULL &&
match->urgent == U_DONTCHECK &&
match->id == XCB_NONE &&
+ match->window_type == UINT32_MAX &&
match->con_id == NULL &&
match->dock == -1 &&
match->floating == M_ANY);
/* 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);
}
}
+ if (match->window_type != UINT32_MAX) {
+ if (window->window_type == match->window_type) {
+ LOG("window_type matches (%i)\n", match->window_type);
+ } else {
+ return false;
+ }
+ }
+
Con *con = NULL;
if (match->urgent == U_LATEST) {
/* if the window isn't urgent, no sense in searching */
/* 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;
}
}
LOG("urgent matches oldest\n");
}
- if (match->dock != -1) {
+ if (match->dock != M_DONTCHECK) {
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");