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

diff --git a/src/Screen.hh b/src/Screen.hh
index 0a2586e3..4b454e02 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -120,7 +120,7 @@ private:
   BlackboxWindowList iconList, windowList;
 
   typedef std::vector<Window> WindowList;
-  WindowList desktopWindowList, systrayWindowList;
+  WindowList specialWindowList, desktopWindowList, systrayWindowList;
 
   Slit *slit;
   Toolbar *toolbar;
@@ -147,14 +147,18 @@ 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,
-      workspace_warping;
+      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, root_scroll;
+      snap_threshold, row_direction, col_direction, root_scroll,
+      resistance_size;
 
     unsigned int handle_width, bevel_width, frame_width, border_width,
       resize_zones;
@@ -216,8 +220,10 @@ 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; }
@@ -265,8 +271,12 @@ 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
@@ -282,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);
@@ -290,7 +302,8 @@ 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);