sync with bb cvs

[chaz/openbox] / src / Workspace.hh

diff --git a/src/Workspace.hh b/src/Workspace.hh
index 652e8cef574af6bbb5b38456b08a34f3abde7c22..0916dce7340825085860d24936cb6fda727db762 100644 (file)
--- a/src/Workspace.hh
+++ b/src/Workspace.hh
@@ -46,6 +46,7 @@ private:
   BScreen *screen;
   BlackboxWindow *lastfocus;
   Clientmenu *clientmenu;
+  XAtom *xatom;
 
   BlackboxWindowList stackingList, windowList;
 
@@ -64,6 +65,7 @@ private:
   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);
 
 public:
   Workspace(BScreen *scrn, unsigned int i = 0);
@@ -85,6 +87,7 @@ public:
   BlackboxWindow* getPrevWindowInList(BlackboxWindow *w);
   BlackboxWindow* getTopWindowOnStack(void) const;
   void sendWindowList(Netizen &n);
+  void focusFallback(const BlackboxWindow *old_window);
 
   bool isCurrent(void) const;
   bool isLastWindow(const BlackboxWindow* w) const;
@@ -92,6 +95,7 @@ public:
   void addWindow(BlackboxWindow *w, bool place = False);
   unsigned int removeWindow(BlackboxWindow *w);
   unsigned int getCount(void) const;
+  void appendStackOrder(BlackboxWindowList &stack_order) const;
 
   void showAll(void);
   void hideAll(void);
@@ -99,7 +103,6 @@ public:
   void raiseWindow(BlackboxWindow *w);
   void lowerWindow(BlackboxWindow *w);
   void reconfigure(void);
-  void updateFocusModel(void);
   void setCurrent(void);
   void setName(const std::string& new_name);
 };