X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fmatch.c;h=f1bc8430d45fca43db596b293dd71bfed959304d;hb=55e8d06ee4f9dbb190c18198cac7c6e9f137f11a;hp=745989ba6ef378c5b59755f0eac8a01a6a8a39b5;hpb=0482dc754681eb8bf0c05ed46943b066813dae0c;p=i3%2Fi3

diff --git a/src/match.c b/src/match.c
index 745989ba..f1bc8430 100644
--- a/src/match.c
+++ b/src/match.c
@@ -1,8 +1,10 @@
+#undef I3__FILE__
+#define I3__FILE__ "match.c"
 /*
  * 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
@@ -11,9 +13,12 @@
  * match_matches_window() to find the windows affected by this command.
  *
  */
-
 #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))
+
 /*
  * Initializes the Match data structure. This function is necessary because the
  * members representing boolean values (like dock) need to be initialized with
@@ -22,7 +27,10 @@
  */
 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;
 }
 
 /*
@@ -39,8 +47,10 @@ bool match_is_empty(Match *match) {
             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->window_type == UINT32_MAX &&
             match->con_id == NULL &&
             match->dock == -1 &&
             match->floating == M_ANY);
@@ -56,17 +66,18 @@ void match_copy(Match *dest, Match *src) {
 /* 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);
 }
 
 /*
@@ -74,14 +85,13 @@ void match_copy(Match *dest, Match *src) {
  *
  */
 bool match_matches_window(Match *match, i3Window *window) {
-    LOG("checking window %d (%s)\n", window->id, window->class_class);
+    LOG("Checking window 0x%08x (class %s)\n", window->id, window->class_class);
 
     if (match->class != NULL) {
         if (window->class_class != NULL &&
             regex_matches(match->class, window->class_class)) {
             LOG("window class matches (%s)\n", window->class_class);
         } else {
-            LOG("window class does not match\n");
             return false;
         }
     }
@@ -91,7 +101,6 @@ bool match_matches_window(Match *match, i3Window *window) {
             regex_matches(match->instance, window->class_instance)) {
             LOG("window instance matches (%s)\n", window->class_instance);
         } else {
-            LOG("window instance does not match\n");
             return false;
         }
     }
@@ -106,32 +115,69 @@ bool match_matches_window(Match *match, i3Window *window) {
     }
 
     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 {
-            LOG("title does not match\n");
             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 {
-            LOG("window_role does not match\n");
             return false;
         }
     }
 
-    if (match->dock != -1) {
-        LOG("match->dock = %d, window->dock = %d\n", match->dock, window->dock);
+    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 (window->urgent.tv_sec == 0) {
+            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, > )) {
+                return false;
+            }
+        }
+        LOG("urgent matches latest\n");
+    }
+
+    if (match->urgent == U_OLDEST) {
+        /* if the window isn't urgent, no sense in searching */
+        if (window->urgent.tv_sec == 0) {
+            return false;
+        }
+        /* if we find a window that is older than this one (and not 0), bail */
+        TAILQ_FOREACH(con, &all_cons, all_cons) {
+            if ((con->window != NULL) &&
+                (con->window->urgent.tv_sec != 0) &&
+                _i3_timercmp(con->window->urgent, window->urgent, < )) {
+                return false;
+            }
+        }
+        LOG("urgent matches oldest\n");
+    }
+
+    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");
@@ -160,7 +206,7 @@ void match_free(Match *match) {
     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);
@@ -168,5 +214,5 @@ void match_free(Match *match) {
     FREE(match->class);
     FREE(match->instance);
     FREE(match->mark);
-    FREE(match->role);
+    FREE(match->window_role);
 }