sync with bb-cvs

[chaz/openbox] / src / Workspace.hh

diff --git a/src/Workspace.hh b/src/Workspace.hh
index fcf466307a4b336070cd65fc57c1de4e27e41962..7934308d2f9c42a7345a0ece8fd585ee2e2a828f 100644 (file)
--- a/src/Workspace.hh
+++ b/src/Workspace.hh
@@ -52,7 +52,10 @@ private:
 
   std::string name;
   unsigned int id;
-  int cascade_x, cascade_y;
+  unsigned int cascade_x, cascade_y;
+#ifdef    XINERAMA
+  unsigned int cascade_region;
+#endif // XINERAMA
 
   Workspace(const Workspace&);
   Workspace& operator=(const Workspace&);
@@ -63,9 +66,9 @@ private:
                        StackVector::iterator &stack);
 
   void placeWindow(BlackboxWindow *win);
-  bool cascadePlacement(Rect& win, const Rect& availableArea);
-  bool smartPlacement(Rect& win, const Rect& availableArea);
-  bool underMousePlacement(Rect& win, const Rect& availableArea);
+  bool cascadePlacement(Rect& win, const int offset);
+  bool smartPlacement(Rect& win);
+  bool underMousePlacement(Rect& win);
 
 public:
   Workspace(BScreen *scrn, unsigned int i = 0);
@@ -93,7 +96,7 @@ public:
   bool isLastWindow(const BlackboxWindow* w) const;
 
   void addWindow(BlackboxWindow *w, bool place = False);
-  unsigned int removeWindow(BlackboxWindow *w);
+  void removeWindow(BlackboxWindow *w);
   unsigned int getCount(void) const;
   void appendStackOrder(BlackboxWindowList &stack_order) const;