1 files changed, 50 insertions, 46 deletions

diff --git a/src/Workspace.hh b/src/Workspace.hh
index 17de03c..dd41281 100644
--- a/src/Workspace.hh
+++ b/src/Workspace.hh
@@ -19,70 +19,74 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#ifndef   _WORKSPACE_HH_
-#define   _WORKSPACE_HH_
+#ifndef  WORKSPACE_HH
+#define  WORKSPACE_HH
+
+#include "Window.hh"
 
 #include <X11/Xlib.h>
+#include <string>
+#include <vector>
+#include <list>
 
 class BScreen;
 class Clientmenu;
 class Workspace;
-class FluxboxWindow;
 
-#include "LinkedList.hh"
 
 
 class Workspace {
+public:
+        typedef std::vector<FluxboxWindow *> Windows;
+        
+        Workspace(BScreen *, int = 0);
+        ~Workspace(void);
+
+        inline BScreen *getScreen(void) { return screen; }
+        inline FluxboxWindow *getLastFocusedWindow(void) { return lastfocus; }  
+        inline Clientmenu *getMenu(void) { return clientmenu; }
+        inline const char *getName(void) const { return name.c_str(); }
+        inline const int &getWorkspaceID(void) const { return id; }     
+        inline void setLastFocusedWindow(FluxboxWindow *w) { lastfocus = w; }
+        FluxboxWindow *getWindow(int);
+        inline Windows &getWindowList() { return windowList; }
+        bool isCurrent(void);
+        bool isLastWindow(FluxboxWindow *);     
+        const int addWindow(FluxboxWindow *, Bool = False);
+        const int removeWindow(FluxboxWindow *);
+        const int getCount(void);
+ 
+        void showAll(void);
+        void hideAll(void);
+        void removeAll(void);
+        void raiseWindow(FluxboxWindow *);
+        void lowerWindow(FluxboxWindow *);
+        void reconfigure();
+        void update();
+        void setCurrent(void);
+        void setName(char *);
+        void shutdown(void);
+
 private:
-  BScreen *screen;
-  FluxboxWindow *lastfocus;
-  Clientmenu *clientmenu;
+        BScreen *screen;
+        FluxboxWindow *lastfocus;
+        Clientmenu *clientmenu;
 
-  LinkedList<FluxboxWindow> *stackingList, *windowList;
+        typedef std::list<FluxboxWindow *> WindowStack;
+ 
 
-  char *name;
-  int id, cascade_x, cascade_y;
+        WindowStack stackingList;
+        Windows windowList;
+
+        std::string name;
+        int id, cascade_x, cascade_y;
 
 
 protected:
-  void placeWindow(FluxboxWindow *);
+        void placeWindow(FluxboxWindow *);
+
 
 
-public:
-  Workspace(BScreen *, int = 0);
-  ~Workspace(void);
-
-  inline BScreen *getScreen(void) { return screen; }
-
-  inline FluxboxWindow *getLastFocusedWindow(void) { return lastfocus; }
-  
-  inline Clientmenu *getMenu(void) { return clientmenu; }
-
-  inline const char *getName(void) const { return name; }
-
-  inline const int &getWorkspaceID(void) const { return id; }
-  
-  inline void setLastFocusedWindow(FluxboxWindow *w) { lastfocus = w; }
-
-  FluxboxWindow *getWindow(int);
-
-  Bool isCurrent(void);
-  Bool isLastWindow(FluxboxWindow *);
-  
-  const int addWindow(FluxboxWindow *, Bool = False);
-  const int removeWindow(FluxboxWindow *);
-  const int getCount(void);
-
-  void showAll(void);
-  void hideAll(void);
-  void removeAll(void);
-  void raiseWindow(FluxboxWindow *);
-  void lowerWindow(FluxboxWindow *);
-  void reconfigure();
-  void update();
-  void setCurrent(void);
-  void setName(char *);
-  void shutdown(void);
 };