aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.hh
diff options
context:
space:
mode:
authorrathnor <rathnor>2003-08-25 13:15:53 (GMT)
committerrathnor <rathnor>2003-08-25 13:15:53 (GMT)
commit06a66cc30446945e9d2a440de2b9a9e9f6561ead (patch)
tree42042068d7b6f1a3a94cd9977ebdc76b103811b5 /src/Screen.hh
parentb08d4232bb7e8ad2bfcb370ba61f7a4d001775d6 (diff)
downloadfluxbox-06a66cc30446945e9d2a440de2b9a9e9f6561ead.zip
fluxbox-06a66cc30446945e9d2a440de2b9a9e9f6561ead.tar.bz2
fix some style initialisation issues
Diffstat (limited to 'src/Screen.hh')
-rw-r--r--src/Screen.hh10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/Screen.hh b/src/Screen.hh
index 6efe15d..f19c7b4 100644
--- a/src/Screen.hh
+++ b/src/Screen.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: Screen.hh,v 1.122 2003/08/24 13:06:38 fluxgen Exp $ 25// $Id: Screen.hh,v 1.123 2003/08/25 13:15:53 rathnor Exp $
26 26
27#ifndef SCREEN_HH 27#ifndef SCREEN_HH
28#define SCREEN_HH 28#define SCREEN_HH
@@ -32,6 +32,7 @@
32#include "MultLayers.hh" 32#include "MultLayers.hh"
33#include "FbRootWindow.hh" 33#include "FbRootWindow.hh"
34#include "NotCopyable.hh" 34#include "NotCopyable.hh"
35#include "Observer.hh"
35#include "fluxbox.hh" 36#include "fluxbox.hh"
36#include "MenuTheme.hh" 37#include "MenuTheme.hh"
37 38
@@ -59,13 +60,14 @@ class Menu;
59class ImageControl; 60class ImageControl;
60class XLayerItem; 61class XLayerItem;
61class FbWindow; 62class FbWindow;
63class Subject;
62}; 64};
63 65
64/// Handles screen connection, screen clients and workspaces 66/// Handles screen connection, screen clients and workspaces
65/** 67/**
66 Create workspaces, handles switching between workspaces and windows 68 Create workspaces, handles switching between workspaces and windows
67 */ 69 */
68class BScreen : private FbTk::NotCopyable { 70class BScreen : public FbTk::Observer, private FbTk::NotCopyable {
69public: 71public:
70 typedef std::vector<Workspace *> Workspaces; 72 typedef std::vector<Workspace *> Workspaces;
71 typedef std::vector<std::string> WorkspaceNames; 73 typedef std::vector<std::string> WorkspaceNames;
@@ -153,7 +155,9 @@ public:
153 FbTk::Subject &reconfigureSig() { return m_reconfigure_sig; } 155 FbTk::Subject &reconfigureSig() { return m_reconfigure_sig; }
154 FbTk::Subject &resizeSig() { return m_resize_sig; } 156 FbTk::Subject &resizeSig() { return m_resize_sig; }
155 //@} 157 //@}
156 158
159 void update(FbTk::Subject *subj);
160
157 /// @return the resource value of number of workspace 161 /// @return the resource value of number of workspace
158 inline int getNumberOfWorkspaces() const { return *resource.workspaces; } 162 inline int getNumberOfWorkspaces() const { return *resource.workspaces; }
159 163