diff options
-rw-r--r-- | src/Window.hh | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/Window.hh b/src/Window.hh index 5536254..549971e 100644 --- a/src/Window.hh +++ b/src/Window.hh | |||
@@ -22,11 +22,15 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: Window.hh,v 1.25 2002/08/04 15:55:13 fluxgen Exp $ | 25 | // $Id: Window.hh,v 1.26 2002/08/11 22:33:41 fluxgen Exp $ |
26 | 26 | ||
27 | #ifndef WINDOW_HH | 27 | #ifndef WINDOW_HH |
28 | #define WINDOW_HH | 28 | #define WINDOW_HH |
29 | 29 | ||
30 | #include "BaseDisplay.hh" | ||
31 | #include "Timer.hh" | ||
32 | #include "Windowmenu.hh" | ||
33 | |||
30 | #include <X11/Xlib.h> | 34 | #include <X11/Xlib.h> |
31 | #include <X11/Xutil.h> | 35 | #include <X11/Xutil.h> |
32 | 36 | ||
@@ -34,10 +38,6 @@ | |||
34 | #include <X11/extensions/shape.h> | 38 | #include <X11/extensions/shape.h> |
35 | #endif // SHAPE | 39 | #endif // SHAPE |
36 | 40 | ||
37 | #include "BaseDisplay.hh" | ||
38 | #include "Timer.hh" | ||
39 | #include "Windowmenu.hh" | ||
40 | |||
41 | #include <vector> | 41 | #include <vector> |
42 | #include <string> | 42 | #include <string> |
43 | 43 | ||
@@ -173,6 +173,8 @@ public: | |||
173 | inline unsigned int getClientHeight() const { return client.height; } | 173 | inline unsigned int getClientHeight() const { return client.height; } |
174 | inline unsigned int getClientWidth() const { return client.width; } | 174 | inline unsigned int getClientWidth() const { return client.width; } |
175 | inline unsigned int getTitleHeight() const { return frame.title_h; } | 175 | inline unsigned int getTitleHeight() const { return frame.title_h; } |
176 | const std::string className() const { return m_class_name; } | ||
177 | const std::string instanceName() const { return m_instance_name; } | ||
176 | bool isLowerTab() const; | 178 | bool isLowerTab() const; |
177 | //@} | 179 | //@} |
178 | 180 | ||
@@ -183,7 +185,7 @@ public: | |||
183 | bool validateClient(); | 185 | bool validateClient(); |
184 | bool setInputFocus(); | 186 | bool setInputFocus(); |
185 | void setTab(bool flag); | 187 | void setTab(bool flag); |
186 | void setFocusFlag(bool); | 188 | void setFocusFlag(bool flag); |
187 | void iconify(); | 189 | void iconify(); |
188 | void deiconify(bool = true, bool = true); | 190 | void deiconify(bool = true, bool = true); |
189 | void close(); | 191 | void close(); |
@@ -240,6 +242,10 @@ private: | |||
240 | 242 | ||
241 | BImageControl *image_ctrl; //image control for rendering | 243 | BImageControl *image_ctrl; //image control for rendering |
242 | 244 | ||
245 | // got from WM_CLASS | ||
246 | std::string m_instance_name; | ||
247 | std::string m_class_name; | ||
248 | |||
243 | //Window state | 249 | //Window state |
244 | bool moving, resizing, shaded, maximized, visible, iconic, transient, | 250 | bool moving, resizing, shaded, maximized, visible, iconic, transient, |
245 | focused, stuck, modal, send_focus_message, managed; | 251 | focused, stuck, modal, send_focus_message, managed; |