X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=data%2Frc.xml.in;h=dd7c68d8c34517a20c7319d4eb0a77866a8622cb;hb=57ddb2751e718677cacafbce799024589d850f35;hp=8f24c94edaf44cd13b48bd457dbb28d1543c3885;hpb=af3ae51f822d9e4bb2b164d8590886f08f5b659f;p=chaz%2Fopenbox

diff --git a/data/rc.xml.in b/data/rc.xml.in
index 8f24c94e..dd7c68d8 100644
--- a/data/rc.xml.in
+++ b/data/rc.xml.in
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!-- Do not edit this file, it will be overwritten on install.
-        Copy the file to $HOME/.openbox/ instead. -->
+        Copy the file to $HOME/.config/openbox/ instead. -->
 
-<openbox_config xmlns="http://openbox/.org"
+<openbox_config xmlns="http://openbox.org/"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="
-                http://openbox.org/schema.php?type=rc&amp;version=@version@
+        xsi:schemaLocation="http://openbox.org/
                 file://@xsddir@/rc.xsd">
 
 <resistance>
@@ -17,7 +16,6 @@
 <focus>
   <focusNew>yes</focusNew>
   <followMouse>no</followMouse>
-  <focusLast>yes</focusLast>
   <focusDelay>0</focusDelay>
   <raiseOnFocus>no</raiseOnFocus>
 </focus>
@@ -27,6 +25,10 @@
   <titlelayout>NLIMC</titlelayout>
 </theme>
 
+<placement>
+  <policy>Smart</policy>
+</placement>
+
 <desktops>
   <number>4</number>
   <names>
@@ -48,7 +50,8 @@
   <floatingX>0</floatingX>
   <floatingY>0</floatingY>
   <autoHide>no</autoHide>
-  <hideTimeout>300</hideTimeout>
+  <hideDelay>300</hideDelay>
+  <moveButton>A-Left</moveButton>
 </dock>
 
 <keyboard>
@@ -64,28 +67,28 @@
     <action name="ToggleShade"/>
   </keybind>
   <keybind key="C-A-Left">
-    <action name="DesktopLeft"/>
+    <action name="DesktopLeft"><wrap>no</wrap></action>
   </keybind>
   <keybind key="C-A-Right">
-    <action name="DesktopRight"/>
+    <action name="DesktopRight"><wrap>no</wrap></action>
   </keybind>
   <keybind key="C-A-Up">
-    <action name="DesktopUp"/>
+    <action name="DesktopUp"><wrap>no</wrap></action>
   </keybind>
   <keybind key="C-A-Down">
-    <action name="DesktopDown"/>
+    <action name="DesktopDown"><wrap>no</wrap></action>
   </keybind>
   <keybind key="S-A-Left">
-    <action name="SendToDesktopLeft"/>
+    <action name="SendToDesktopLeft"><wrap>no</wrap></action>
   </keybind>
   <keybind key="S-A-Right">
-    <action name="SendToDesktopRight"/>
+    <action name="SendToDesktopRight"><wrap>no</wrap></action>
   </keybind>
   <keybind key="S-A-Up">
-    <action name="SendToDesktopUp"/>
+    <action name="SendToDesktopUp"><wrap>no</wrap></action>
   </keybind>
   <keybind key="S-A-Down">
-    <action name="SendToDesktopDown"/>
+    <action name="SendToDesktopDown"><wrap>no</wrap></action>
   </keybind>
   <keybind key="C-A-d">
     <action name="ToggleShowDesktop"/>
@@ -137,16 +140,16 @@
       <action name="ShowMenu"><menu>client-menu</menu></action>
     </mousebind>
     <mousebind button="A-Up" action="Click">
-      <action name="DesktopNext"/>
+      <action name="DesktopPrevious"/>
     </mousebind>
     <mousebind button="A-Down" action="Click">
-      <action name="DesktopPrevious"/>
+      <action name="DesktopNext"/>
     </mousebind>
     <mousebind button="C-A-Up" action="Click">
-      <action name="SendToDesktopNext"/>
+      <action name="SendToDesktopPrevious"/>
     </mousebind>
     <mousebind button="C-A-Down" action="Click">
-      <action name="SendToDesktopPrevious"/>
+      <action name="SendToDesktopNext"/>
     </mousebind>
   </context>
   <context name="Titlebar">
@@ -240,12 +243,9 @@
     <mousebind button="Right" action="Press">
       <action name="ShowMenu"><menu>client-menu</menu></action>
     </mousebind>
-    <mousebind button="Left" action="Click">
+    <mousebind button="Left" action="Press">
       <action name="ShowMenu"><menu>client-menu</menu></action>
     </mousebind>
-    <mousebind button="Left" action="DoubleClick">
-      <action name="Close"/>
-    </mousebind>
   </context>
   <context name="AllDesktops">
     <mousebind button="Left" action="Press">
@@ -301,19 +301,20 @@
   </context>
   <context name="Desktop">
     <mousebind button="Up" action="Press">
-      <action name="DesktopNext"/>
+      <action name="DesktopPrevious"/>
     </mousebind>
     <mousebind button="Down" action="Press">
-      <action name="DesktopPrevious"/>
+      <action name="DesktopNext"/>
     </mousebind>
     <mousebind button="A-Up" action="Press">
-      <action name="DesktopNext"/>
+      <action name="DesktopPrevious"/>
     </mousebind>
     <mousebind button="A-Down" action="Press">
-      <action name="DesktopPrevious"/>
+      <action name="DesktopNext"/>
     </mousebind>
     <mousebind button="Left" action="Press">
       <action name="Focus"/>
+      <action name="Raise"/>
     </mousebind> 
     <mousebind button="Middle" action="Press">
       <action name="ShowMenu"><menu>client-list-menu</menu></action>
@@ -324,16 +325,16 @@
   </context>
   <context name="MoveResize">
     <mousebind button="Up" action="Press">
-      <action name="DesktopNext"/>
+      <action name="DesktopPrevious"/>
     </mousebind>
     <mousebind button="Down" action="Press">
-      <action name="DesktopPrevious"/>
+      <action name="DesktopNext"/>
     </mousebind>
     <mousebind button="A-Up" action="Press">
-      <action name="DesktopNext"/>
+      <action name="DesktopPrevious"/>
     </mousebind>
     <mousebind button="A-Down" action="Press">
-      <action name="DesktopPrevious"/>
+      <action name="DesktopNext"/>
     </mousebind>
   </context>
 </mouse>
@@ -342,10 +343,7 @@
   <!-- You can specify more than one menu file in here and they are all loaded,
        just don't make menu ids clash or, well, it'll be kind of pointless -->
 
-  <!-- debian menu file -->
-  <file>/etc/X11/openbox/openbox-menu.xml</file>
-
-  <!-- default menu file (or custom one in $HOME/.openbox/) -->
+  <!-- default menu file (or custom one in $HOME/.config/openbox/) -->
   <file>menu.xml</file>
 </menu>