aboutsummaryrefslogtreecommitdiff
path: root/src/Window.hh
diff options
context:
space:
mode:
Diffstat (limited to 'src/Window.hh')
-rw-r--r--src/Window.hh29
1 files changed, 16 insertions, 13 deletions
diff --git a/src/Window.hh b/src/Window.hh
index c4a7a25..b555d6b 100644
--- a/src/Window.hh
+++ b/src/Window.hh
@@ -22,7 +22,7 @@
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.103 2003/12/17 01:21:49 fluxgen Exp $ 25// $Id: Window.hh,v 1.104 2003/12/18 18:03:22 fluxgen Exp $
26 26
27#ifndef WINDOW_HH 27#ifndef WINDOW_HH
28#define WINDOW_HH 28#define WINDOW_HH
@@ -32,6 +32,7 @@
32#include "Subject.hh" 32#include "Subject.hh"
33#include "EventHandler.hh" 33#include "EventHandler.hh"
34#include "XLayerItem.hh" 34#include "XLayerItem.hh"
35#include "FbWinFrame.hh"
35 36
36#include <X11/Xlib.h> 37#include <X11/Xlib.h>
37#include <X11/Xutil.h> 38#include <X11/Xutil.h>
@@ -132,10 +133,10 @@ public:
132 }; 133 };
133 134
134 enum ResizeCorner { 135 enum ResizeCorner {
135 LEFTTOP, 136 LEFTTOP,
136 LEFTBOTTOM, 137 LEFTBOTTOM,
137 RIGHTBOTTOM, 138 RIGHTBOTTOM,
138 RIGHTTOP 139 RIGHTTOP
139 }; 140 };
140 141
141 typedef struct _blackbox_hints { 142 typedef struct _blackbox_hints {
@@ -152,7 +153,7 @@ public:
152 typedef std::list<WinClient *> ClientList; 153 typedef std::list<WinClient *> ClientList;
153 154
154 /// create a window from a client 155 /// create a window from a client
155 FluxboxWindow(WinClient &client, BScreen &scr, 156 FluxboxWindow(WinClient &client,
156 FbWinFrameTheme &tm, 157 FbWinFrameTheme &tm,
157 FbTk::XLayer &layer); 158 FbTk::XLayer &layer);
158 159
@@ -312,22 +313,24 @@ public:
312 313
313 const std::string &title() const; 314 const std::string &title() const;
314 const std::string &iconTitle() const; 315 const std::string &iconTitle() const;
315 int x() const; 316 inline int x() const { return frame().x(); }
316 int y() const; 317 inline int y() const { return frame().y(); }
318 inline unsigned int width() const { return frame().width(); }
319 inline unsigned int height() const { return frame().height(); }
320
317 unsigned int workspaceNumber() const { return m_workspace_number; } 321 unsigned int workspaceNumber() const { return m_workspace_number; }
318 322
319 int layerNum() const { return m_layernum; } 323 int layerNum() const { return m_layernum; }
320 void setLayerNum(int layernum); 324 void setLayerNum(int layernum);
321 325
322 unsigned int width() const; 326
323 unsigned int height() const;
324 unsigned int titlebarHeight() const; 327 unsigned int titlebarHeight() const;
325 328
326 bool isLowerTab() const; 329 bool isLowerTab() const;
327 int initialState() const; 330 int initialState() const;
328 331
329 FbWinFrame &frame() { return *m_frame.get(); } 332 inline FbWinFrame &frame() { return m_frame; }
330 const FbWinFrame &frame() const { return *m_frame.get(); } 333 inline const FbWinFrame &frame() const { return m_frame; }
331 334
332 /** 335 /**
333 @name signals 336 @name signals
@@ -455,7 +458,7 @@ private:
455 unsigned int m_old_width, m_old_height; ///< old size so we can restore from maximized state 458 unsigned int m_old_width, m_old_height; ///< old size so we can restore from maximized state
456 int m_last_button_x, ///< last known x position of the mouse button 459 int m_last_button_x, ///< last known x position of the mouse button
457 m_last_button_y; ///< last known y position of the mouse button 460 m_last_button_y; ///< last known y position of the mouse button
458 std::auto_ptr<FbWinFrame> m_frame; 461 FbWinFrame m_frame;
459 462
460 FbTk::XLayerItem m_layeritem; 463 FbTk::XLayerItem m_layeritem;
461 int m_layernum; 464 int m_layernum;