make interactive actions a type and not special cases.

[chaz/openbox] / data / rc3

diff --git a/data/rc3 b/data/rc3
index 282236ccca6b303d397a7f9cb0a36356f1adb92f..1b553fa7a9006ca6cceb68b080b4bf0c66d70ca9 100644 (file)
--- a/data/rc3
+++ b/data/rc3
@@ -1,14 +1,13 @@
 <?xml version="1.0"?>
 
-<!-- Do not edit this file, it will be overwritten on install. Edit the file
-     in $HOME/.openbox/ instead. -->
+<!-- Do not edit this file, it will be overwritten on install. Copy the file
+     to $HOME/.openbox/ instead. -->
 
 <openbox_config>
 
 <resistance>
   <strength>10</strength>
   <screen_edge_strength>10</screen_edge_strength>
-  <windows>yes</windows>
 </resistance>
 
 <placement>
@@ -20,7 +19,6 @@
   <followMouse>no</followMouse>
   <focusLast>yes</focusLast>
   <focusLastOnDesktop>yes</focusLastOnDesktop>
-  <cyclingDialog>yes</cyclingDialog>
 </focus>
 
 <theme>
@@ -38,10 +36,9 @@
   </names>
 </desktops>
 
-<moveresize>
-  <opaqueMove>yes</opaqueMove>
-  <opaqueResize>yes</opaqueResize>
-</moveresize>
+<resize>
+  <drawContents>yes</drawContents>
+</resize>
 
 <dock>
   <position>topleft</position>
@@ -54,6 +51,8 @@
 </dock>
 
 <keyboard>
+  <chainQuitKey>C-g</chainQuitKey>
+
   <keybind key="A-F10">
     <action name="MaximizeFull"></action>
   </keybind>
@@ -134,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">
@@ -296,58 +295,39 @@
       <action name="close"/>
     </mousebind>
   </context>
-  <context name="root">
+  <context name="desktop">
     <mousebind button="Up" action="click">
-      <action name="desktopright"/>
+      <action name="desktopnext"><interactive>no</interactive></action>
     </mousebind>
     <mousebind button="Down" action="click">
-      <action name="desktopleft"/>
+      <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>
+    </mousebind> 
     <mousebind button="Right" action="press">
-      <action name="showmenu"><menu>root</menu></action>
+      <action name="showmenu">
+        <menu>root-menu</menu>
+      </action>
     </mousebind>
   </context>
 </mouse>
 
-<menu id="root" label="Openbox 3">
-  <menu id="apps" label="Applications">
-    <item label="Xterm">
-      <action name="execute"><execute>xterm</execute></action>
-    </item>
-    <item label="Mozilla">
-      <action name="execute"><execute>mozilla</execute></action>
-    </item>
-    <item label="Gaim">
-      <action name="execute"><execute>gaim</execute></action>
-    </item>
-    <item label="Quark">
-      <action name="execute"><execute>strange-quark</execute></action>
-    </item>
-  </menu>
-  <menu id="games" label="Games">
-    <item label="Crack-Attack">
-      <action name="execute"><execute>crack-attack</execute></action>
-    </item>
-    <item label="XFRisk">
-      <action name="execute"><execute>xfrisk</execute></action>
-    </item>
-    <item label="Quake III">
-      <action name="execute"><execute>quake3</execute></action>
-    </item>
-  </menu>
-  <item label="--" /> <!-- separator -->
-  <item label="Restart">
-    <action name="restart" />
-  </item>
-  <item label="Exit">
-    <action name="exit" />
-  </item>
+<menu>
+  <!-- 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>