From c62770aede702e9a792fac42ca1517459aa99891 Mon Sep 17 00:00:00 2001
From: Dave Foster <daf@minuslab.net>
Date: Sat, 23 Aug 2008 00:20:37 -0400
Subject: [PATCH] Added <windowMargin> config item and made the margin thing
 respect it!

---
 data/rc.xml      |  4 ++++
 data/rc.xsd      |  1 +
 openbox/client.c | 10 +++++-----
 openbox/config.c | 12 ++++++++++++
 openbox/config.h |  3 +++
 openbox/resist.c | 23 ++++++++++++++---------
 6 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/data/rc.xml b/data/rc.xml
index 2b65b25f..7090a268 100644
--- a/data/rc.xml
+++ b/data/rc.xml
@@ -10,6 +10,10 @@
   <screen_edge_strength>20</screen_edge_strength>
 </resistance>
 
+<!-- amount of space around windows to respect in terms of 
+     moving/resizing/growing/shrinking -->
+<windowMargin>0</windowMargin>
+
 <focus>
   <focusNew>yes</focusNew>
   <!-- always try to focus new windows when they appear. other rules do
diff --git a/data/rc.xsd b/data/rc.xsd
index c51135b4..7e96b3b8 100644
--- a/data/rc.xsd
+++ b/data/rc.xsd
@@ -65,6 +65,7 @@
         <xsd:element minOccurs="0" name="right" type="xsd:integer"/>
         <xsd:element minOccurs="0" name="bottom" type="xsd:integer"/>
     </xsd:complexType>              
+    <xsd:element name="windowMargin" type="xsd:integer"/>
     <xsd:complexType name="theme">
         <xsd:element minOccurs="0" name="name" type="xsd:string"/>
         <xsd:element minOccurs="0" name="titleLayout" type="xsd:string"/>
diff --git a/openbox/client.c b/openbox/client.c
index ae157fb4..749527dd 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -55,7 +55,7 @@
 #include <glib.h>
 #include <X11/Xutil.h>
 
-extern StrutPartial config_margins;
+extern guint config_window_margin;
 
 /*! The event mask to grab on client windows */
 #define CLIENT_EVENTMASK (PropertyChangeMask | StructureNotifyMask | \
@@ -4254,10 +4254,10 @@ void client_find_edge_directional(ObClient *self, ObDirection dir,
 
         ob_debug("trying window %s\n", cur->title);
 
-        RECT_SET(expand, cur->frame->area.x - config_margins.left, 
-                         cur->frame->area.y - config_margins.top, 
-                         cur->frame->area.width + config_margins.left + config_margins.right, 
-                         cur->frame->area.height + config_margins.top + config_margins.bottom);
+        RECT_SET(expand, cur->frame->area.x - config_window_margin, 
+                         cur->frame->area.y - config_window_margin, 
+                         cur->frame->area.width + config_window_margin * 2, 
+                         cur->frame->area.height + config_window_margin * 2);
         detect_edge(expand, dir, my_head, my_size, my_edge_start,
                     my_edge_size, dest, near_edge);
     }
diff --git a/openbox/config.c b/openbox/config.c
index b623931a..bd914321 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -96,6 +96,8 @@ GSList *config_menu_files;
 gint     config_resist_win;
 gint     config_resist_edge;
 
+guint    config_window_margin;
+
 GSList *config_per_app_settings;
 
 ObAppSettings* config_create_app_settings(void)
@@ -822,6 +824,12 @@ static void parse_resistance(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
         config_resist_edge = parse_int(doc, n);
 }
 
+static void parse_window_margin(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+                                gpointer data)
+{
+    config_window_margin = parse_int(doc, node);
+}
+
 typedef struct
 {
     const gchar *key;
@@ -994,6 +1002,10 @@ void config_startup(ObParseInst *i)
 
     parse_register(i, "resistance", parse_resistance, NULL);
 
+    config_window_margin = 0;
+
+    parse_register(i, "windowMargin", parse_window_margin, NULL);
+
     config_menu_hide_delay = 250;
     config_menu_middle = FALSE;
     config_submenu_show_delay = 0;
diff --git a/openbox/config.h b/openbox/config.h
index 109d8221..93f12ce1 100644
--- a/openbox/config.h
+++ b/openbox/config.h
@@ -173,6 +173,9 @@ extern gint config_resist_win;
 /*! Number of pixels to resist while crossing a screen's edge */
 extern gint config_resist_edge;
 
+/*! Number of pixels surrounding windows, affects move/resize/grow/shrink */
+extern guint config_window_margin;
+
 /*! Delay for hiding menu when opening in milliseconds */
 extern guint    config_menu_hide_delay;
 /*! Center menus vertically about the parent entry */
diff --git a/openbox/resist.c b/openbox/resist.c
index 11e3b92f..f6823d3c 100644
--- a/openbox/resist.c
+++ b/openbox/resist.c
@@ -28,7 +28,7 @@
 
 #include <glib.h>
 
-extern StrutPartial config_margins;
+extern guint config_window_margin;
 
 static gboolean resist_move_window(Rect window,
                                    Rect target, gint resist,
@@ -133,10 +133,13 @@ void resist_move_windows(ObClient *c, gint resist, gint *x, gint *y)
             break;
 
         /* now check window with the expanded margin area */
-        RECT_SET(expand, target->frame->area.x - config_margins.left, 
-                         target->frame->area.y - config_margins.top, 
-                         target->frame->area.width + config_margins.left + config_margins.right, 
-                         target->frame->area.height + config_margins.top + config_margins.bottom);
+        if (config_window_margin == 0)
+            continue;
+
+        RECT_SET(expand, target->frame->area.x - config_window_margin, 
+                         target->frame->area.y - config_window_margin, 
+                         target->frame->area.width + config_window_margin * 2, 
+                         target->frame->area.height + config_window_margin * 2);
 
         if (resist_move_window(c->frame->area, expand,
                                resist, x, y))
@@ -333,11 +336,13 @@ void resist_size_windows(ObClient *c, gint resist, gint *w, gint *h,
             break;
 
         /* now check window with the expanded margin area */
-        RECT_SET(expand, target->frame->area.x - config_margins.left, 
-                         target->frame->area.y - config_margins.top, 
-                         target->frame->area.width + config_margins.left + config_margins.right, 
-                         target->frame->area.height + config_margins.top + config_margins.bottom);
+        if (config_window_margin == 0)
+            continue;
 
+        RECT_SET(expand, target->frame->area.x - config_window_margin, 
+                         target->frame->area.y - config_window_margin, 
+                         target->frame->area.width + config_window_margin * 2, 
+                         target->frame->area.height + config_window_margin * 2);
 
         if (resist_size_window(c->frame->area, expand,
                                resist, w, h, dir))
-- 
2.34.1