Take menu file from rc file if it isn't specified on the command line.

[chaz/openbox] / src / Workspace.hh

diff --git a/src/Workspace.hh b/src/Workspace.hh
index dadb0dd0c50638c2dd26c467e67058a72184e5b5..df0411e130645cc221360cbf06e0359748f6d656 100644 (file)
--- a/src/Workspace.hh
+++ b/src/Workspace.hh
@@ -46,12 +46,16 @@ private:
   BScreen *screen;
   BlackboxWindow *lastfocus;
   Clientmenu *clientmenu;
+  XAtom *xatom;
 
   BlackboxWindowList stackingList, windowList;
 
   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&);
@@ -61,10 +65,13 @@ private:
   void lowerTransients(const BlackboxWindow * const win,
                        StackVector::iterator &stack);
 
+  typedef std::vector<Rect> rectList;
+  rectList calcSpace(const Rect &win, const rectList &spaces) const;
+
   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);
@@ -81,18 +88,24 @@ public:
 
   inline void setLastFocusedWindow(BlackboxWindow *w) { lastfocus = w; }
 
+  inline const BlackboxWindowList& getStackingList() const
+  { return stackingList; }
+
   BlackboxWindow* getWindow(unsigned int index);
   BlackboxWindow* getNextWindowInList(BlackboxWindow *w);
   BlackboxWindow* getPrevWindowInList(BlackboxWindow *w);
   BlackboxWindow* getTopWindowOnStack(void) const;
   void sendWindowList(Netizen &n);
+  void focusFallback(const BlackboxWindow *old_window);
+  void setFocused(const BlackboxWindow *w, bool focused);
 
   bool isCurrent(void) const;
   bool isLastWindow(const BlackboxWindow* w) const;
 
-  void addWindow(BlackboxWindow *w, bool place = False);
-  unsigned int removeWindow(BlackboxWindow *w);
+  void addWindow(BlackboxWindow *w, bool place = False, bool sticky = False);
+  void removeWindow(BlackboxWindow *w, bool sticky = False);
   unsigned int getCount(void) const;
+  void appendStackOrder(BlackboxWindowList &stack_order) const;
 
   void showAll(void);
   void hideAll(void);
@@ -100,8 +113,8 @@ public:
   void raiseWindow(BlackboxWindow *w);
   void lowerWindow(BlackboxWindow *w);
   void reconfigure(void);
-  void updateFocusModel(void);
   void setCurrent(void);
+  void readName();
   void setName(const std::string& new_name);
 };