X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=data%2Frc.xml;h=1630de43cbc53681b4c6004d1a9196dac7ce17d6;hb=5ae93282f93ecafc491202a363f944d9604d3437;hp=1a4230c7efa07c87c5a5580de083ff209e886528;hpb=e048751f914d16cb6346f7e7ca6532eaae44ce31;p=chaz%2Fopenbox

diff --git a/data/rc.xml b/data/rc.xml
index 1a4230c7..1630de43 100644
--- a/data/rc.xml
+++ b/data/rc.xml
@@ -126,6 +126,17 @@
   <!-- 'Center' or 'Top' -->
 </resize>
 
+<!-- You can reserve a portion of your screen where windows will not cover when
+     they are maximized, or when they are initially placed.
+     Many programs reserve space automatically, but you can use this in other
+     cases. -->
+<margins>
+  <top>0</top>
+  <bottom>0</bottom>
+  <left>0</left>
+  <right>0</right>
+</margins>
+
 <dock>
   <position>TopLeft</position>
   <!-- (Top|Bottom)(Left|Right|)|Top|Bottom|Left|Right|Floating -->
@@ -150,28 +161,28 @@
 
   <!-- Keybindings for desktop switching -->
   <keybind key="C-A-Left">
-    <action name="DesktopLeft"><wrap>no</wrap></action>
+    <action name="DesktopLeft"><dialog>no</dialog><wrap>no</wrap></action>
   </keybind>
   <keybind key="C-A-Right">
-    <action name="DesktopRight"><wrap>no</wrap></action>
+    <action name="DesktopRight"><dialog>no</dialog><wrap>no</wrap></action>
   </keybind>
   <keybind key="C-A-Up">
-    <action name="DesktopUp"><wrap>no</wrap></action>
+    <action name="DesktopUp"><dialog>no</dialog><wrap>no</wrap></action>
   </keybind>
   <keybind key="C-A-Down">
-    <action name="DesktopDown"><wrap>no</wrap></action>
+    <action name="DesktopDown"><dialog>no</dialog><wrap>no</wrap></action>
   </keybind>
   <keybind key="S-A-Left">
-    <action name="SendToDesktopLeft"><wrap>no</wrap></action>
+    <action name="SendToDesktopLeft"><dialog>no</dialog><wrap>no</wrap></action>
   </keybind>
   <keybind key="S-A-Right">
-    <action name="SendToDesktopRight"><wrap>no</wrap></action>
+    <action name="SendToDesktopRight"><dialog>no</dialog><wrap>no</wrap></action>
   </keybind>
   <keybind key="S-A-Up">
-    <action name="SendToDesktopUp"><wrap>no</wrap></action>
+    <action name="SendToDesktopUp"><dialog>no</dialog><wrap>no</wrap></action>
   </keybind>
   <keybind key="S-A-Down">
-    <action name="SendToDesktopDown"><wrap>no</wrap></action>
+    <action name="SendToDesktopDown"><dialog>no</dialog><wrap>no</wrap></action>
   </keybind>
   <keybind key="W-F1">
     <action name="Desktop"><desktop>1</desktop></action>
@@ -232,6 +243,10 @@
   <!-- number of pixels the mouse must move before a drag begins -->
   <doubleClickTime>200</doubleClickTime>
   <!-- in milliseconds (1000 = 1 second) -->
+  <screenEdgeWarpTime>400</screenEdgeWarpTime>
+  <!-- time before changing desktops when the pointer touches the edge of the
+       screen while moving a window, in milliseconds (1000 = 1 second),
+       0 disables warping -->
 
   <context name="Frame">
     <mousebind button="A-Left" action="Press">
@@ -607,9 +622,10 @@
       # the position is only used if both an x and y coordinate are provided
       # (and not set to 'default')
       <x>center</x>
-      # a number like 50, or 'center' to center on screen
+      # a number like 50, or 'center' to center on screen. use a negative number
+      # to start from the right (or bottom for <y>), ie -50 is 50 pixels from the
+      # right edge (or bottom).
       <y>200</y>
-      # a number like 50, or 'center' to center on screen
       <monitor>1</monitor>
       # specifies the monitor in a xinerama setup.
       # 1 is the first head, or 'mouse' for wherever the mouse is