summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Window.hh14
-rw-r--r--src/Workspace.hh16
2 files changed, 14 insertions, 16 deletions
diff --git a/src/Window.hh b/src/Window.hh
index 943ad35..06a901c 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.35 2002/10/22 14:41:13 fluxgen Exp $ 25// $Id: Window.hh,v 1.36 2002/11/15 12:14:39 fluxgen Exp $
26 26
27#ifndef WINDOW_HH 27#ifndef WINDOW_HH
28#define WINDOW_HH 28#define WINDOW_HH
@@ -47,6 +47,7 @@
47 47
48class Tab; 48class Tab;
49 49
50
50/** 51/**
51 Creates the window frame and handles any window event for it 52 Creates the window frame and handles any window event for it
52 TODO: this is to huge! 53 TODO: this is to huge!
@@ -232,19 +233,18 @@ private:
232 // state and hint signals 233 // state and hint signals
233 WinSubject m_hintsig, m_statesig, m_workspacesig; 234 WinSubject m_hintsig, m_statesig, m_workspacesig;
234 235
235 BImageControl *image_ctrl; //image control for rendering 236 BImageControl *image_ctrl; /// image control for rendering
236 237
237 // got from WM_CLASS 238 std::string m_instance_name; /// instance name from WM_CLASS
238 std::string m_instance_name; 239 std::string m_class_name; /// class name from WM_CLASS
239 std::string m_class_name;
240 240
241 //Window state 241 //Window state
242 bool moving, resizing, shaded, maximized, visible, iconic, transient, 242 bool moving, resizing, shaded, maximized, visible, iconic, transient,
243 focused, stuck, modal, send_focus_message, managed; 243 focused, stuck, modal, send_focus_message, managed;
244 244
245 BScreen *screen; 245 BScreen *screen; /// screen on which this window exist
246 BTimer timer; 246 BTimer timer;
247 Display *display; 247 Display *display; /// display connection (obsolete by BaseDisplay singleton)
248 BaseDisplay::BlackboxAttributes blackbox_attrib; 248 BaseDisplay::BlackboxAttributes blackbox_attrib;
249 249
250 Time lastButtonPressTime; 250 Time lastButtonPressTime;
diff --git a/src/Workspace.hh b/src/Workspace.hh
index 61abe9c..48698ab 100644
--- a/src/Workspace.hh
+++ b/src/Workspace.hh
@@ -25,16 +25,18 @@
25#ifndef WORKSPACE_HH 25#ifndef WORKSPACE_HH
26#define WORKSPACE_HH 26#define WORKSPACE_HH
27 27
28
28#include "Clientmenu.hh" 29#include "Clientmenu.hh"
29#include "Window.hh"
30#include "NotCopyable.hh" 30#include "NotCopyable.hh"
31 31
32#include <X11/Xlib.h> 32#include <X11/Xlib.h>
33
33#include <string> 34#include <string>
34#include <vector> 35#include <vector>
35#include <list> 36#include <list>
36 37
37class BScreen; 38class BScreen;
39class FluxboxWindow;
38 40
39/** 41/**
40 Handles a single workspace 42 Handles a single workspace
@@ -68,14 +70,10 @@ public:
68 70
69 const BScreen *getScreen() const { return screen; } 71 const BScreen *getScreen() const { return screen; }
70 const FluxboxWindow *getLastFocusedWindow() const { return lastfocus; } 72 const FluxboxWindow *getLastFocusedWindow() const { return lastfocus; }
71 Clientmenu *menu() { return &m_clientmenu; } 73 Clientmenu &menu() { return m_clientmenu; }
72 /** 74 /// client menu
73 @return client menu 75 inline const Clientmenu &menu() const { return m_clientmenu; }
74 */ 76 /// name of this workspace
75 inline const Clientmenu *menu() const { return &m_clientmenu; }
76 /**
77 @return name of this workspace
78 */
79 inline const std::string &name() const { return m_name; } 77 inline const std::string &name() const { return m_name; }
80 /** 78 /**
81 @return the number of this workspace, note: obsolete, should be in BScreen 79 @return the number of this workspace, note: obsolete, should be in BScreen