X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2FWorkspace.h;h=146e1d628e0df5d72fbc31be0372360813905f3a;hb=e7978c7d24723f46615f8a2f209d1035bdee7bc4;hp=c2b920918793bfbc11e99b7c1e8f74bf8f9f05c8;hpb=897a9711d6dae63380ff86b7ecd85ce58c3f4b85;p=chaz%2Fopenbox

diff --git a/src/Workspace.h b/src/Workspace.h
index c2b92091..146e1d62 100644
--- a/src/Workspace.h
+++ b/src/Workspace.h
@@ -25,58 +25,58 @@
 
 #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;
 
 class Workspace {
 private:
   BScreen &screen;
-  OpenboxWindow *lastfocus;
   Clientmenu *clientmenu;
 
-  LinkedList<OpenboxWindow> *stackingList, *windowList;
+  typedef std::vector<OpenboxWindow *> winVect;
+  winVect _windows;
+  typedef std::list<OpenboxWindow *> winList;
+  winList _zorder;
 
   char *name;
   int id, cascade_x, cascade_y;
 
+  OpenboxWindow *_focused, *_last;      // last is the same as focused except
+                                        // that when focus is removed from all
+                                        // windows on the workspace, last doesnt
+                                        // change to NULL
 
 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 int getWorkspaceID(void) const { return id; }
+  inline OpenboxWindow *focusedWindow() { return _focused; }
+  inline OpenboxWindow *lastFocusedWindow() { return _last; }
+  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);
-
+  bool isCurrent(void);
+  int addWindow(OpenboxWindow *, bool = false);
+  int removeWindow(OpenboxWindow *);
+  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);
 };