add support for transient windows in client patterns, and merge a few more changes from pre-devel

1 files changed, 13 insertions, 1 deletions

diff --git a/src/ClientPattern.cc b/src/ClientPattern.cc
index 9324bee..538b708 100644
--- a/src/ClientPattern.cc
+++ b/src/ClientPattern.cc
@@ -60,7 +60,7 @@ ClientPattern::ClientPattern():
     m_nummatches(0) {}
 
 // parse the given pattern (to end of line)
-ClientPattern::ClientPattern(const char *str):
+ClientPattern::ClientPattern(const char *str, bool default_no_transient):
     m_matchlimit(0),
     m_nummatches(0)
 {
@@ -107,6 +107,9 @@ ClientPattern::ClientPattern(const char *str):
                 prop = TITLE;
             } else if (strcasecmp(memstr.c_str(), "role") == 0) {
                 prop = ROLE;
+            } else if (strcasecmp(memstr.c_str(), "transient") == 0) {
+                prop = TRANSIENT;
+                default_no_transient = false;
             } else if (strcasecmp(memstr.c_str(), "maximized") == 0) {
                 prop = MAXIMIZED;
             } else if (strcasecmp(memstr.c_str(), "minimized") == 0) {
@@ -138,6 +141,9 @@ ClientPattern::ClientPattern(const char *str):
         had_error = true;
     }
 
+    if (default_no_transient)
+        had_error = !addTerm("no", TRANSIENT);
+
     if (!had_error) {
         // otherwise, we check for a number
         string number;
@@ -201,6 +207,9 @@ string ClientPattern::toString() const {
         case ROLE:
             pat.append("role=");
             break;
+        case TRANSIENT:
+            pat.append("transient=");
+            break;
         case MAXIMIZED:
             pat.append("maximized=");
             break;
@@ -307,6 +316,9 @@ string ClientPattern::getProperty(WinProperty prop,
     case ROLE:
         return client.getWMRole();
         break;
+    case TRANSIENT:
+        return client.isTransient() ? "yes" : "no";
+        break;
     case MAXIMIZED:
         return (fbwin && fbwin->isMaximized()) ? "yes" : "no";
         break;