summaryrefslogtreecommitdiff
path: root/src/Workspace.hh
diff options
context:
space:
mode:
Diffstat (limited to 'src/Workspace.hh')
-rw-r--r--src/Workspace.hh10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/Workspace.hh b/src/Workspace.hh
index 514f346..2eb32f0 100644
--- a/src/Workspace.hh
+++ b/src/Workspace.hh
@@ -28,6 +28,7 @@
28#include "NotCopyable.hh" 28#include "NotCopyable.hh"
29 29
30#include "Menu.hh" 30#include "Menu.hh"
31#include "MultLayers.hh"
31 32
32#include <X11/Xlib.h> 33#include <X11/Xlib.h>
33 34
@@ -46,7 +47,7 @@ public:
46 typedef std::vector<FluxboxWindow *> Windows; 47 typedef std::vector<FluxboxWindow *> Windows;
47 typedef std::vector<Window> Stack; 48 typedef std::vector<Window> Stack;
48 49
49 explicit Workspace(BScreen *screen, unsigned int workspaceid = 0); 50 explicit Workspace(BScreen *screen, FbTk::MultLayers &layermanager, unsigned int workspaceid = 0);
50 ~Workspace(); 51 ~Workspace();
51 52
52 void setLastFocusedWindow(FluxboxWindow *w); 53 void setLastFocusedWindow(FluxboxWindow *w);
@@ -57,8 +58,6 @@ public:
57 void showAll(); 58 void showAll();
58 void hideAll(); 59 void hideAll();
59 void removeAll(); 60 void removeAll();
60 void raiseWindow(FluxboxWindow *win);
61 void lowerWindow(FluxboxWindow *win);
62 void reconfigure(); 61 void reconfigure();
63 void update(); 62 void update();
64 void setCurrent(); 63 void setCurrent();
@@ -97,9 +96,6 @@ protected:
97 96
98private: 97private:
99 98
100 void raiseAndFillStack(Stack::iterator &it, const FluxboxWindow &win);
101 void lowerAndFillStack(Stack::iterator &it, const FluxboxWindow &win);
102
103 BScreen *screen; 99 BScreen *screen;
104 FluxboxWindow *lastfocus; 100 FluxboxWindow *lastfocus;
105 FbTk::Menu m_clientmenu; 101 FbTk::Menu m_clientmenu;
@@ -110,7 +106,7 @@ private:
110 106
111 static GroupList m_groups; ///< handle auto groupings 107 static GroupList m_groups; ///< handle auto groupings
112 108
113 WindowStack stackingList; 109 FbTk::MultLayers &m_layermanager;
114 Windows m_windowlist; 110 Windows m_windowlist;
115 111
116 std::string m_name; ///< name of this workspace 112 std::string m_name; ///< name of this workspace