converted the remaining LinkedLists in Screen to STL objects.

[chaz/openbox] / src / Workspace.h

diff --git a/src/Workspace.h b/src/Workspace.h
index c2b920918793bfbc11e99b7c1e8f74bf8f9f05c8..9b7aba101e6ab69975dc68179170cbab5e1bea96 100644 (file)
--- a/src/Workspace.h
+++ b/src/Workspace.h
@@ -25,13 +25,18 @@
 
 #include <X11/Xlib.h>
 
-#include "LinkedList.h"
-#include "Geometry.h"
+#include <vector>
+#include <list>
 
 class BScreen;
 class Clientmenu;
 class Workspace;
 class OpenboxWindow;
+class Size;
+class Rect;
+
+typedef std::vector<OpenboxWindow *> winVect;
+typedef std::list<OpenboxWindow *> winList;
 
 class Workspace {
 private:
@@ -39,44 +44,39 @@ private:
   OpenboxWindow *lastfocus;
   Clientmenu *clientmenu;
 
-  LinkedList<OpenboxWindow> *stackingList, *windowList;
+  winVect _windows;
+  winList _zorder;
 
   char *name;
   int id, cascade_x, cascade_y;
 
+  OpenboxWindow *_focused;
 
 protected:
-  void placeWindow(OpenboxWindow *);
+  void placeWindow(OpenboxWindow &);
   Point *bestFitPlacement(const Size &win_size, const Rect &space);
+  Point *underMousePlacement(const Size &win_size, const Rect &space);
   Point *rowSmartPlacement(const Size &win_size, const Rect &space);
   Point *colSmartPlacement(const Size &win_size, const Rect &space);
-  Point *const cascadePlacement(const OpenboxWindow* window);
+  Point *const cascadePlacement(const OpenboxWindow &window, const Rect &space);
 
 public:
   Workspace(BScreen &, int = 0);
   ~Workspace(void);
 
   inline BScreen &getScreen(void) { return screen; }
-
   inline OpenboxWindow *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(OpenboxWindow *w) { lastfocus = w; }
-
+  inline OpenboxWindow *focusedWindow() { return _focused; }
+  void focusWindow(OpenboxWindow *win);
   OpenboxWindow *getWindow(int);
-
   Bool isCurrent(void);
-  Bool isLastWindow(OpenboxWindow *);
-  
   const int addWindow(OpenboxWindow *, Bool = False);
   const int removeWindow(OpenboxWindow *);
   const int getCount(void);
-
   void showAll(void);
   void hideAll(void);
   void removeAll(void);
@@ -85,7 +85,7 @@ public:
   void reconfigure();
   void update();
   void setCurrent(void);
-  void setName(char *);
+  void setName(const char *);
   void shutdown(void);
 };