new method for loading menu files etc

[chaz/openbox] / data / rc3

diff --git a/data/rc3 b/data/rc3
index b4a68acf0c95986b9156765603abe0789e70aa51..49f004a48041d657c5888a62bf924bcd0a95bff4 100644 (file)
--- a/data/rc3
+++ b/data/rc3
@@ -132,7 +132,9 @@
       <action name="lower"/>
     </mousebind>
     <mousebind button="A-Right" action="press">
-      <action name="showmenu"><menu>client-menu</menu></action>
+      <action name="showmenu">
+        <menu plugin="client_menu">client-menu</menu>
+      </action>
     </mousebind>
     <mousebind button="A-Up" action="click">
       <action name="desktopright"/>
@@ -170,7 +172,9 @@
       <action name="unshade"/>
     </mousebind>
     <mousebind button="Right" action="press">
-      <action name="showmenu"><menu>client-menu</menu></action>
+      <action name="showmenu">
+        <menu plugin="client_menu">client-menu</menu>
+      </action>
     </mousebind>
   </context>
   <context name="handle">
@@ -236,10 +240,14 @@
       <action name="focus"/>
     </mousebind>
     <mousebind button="Right" action="press">
-      <action name="showmenu"><menu>client-menu</menu></action>
+      <action name="showmenu">
+        <menu plugin="client_menu">client-menu</menu>
+      </action>
     </mousebind>
     <mousebind button="Left" action="click">
-      <action name="showmenu"><menu>client-menu</menu></action>
+      <action name="showmenu">
+        <menu plugin="client_menu">client-menu</menu>
+      </action>
     </mousebind>
     <mousebind button="Left" action="doubleclick">
       <action name="close"/>
@@ -297,7 +305,7 @@
       <action name="close"/>
     </mousebind>
   </context>
-  <context name="root">
+  <context name="desktop">
     <mousebind button="A-Up" action="click">
       <action name="desktopright"/>
     </mousebind>
@@ -305,16 +313,27 @@
       <action name="desktopleft"/>
     </mousebind>
     <mousebind button="Middle" action="press">
-      <action name="showmenu"><menu>client-list-menu</menu></action>
+      <action name="showmenu">
+        <menu plugin="client_list_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 -->
+
+  <!-- default menu file (or custom one in $HOME/.openbox/) -->
+  <file>menu</file>
+
+  <!-- debian menu file -->
+  <file>/etc/X11/openbox/openbox-menu</file>
 </menu>
 
 </openbox_config>