make interactive actions a type and not special cases.

[chaz/openbox] / data / rc3

diff --git a/data/rc3 b/data/rc3
index 38ff0a80be393981a5f05577d3094edc5b107020..1b553fa7a9006ca6cceb68b080b4bf0c66d70ca9 100644 (file)
--- a/data/rc3
+++ b/data/rc3
@@ -19,7 +19,6 @@
   <followMouse>no</followMouse>
   <focusLast>yes</focusLast>
   <focusLastOnDesktop>yes</focusLastOnDesktop>
-  <cyclingDialog>yes</cyclingDialog>
 </focus>
 
 <theme>
@@ -35,7 +34,6 @@
     <name>three</name>
     <name>four</name>
   </names>
-  <cyclingDialog>yes</cyclingDialog>
 </desktops>
 
 <resize>
@@ -135,16 +133,16 @@
       <action name="showmenu"><menu>client-menu</menu></action>
     </mousebind>
     <mousebind button="A-Up" action="click">
-      <action name="desktopright"/>
+      <action name="desktopnext"/>
     </mousebind>
     <mousebind button="A-Down" action="click">
-      <action name="desktopleft"/>
+      <action name="desktopprevious"/>
     </mousebind>
     <mousebind button="C-A-Up" action="click">
-      <action name="sendtodesktopright"/>
+      <action name="sendtodesktopnext"/>
     </mousebind>
     <mousebind button="C-A-Down" action="click">
-      <action name="sendtodesktopleft"/>
+      <action name="sendtodesktopprevious"/>
     </mousebind>
   </context>
   <context name="titlebar">
@@ -298,11 +296,17 @@
     </mousebind>
   </context>
   <context name="desktop">
+    <mousebind button="Up" action="click">
+      <action name="desktopnext"><interactive>no</interactive></action>
+    </mousebind>
+    <mousebind button="Down" action="click">
+      <action name="desktopprevious"><interactive>no</interactive></action>
+    </mousebind>
     <mousebind button="A-Up" action="click">
-      <action name="desktopright"/>
+      <action name="desktopnext"/>
     </mousebind>
     <mousebind button="A-Down" action="click">
-      <action name="desktopleft"/>
+      <action name="desktopprevious"/>
     </mousebind>
     <mousebind button="Middle" action="press">
       <action name="showmenu"><menu>client-list-menu</menu></action>
@@ -319,11 +323,11 @@
   <!-- 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 -->
 
-  <!-- default menu file (or custom one in $HOME/.openbox/) -->
-  <file>menu</file>
-
   <!-- debian menu file -->
   <file>/etc/X11/openbox/openbox-menu</file>
+
+  <!-- default menu file (or custom one in $HOME/.openbox/) -->
+  <file>menu</file>
 </menu>
 
 </openbox_config>