Merge branch 'master' into next

[i3/i3] / src / match.c

diff --git a/src/match.c b/src/match.c
index c460d422fcd60bb8d7ba6b30beca43b2413dc4e8..350a2c11d0e115091e01ab7af96a31af55e29ebd 100644 (file)
--- a/src/match.c
+++ b/src/match.c
@@ -1,3 +1,5 @@
+#undef I3__FILE__
+#define I3__FILE__ "match.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *
@@ -13,6 +15,12 @@
  */
 #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
@@ -105,9 +113,9 @@ 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 {
             return false;
         }
@@ -125,13 +133,13 @@ bool match_matches_window(Match *match, i3Window *window) {
     Con *con = NULL;
     if (match->urgent == U_LATEST) {
         /* if the window isn't urgent, no sense in searching */
-        if (window->urgent == 0) {
+        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) &&
-                (con->window->urgent > window->urgent)) {
+                _i3_timercmp(con->window->urgent, window->urgent, >)) {
                 return false;
             }
         }
@@ -140,14 +148,14 @@ bool match_matches_window(Match *match, i3Window *window) {
 
     if (match->urgent == U_OLDEST) {
         /* if the window isn't urgent, no sense in searching */
-        if (window->urgent == 0) {
+        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 != 0) &&
-                (con->window->urgent < window->urgent)) {
+                (con->window->urgent.tv_sec != 0) &&
+                _i3_timercmp(con->window->urgent, window->urgent, <)) {
                 return false;
             }
         }