X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=data%2Frc3;h=7d58fb21917a4a12cb18c8abc66367620df79a02;hb=84de4a1785ad2602d11689797a4a8dd99887206e;hp=b4a68acf0c95986b9156765603abe0789e70aa51;hpb=fec178a2106fca3f65814eefacf0505431c8389d;p=chaz%2Fopenbox

diff --git a/data/rc3 b/data/rc3
index b4a68acf..7d58fb21 100644
--- 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">
@@ -297,24 +295,39 @@
       <action name="close"/>
     </mousebind>
   </context>
-  <context name="root">
+  <context name="desktop">
+    <mousebind button="Up" action="click">
+      <action name="desktopnext"></action>
+    </mousebind>
+    <mousebind button="Down" action="click">
+      <action name="desktopprevious"></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>
     </mousebind> 
     <mousebind button="Right" action="press">
-      <action name="showmenu"><menu>root-menu</menu></action>
+      <action name="showmenu">
+        <menu>root-menu</menu>
+      </action>
     </mousebind>
   </context>
 </mouse>
 
 <menu>
-  <location>~/.openbox/menu</location>
+  <!-- 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</file>
+
+  <!-- default menu file (or custom one in $HOME/.openbox/) -->
+  <file>menu</file>
 </menu>
 
 </openbox_config>