1 files changed, 79 insertions, 54 deletions

diff --git a/src/Workspace.hh b/src/Workspace.hh
index 17de03c..c2b02f3 100644
--- a/src/Workspace.hh
+++ b/src/Workspace.hh
@@ -1,3 +1,6 @@
+// Workspace.hh for Fluxbox
+// Copyright (c) 2002 - 2004 Henrik Kinnunen (fluxgen(at)users.sourceforge.net)
+//
 // Workspace.hh for Blackbox - an X11 Window manager
 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
 //
@@ -19,72 +22,94 @@
 // 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 <X11/Xlib.h>
 
-class BScreen;
-class Clientmenu;
-class Workspace;
-class FluxboxWindow;
 
-#include "LinkedList.hh"
+#include "FbMenu.hh"
 
+#include "FbTk/MultLayers.hh"
+#include "FbTk/Observer.hh"
+#include "FbTk/NotCopyable.hh"
 
-class Workspace {
-private:
-  BScreen *screen;
-  FluxboxWindow *lastfocus;
-  Clientmenu *clientmenu;
+#include <string>
+#include <vector>
+#include <list>
+
+class BScreen;
+class FluxboxWindow;
+class WinClient;
 
-  LinkedList<FluxboxWindow> *stackingList, *windowList;
+/**
+        Handles a single workspace
+*/
+class Workspace:private FbTk::NotCopyable, private FbTk::Observer {
+public:
+    typedef std::vector<FluxboxWindow *> Windows;
+
+    Workspace(BScreen &screen, FbTk::MultLayers &layermanager, const std::string &name,
+              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 reconfigure();
+    void shutdown();
+    void addWindow(FluxboxWindow &win, bool place = false);
+    int removeWindow(FluxboxWindow *win, bool still_alive);
+    void updateClientmenu();
+
+    BScreen &screen() { return m_screen; }
+    const BScreen &screen() const { return m_screen; }  
+
+    FluxboxWindow *lastFocusedWindow() { return m_lastfocus; }
+    const FluxboxWindow *lastFocusedWindow() const { return m_lastfocus; }      
+
+    inline FbTk::Menu &menu() { return m_clientmenu; }
+    inline const FbTk::Menu &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; }    
+
+    const Windows &windowList() const { return m_windowlist; }
+    Windows &windowList() { return m_windowlist; }
+
+    int numberOfWindows() const;
+    bool checkGrouping(FluxboxWindow &win);
+
+    static bool loadGroups(const std::string &filename);
 
-  char *name;
-  int id, cascade_x, cascade_y;
+private:
+    void update(FbTk::Subject *subj);
+    void placeWindow(FluxboxWindow &win);
 
+    BScreen &m_screen;
+    FluxboxWindow *m_lastfocus;
+    FbMenu m_clientmenu;
 
-protected:
-  void placeWindow(FluxboxWindow *);
+    typedef std::vector<std::string> Group;
+    typedef std::vector<Group> GroupList;
+        
+    static GroupList m_groups; ///< handle auto groupings
 
+    FbTk::MultLayers &m_layermanager;
+    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 *m_cascade_x; ///< need a cascade for each head (Xinerama)
+    int *m_cascade_y; ///< need a cascade for each head (Xinerama)
 };
 
 
-#endif // _WORKSPACE_HH_
+#endif // WORKSPACE_HH