add comment

[chaz/openbox] / src / Screen.hh

diff --git a/src/Screen.hh b/src/Screen.hh
index 06548d415aa0351d82ebbcbaa66954e20de2c0bb..12cd960db07751490f7c4a07e8a96f538d3e32a9 100644 (file)
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -148,7 +148,8 @@ 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;
@@ -218,6 +219,8 @@ 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 const GC &getOpGC(void) const { return opGC; }
 
@@ -290,6 +293,7 @@ public:
   void savePlaceIgnoreShaded(bool i);
   void savePlaceIgnoreMaximized(bool i);
   void saveAllowScrollLock(bool a);
+  void saveWorkspaceWarping(bool w);
   inline void iconUpdate(void) { iconmenu->update(); }
 
 #ifdef    HAVE_STRFTIME
@@ -312,7 +316,9 @@ public:
   // allAvailableAreas should be used whenever possible instead of this function
   // as then Xinerama will work correctly.
   const Rect& availableArea(void) const;
-  RectList allAvailableAreas(void) const;
+#ifdef    XINERAMA
+  const RectList& allAvailableAreas(void) const;
+#endif // XINERAMA
   void updateAvailableArea(void);
   void addStrut(Strut *strut);
   void removeStrut(Strut *strut);