Allow XIncludes in xml documents we read.

[chaz/openbox] / data / rc.xml

diff --git a/data/rc.xml b/data/rc.xml
index 63470918b72935c2b399e3650fe5b9d4f270e42e..7faa2550238cfd70b84a4a5c615c1698ff6de14f 100644 (file)
--- a/data/rc.xml
+++ b/data/rc.xml
@@ -3,7 +3,8 @@
 <!-- Do not edit this file, it will be overwritten on install.
         Copy the file to $HOME/.config/openbox/ instead. -->
 
-<openbox_config xmlns="http://openbox.org/3.4/rc">
+<openbox_config xmlns="http://openbox.org/3.4/rc"
+               xmlns:xi="http://www.w3.org/2001/XInclude">
 
 <resistance>
   <strength>10</strength>
@@ -318,6 +319,9 @@
   <!-- Time before changing desktops when the pointer touches the edge of the
        screen while moving a window, in milliseconds (1000 = 1 second).
        Set this to 0 to disable warping -->
+  <screenEdgeWarpMouse>false</screenEdgeWarpMouse>
+  <!-- Set this to TRUE to move the mouse pointer across the desktop when
+       switching due to hitting the edge of the screen -->
 
   <context name="Frame">
     <mousebind button="A-Left" action="Press">
@@ -367,10 +371,6 @@
   </context>
 
   <context name="Titlebar">
-    <mousebind button="Left" action="Press">
-      <action name="Focus"/>
-      <action name="Raise"/>
-    </mousebind>
     <mousebind button="Left" action="Drag">
       <action name="Move"/>
     </mousebind>
@@ -378,12 +378,6 @@
       <action name="ToggleMaximize"/>
     </mousebind>
 
-    <mousebind button="Middle" action="Press">
-      <action name="Lower"/>
-      <action name="FocusToBottom"/>
-      <action name="Unfocus"/>
-    </mousebind>
-
     <mousebind button="Up" action="Click">
       <action name="if">
         <shaded>no</shaded>
@@ -404,6 +398,20 @@
         </then>
       </action>
     </mousebind>
+  </context>
+
+  <context name="Titlebar Top Right Bottom Left TLCorner TRCorner BRCorner BLCorner">
+    <mousebind button="Left" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+      <action name="Unshade"/>
+    </mousebind>
+
+    <mousebind button="Middle" action="Press">
+      <action name="Lower"/>
+      <action name="FocusToBottom"/>
+      <action name="Unfocus"/>
+    </mousebind>
 
     <mousebind button="Right" action="Press">
       <action name="Focus"/>
@@ -413,51 +421,28 @@
   </context>
 
   <context name="Top">
-    <mousebind button="Left" action="Press">
-      <action name="Focus"/>
-      <action name="Raise"/>
-      <action name="Unshade"/>
-    </mousebind>
     <mousebind button="Left" action="Drag">
       <action name="Resize"><edge>top</edge></action>
     </mousebind>
   </context>
 
   <context name="Left">
-    <mousebind button="Left" action="Press">
-      <action name="Focus"/>
-      <action name="Raise"/>
-    </mousebind>
     <mousebind button="Left" action="Drag">
       <action name="Resize"><edge>left</edge></action>
     </mousebind>
   </context>
 
   <context name="Right">
-    <mousebind button="Left" action="Press">
-      <action name="Focus"/>
-      <action name="Raise"/>
-    </mousebind>
     <mousebind button="Left" action="Drag">
       <action name="Resize"><edge>right</edge></action>
     </mousebind>
   </context>
 
   <context name="Bottom">
-    <mousebind button="Left" action="Press">
-      <action name="Focus"/>
-      <action name="Raise"/>
-    </mousebind>
     <mousebind button="Left" action="Drag">
       <action name="Resize"><edge>bottom</edge></action>
     </mousebind>
 
-    <mousebind button="Middle" action="Press">
-      <action name="Lower"/>
-      <action name="FocusToBottom"/>
-      <action name="Unfocus"/>
-    </mousebind>
-
     <mousebind button="Right" action="Press">
       <action name="Focus"/>
       <action name="Raise"/>
@@ -465,45 +450,14 @@
     </mousebind>
   </context>
 
-  <context name="BLCorner">
-    <mousebind button="Left" action="Press">
-      <action name="Focus"/>
-      <action name="Raise"/>
-    </mousebind>
-    <mousebind button="Left" action="Drag">
-      <action name="Resize"><edge>bottomleft</edge></action>
-    </mousebind>
-  </context>
-
-  <context name="BRCorner">
-    <mousebind button="Left" action="Press">
-      <action name="Focus"/>
-      <action name="Raise"/>
-    </mousebind>
-    <mousebind button="Left" action="Drag">
-      <action name="Resize"><edge>bottomright</edge></action>
-    </mousebind>
-  </context>
-
-  <context name="TLCorner">
-    <mousebind button="Left" action="Press">
-      <action name="Focus"/>
-      <action name="Raise"/>
-      <action name="Unshade"/>
-    </mousebind>
-    <mousebind button="Left" action="Drag">
-      <action name="Resize"><edge>topleft</edge></action>
-    </mousebind>
-  </context>
-
-  <context name="TRCorner">
+  <context name="TRCorner BRCorner TLCorner BLCorner">
     <mousebind button="Left" action="Press">
       <action name="Focus"/>
       <action name="Raise"/>
       <action name="Unshade"/>
     </mousebind>
     <mousebind button="Left" action="Drag">
-      <action name="Resize"><edge>topright</edge></action>
+      <action name="Resize"/>
     </mousebind>
   </context>
 
@@ -673,7 +627,7 @@
        menu is hidden again -->
   <middle>no</middle>
   <!-- center submenus vertically about the parent entry -->
-  <submenuShowDelay>200</submenuShowDelay>
+  <submenuShowDelay>100</submenuShowDelay>
   <!-- time to delay before showing a submenu after hovering over the parent
        entry.
        if this is a negative value, then the delay is infinite and the