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

diff --git a/data/rc.xml.in b/data/rc.xml.in
index d187b7e5..dd7c68d8 100644
--- a/data/rc.xml.in
+++ b/data/rc.xml.in
@@ -15,7 +15,6 @@
 
 <focus>
   <focusNew>yes</focusNew>
-  <focusLast>yes</focusLast>
   <followMouse>no</followMouse>
   <focusDelay>0</focusDelay>
   <raiseOnFocus>no</raiseOnFocus>
@@ -26,6 +25,10 @@
   <titlelayout>NLIMC</titlelayout>
 </theme>
 
+<placement>
+  <policy>Smart</policy>
+</placement>
+
 <desktops>
   <number>4</number>
   <names>
@@ -51,11 +54,6 @@
   <moveButton>A-Left</moveButton>
 </dock>
 
-<dialog>
-  <focus>yes</focus>
-  <desktop>yes</desktop>
-</dialog>
-
 <keyboard>
   <chainQuitKey>C-g</chainQuitKey>
 
@@ -69,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"/>
@@ -142,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">
@@ -303,16 +301,16 @@
   </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"/>
@@ -327,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>
@@ -345,9 +343,6 @@
   <!-- 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/.config/openbox/) -->
   <file>menu.xml</file>
 </menu>