snapping better to the xinerama regions

[chaz/openbox] / src / Screen.hh

diff --git a/src/Screen.hh b/src/Screen.hh
index 8f7a26e9c2d69cf9491df99731dab9ff5af9817a..a36205539b110991f00695d77b56c8a75fab7e40 100644 (file)
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -57,6 +57,7 @@ extern "C" {
 class Slit; // forward reference
 class BFont;
 class XAtom;
+struct Strut;
 
 enum TextJustify { LeftJustify = 1, RightJustify, CenterJustify };
 
@@ -96,12 +97,6 @@ struct MenuStyle {
   int bullet, bullet_pos;
 };
 
-struct Strut {
-  unsigned int top, bottom, left, right;
-
-  Strut(void): top(0), bottom(0), left(0), right(0) {}
-};
-
 class BScreen : public ScreenInfo {
 private:
   bool root_colormap_installed, managed, geom_visible;
@@ -136,6 +131,9 @@ private:
   unsigned long event_mask;
 
   Rect usableArea;
+#ifdef    XINERAMA
+  RectList xineramaUsableArea;
+#endif // XINERAMA
 
   typedef std::list<Strut*> StrutList;
   StrutList strutList;
@@ -149,8 +147,8 @@ private:
 
     bool sloppy_focus, auto_raise, auto_edge_balance, ordered_dither,
       opaque_move, full_max, focus_new, focus_last, click_raise,
-      hide_toolbar, window_to_window_snap, window_corner_snap, aa_fonts,
-      ignore_shaded, ignore_maximized;
+      allow_scroll_lock, hide_toolbar, window_to_window_snap,
+      window_corner_snap, aa_fonts, ignore_shaded, ignore_maximized;
     BColor border_color;
 
     unsigned int workspaces;
@@ -219,6 +217,7 @@ public:
     { return resource.window_to_window_snap; }
   inline bool getWindowCornerSnap(void) const
     { return resource.window_corner_snap; }
+  inline bool allowScrollLock(void) const { return resource.allow_scroll_lock; }
 
   inline const GC &getOpGC(void) const { return opGC; }
 
@@ -267,6 +266,8 @@ public:
   inline int getColPlacementDirection(void) const
   { return resource.col_direction; }
 
+  void changeWorkspaceCount(unsigned int new_count);
+  
   inline void setRootColormapInstalled(bool r) { root_colormap_installed = r; }
   void saveSloppyFocus(bool s);
   void saveAutoRaise(bool a);
@@ -288,6 +289,7 @@ public:
   void saveResizeZones(unsigned int z);
   void savePlaceIgnoreShaded(bool i);
   void savePlaceIgnoreMaximized(bool i);
+  void saveAllowScrollLock(bool a);
   inline void iconUpdate(void) { iconmenu->update(); }
 
 #ifdef    HAVE_STRFTIME
@@ -307,7 +309,12 @@ public:
 
   BlackboxWindow *getIcon(unsigned int index);
 
+  // allAvailableAreas should be used whenever possible instead of this function
+  // as then Xinerama will work correctly.
   const Rect& availableArea(void) const;
+#ifdef    XINERAMA
+  const RectList& allAvailableAreas(void) const;
+#endif // XINERAMA
   void updateAvailableArea(void);
   void addStrut(Strut *strut);
   void removeStrut(Strut *strut);
@@ -320,9 +327,6 @@ public:
   void addNetizen(Netizen *n);
   void removeNetizen(Window w);
 
-  void addDesktopWindow(Window window);
-  void removeDesktopWindow(Window window);
-
   void addSystrayWindow(Window window);
   void removeSystrayWindow(Window window);