X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2FScreen.hh;h=4b454e0253699dd9e613e70e04276081fe3f60c0;hb=75b6a5a378966efc09c355109ab42467ddc6d845;hp=37946b99aea49f5db7a8c01572b471d488ba58b5;hpb=90dbcb271c5e6d7ca73c19a519b93885b833db0a;p=chaz%2Fopenbox

diff --git a/src/Screen.hh b/src/Screen.hh
index 37946b99..4b454e02 100644
--- 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;
@@ -125,7 +120,7 @@ private:
   BlackboxWindowList iconList, windowList;
 
   typedef std::vector<Window> WindowList;
-  WindowList desktopWindowList, systrayWindowList;
+  WindowList specialWindowList, desktopWindowList, systrayWindowList;
 
   Slit *slit;
   Toolbar *toolbar;
@@ -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,12 +147,18 @@ 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;
+      allow_scroll_lock, hide_toolbar, window_corner_snap, aa_fonts,
+      ignore_shaded, ignore_maximized, workspace_warping;
+
+    int snap_to_windows, snap_to_edges;
+    unsigned int snap_offset;
+
     BColor border_color;
 
     unsigned int workspaces;
     int toolbar_placement, toolbar_width_percent, placement_policy,
-      edge_snap_threshold, row_direction, col_direction;
+      snap_threshold, row_direction, col_direction, root_scroll,
+      resistance_size;
 
     unsigned int handle_width, bevel_width, frame_width, border_width,
       resize_zones;
@@ -188,13 +192,16 @@ private:
 
   void updateWorkArea(void);
 public:
+  enum { WindowNoSnap = 0, WindowSnap, WindowResistance };
   enum { RowSmartPlacement = 1, ColSmartPlacement, CascadePlacement,
-         UnderMousePlacement, LeftRight, RightLeft, TopBottom, BottomTop };
+         UnderMousePlacement, ClickMousePlacement, LeftRight, RightLeft,
+         TopBottom, BottomTop, IgnoreShaded, IgnoreMaximized };
   enum { RoundBullet = 1, TriangleBullet, SquareBullet, NoBullet };
   enum { Restart = 1, RestartOther, Exit, Shutdown, Execute, Reconfigure,
          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);
@@ -213,10 +220,16 @@ public:
   inline bool doFocusNew(void) const { return resource.focus_new; }
   inline bool doFocusLast(void) const { return resource.focus_last; }
   inline bool doHideToolbar(void) const { return resource.hide_toolbar; }
-  inline bool getWindowToWindowSnap(void) const
-    { return resource.window_to_window_snap; }
+  inline int getWindowToWindowSnap(void) const
+    { return resource.snap_to_windows; }
+  inline int getWindowToEdgeSnap(void) const
+    { return resource.snap_to_edges; }
   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; }
 
@@ -244,6 +257,10 @@ public:
   { return resource.border_width; }
   inline unsigned int getResizeZones(void) const
   { return resource.resize_zones; }
+  inline bool getPlaceIgnoreShaded(void) const
+  { return resource.ignore_shaded; }
+  inline bool getPlaceIgnoreMaximized(void) const
+  { return resource.ignore_maximized; }
 
   inline unsigned int getCurrentWorkspaceID(void) const
   { return current_workspace->getID(); }
@@ -254,13 +271,19 @@ public:
   { return resource.workspaces; }
   inline int getPlacementPolicy(void) const
   { return resource.placement_policy; }
-  inline int getEdgeSnapThreshold(void) const
-  { return resource.edge_snap_threshold; }
+  inline int getSnapOffset(void) const
+  { return resource.snap_offset; }
+  inline int getSnapThreshold(void) const
+  { return resource.snap_threshold; }
+  inline int getResistanceSize(void) const
+  { return resource.resistance_size; }
   inline int getRowPlacementDirection(void) const
   { return resource.row_direction; }
   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);
@@ -269,7 +292,9 @@ public:
   void savePlacementPolicy(int p);
   void saveRowPlacementDirection(int d);
   void saveColPlacementDirection(int d);
-  void saveEdgeSnapThreshold(int t);
+  void saveSnapThreshold(int t);
+  void saveSnapOffset(int o);
+  void saveResistanceSize(int s);
   void saveImageDither(bool d);
   void saveAAFonts(bool f);
   void saveOpaqueMove(bool o);
@@ -277,9 +302,15 @@ public:
   void saveFocusNew(bool f);
   void saveFocusLast(bool f);
   void saveHideToolbar(bool h);
-  void saveWindowToWindowSnap(bool s);
+  void saveWindowToEdgeSnap(int s);
+  void saveWindowToWindowSnap(int s);
   void saveWindowCornerSnap(bool s);
   void saveResizeZones(unsigned int z);
+  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
@@ -299,7 +330,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);
@@ -312,9 +348,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);