snapping/resistance is optional for window and edge snapping

[chaz/openbox] / src / Screen.hh

diff --git a/src/Screen.hh b/src/Screen.hh
index c16bd0773cc826830705282f7efd9d8b6af19fe8..0a2586e3a8d5e52a5fe8a9e62b85ddcacfa2a993 100644 (file)
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -131,6 +131,9 @@ private:
   unsigned long event_mask;
 
   Rect usableArea;
+#ifdef    XINERAMA
+  RectList xineramaUsableArea;
+#endif // XINERAMA
 
   typedef std::list<Strut*> StrutList;
   StrutList strutList;
@@ -145,12 +148,13 @@ private:
     bool sloppy_focus, auto_raise, auto_edge_balance, ordered_dither,
       opaque_move, full_max, focus_new, focus_last, click_raise,
       allow_scroll_lock, hide_toolbar, window_to_window_snap,
-      window_corner_snap, aa_fonts, ignore_shaded, ignore_maximized;
+      window_corner_snap, aa_fonts, ignore_shaded, ignore_maximized,
+      workspace_warping;
     BColor border_color;
 
     unsigned int workspaces;
     int toolbar_placement, toolbar_width_percent, placement_policy,
-      edge_snap_threshold, row_direction, col_direction;
+      edge_snap_threshold, row_direction, col_direction, root_scroll;
 
     unsigned int handle_width, bevel_width, frame_width, border_width,
       resize_zones;
@@ -184,6 +188,7 @@ private:
 
   void updateWorkArea(void);
 public:
+  enum { WindowNoSnap = 0, WindowSnap, WindowResistance };
   enum { RowSmartPlacement = 1, ColSmartPlacement, CascadePlacement,
          UnderMousePlacement, ClickMousePlacement, LeftRight, RightLeft,
          TopBottom, BottomTop, IgnoreShaded, IgnoreMaximized };
@@ -192,6 +197,7 @@ public:
          WindowShade, WindowIconify, WindowMaximize, WindowClose, WindowRaise,
          WindowLower, WindowStick, WindowKill, SetStyle };
   enum FocusModel { SloppyFocus, ClickToFocus };
+  enum RootScrollDirection { NoScroll = 0, NormalScroll, ReverseScroll };
 
   BScreen(Blackbox *bb, unsigned int scrn);
   ~BScreen(void);
@@ -215,6 +221,9 @@ public:
   inline bool getWindowCornerSnap(void) const
     { return resource.window_corner_snap; }
   inline bool allowScrollLock(void) const { return resource.allow_scroll_lock; }
+  inline bool doWorkspaceWarping(void) const
+    { return resource.workspace_warping; }
+  inline int rootScrollDirection(void) const { return resource.root_scroll; }
 
   inline const GC &getOpGC(void) const { return opGC; }
 
@@ -287,6 +296,8 @@ public:
   void savePlaceIgnoreShaded(bool i);
   void savePlaceIgnoreMaximized(bool i);
   void saveAllowScrollLock(bool a);
+  void saveWorkspaceWarping(bool w);
+  void saveRootScrollDirection(int d);
   inline void iconUpdate(void) { iconmenu->update(); }
 
 #ifdef    HAVE_STRFTIME
@@ -306,7 +317,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);