1 files changed, 86 insertions, 52 deletions

diff --git a/src/Workspace.hh b/src/Workspace.hh
index 17de03c..48698ab 100644
--- a/src/Workspace.hh
+++ b/src/Workspace.hh
@@ -1,3 +1,6 @@
+// Workspace.hh for Fluxbox
+// Copyright (c) 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
+//
 // Workspace.hh for Blackbox - an X11 Window manager
 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
 //
@@ -19,72 +22,103 @@
 // 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 "Clientmenu.hh"
+#include "NotCopyable.hh"
 
 #include <X11/Xlib.h>
 
+#include <string>
+#include <vector>
+#include <list>
+
 class BScreen;
-class Clientmenu;
-class Workspace;
 class FluxboxWindow;
 
-#include "LinkedList.hh"
-
+/**
+        Handles a single workspace
+*/
+class Workspace:private NotCopyable {
+public:
+        typedef std::vector<FluxboxWindow *> Windows;
+        typedef std::vector<Window> Stack;
+
+        explicit Workspace(BScreen *screen, unsigned int workspaceid = 0);
+        ~Workspace();
+        
+        void setLastFocusedWindow(FluxboxWindow *w);
+        /**
+                Set workspace name
+        */
+        void setName(const std::string &name);
+        void showAll();
+        void hideAll();
+        void removeAll();
+        void raiseWindow(FluxboxWindow *win);
+        void lowerWindow(FluxboxWindow *win);
+        void reconfigure();
+        void update();
+        void setCurrent();
+        void shutdown();
+        int addWindow(FluxboxWindow *win, bool place = false);
+        int removeWindow(FluxboxWindow *win);
+        BScreen *getScreen() { return screen; }
+        FluxboxWindow *getLastFocusedWindow() { return lastfocus; }
+
+        const BScreen *getScreen() const { return screen; }     
+        const FluxboxWindow *getLastFocusedWindow() const { return lastfocus; } 
+        Clientmenu &menu() { return m_clientmenu; }
+        ///     client menu 
+        inline const Clientmenu &menu() const { return m_clientmenu; }
+        ///     name of this workspace
+        inline const std::string &name() const { return m_name; }
+        /**
+                @return the number of this workspace, note: obsolete, should be in BScreen
+        */
+        inline unsigned int workspaceID() const { return m_id; }        
+        /**
+                @param id the window id number
+                @return window that match the id, else 0
+        */
+        FluxboxWindow *getWindow(unsigned int id);
+        const FluxboxWindow *getWindow(unsigned int id) const;
+        const Windows &getWindowList() const { return m_windowlist; }
+        Windows &getWindowList() { return m_windowlist; }
+
+        bool isCurrent() const;
+        bool isLastWindow(FluxboxWindow *window) const;
+        int getCount() const;
+        void checkGrouping(FluxboxWindow &win);
+        static bool loadGroups(const std::string &filename);
+protected:
+        void placeWindow(FluxboxWindow *win);
 
-class Workspace {
 private:
-  BScreen *screen;
-  FluxboxWindow *lastfocus;
-  Clientmenu *clientmenu;
 
-  LinkedList<FluxboxWindow> *stackingList, *windowList;
+        void raiseAndFillStack(Stack::iterator &it, const FluxboxWindow &win);
+        void lowerAndFillStack(Stack::iterator &it, const FluxboxWindow &win);
 
-  char *name;
-  int id, cascade_x, cascade_y;
+        BScreen *screen;
+        FluxboxWindow *lastfocus;
+        Clientmenu m_clientmenu;
 
+        typedef std::list<FluxboxWindow *> WindowStack;
+        typedef std::vector<std::string> Group;
+        typedef std::vector<Group> GroupList;
+        
+        static GroupList m_groups; ///< handle auto groupings
 
-protected:
-  void placeWindow(FluxboxWindow *);
+        WindowStack stackingList;
+        Windows m_windowlist;
 
-
-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);
+        std::string m_name;  ///< name of this workspace
+        unsigned int m_id;      ///< id, obsolete, this should be in BScreen
+        int cascade_x, cascade_y;
 };
 
 
-#endif // _WORKSPACE_HH_
+#endif // WORKSPACE_HH