aboutsummaryrefslogtreecommitdiff
path: root/src/ClientPattern.hh
diff options
context:
space:
mode:
authormarkt <markt>2007-10-13 21:51:37 (GMT)
committermarkt <markt>2007-10-13 21:51:37 (GMT)
commita59428d67a95a9df16554962f0a6257d6378328a (patch)
treef856ed9300c34f7a17d499f22d895610cfbc08e5 /src/ClientPattern.hh
parent41b5c6dadb1f474675660cef18b812d4c2338ed2 (diff)
downloadfluxbox_pavel-a59428d67a95a9df16554962f0a6257d6378328a.zip
fluxbox_pavel-a59428d67a95a9df16554962f0a6257d6378328a.tar.bz2
merged changes from pre-devel
Diffstat (limited to 'src/ClientPattern.hh')
-rw-r--r--src/ClientPattern.hh16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/ClientPattern.hh b/src/ClientPattern.hh
index 7610e77..4a3cd0b 100644
--- a/src/ClientPattern.hh
+++ b/src/ClientPattern.hh
@@ -32,7 +32,7 @@
32#include <string> 32#include <string>
33#include <list> 33#include <list>
34 34
35class WinClient; 35class Focusable;
36 36
37/** 37/**
38 * This class represents a "pattern" that we can match against a 38 * This class represents a "pattern" that we can match against a
@@ -53,10 +53,14 @@ public:
53 /// @return a string representation of this pattern 53 /// @return a string representation of this pattern
54 std::string toString() const; 54 std::string toString() const;
55 55
56 enum WinProperty { TITLE, CLASS, NAME, ROLE }; 56 enum WinProperty {
57 TITLE, CLASS, NAME, ROLE,
58 MAXIMIZED, MINIMIZED, SHADED, STUCK, FOCUSHIDDEN, ICONHIDDEN,
59 WORKSPACE, HEAD, LAYER
60 };
57 61
58 /// Does this client match this pattern? 62 /// Does this client match this pattern?
59 bool match(const WinClient &win) const; 63 bool match(const Focusable &win) const;
60 64
61 /** 65 /**
62 * Add an expression to match against 66 * Add an expression to match against
@@ -68,7 +72,7 @@ public:
68 72
69 inline void addMatch() { ++m_nummatches; } 73 inline void addMatch() { ++m_nummatches; }
70 74
71 inline bool operator == (const WinClient &win) const { 75 inline bool operator == (const Focusable &win) const {
72 return match(win); 76 return match(win);
73 } 77 }
74 78
@@ -79,9 +83,9 @@ public:
79 * If there are no terms, then there is assumed to be an error 83 * If there are no terms, then there is assumed to be an error
80 * the column of the error is stored in m_matchlimit 84 * the column of the error is stored in m_matchlimit
81 */ 85 */
82 inline int error() const { return m_terms.empty() ? m_matchlimit : 0; } 86 inline int error() const { return m_terms.empty() ? 1 : 0; }
83 87
84 std::string getProperty(WinProperty prop, const WinClient &winclient) const; 88 std::string getProperty(WinProperty prop, const Focusable &winclient) const;
85 89
86private: 90private:
87 /** 91 /**