add <dialog><focus/><desktop/> to allow disabling popups

[chaz/openbox] / data / rc.xml.in

diff --git a/data/rc.xml.in b/data/rc.xml.in
index 92d65e8d26ba35512a9b4260c83b97135d972c98..d187b7e5f99e35d8496fab4a929f6db5491a045d 100644 (file)
--- a/data/rc.xml.in
+++ b/data/rc.xml.in
@@ -3,10 +3,9 @@
 <!-- Do not edit this file, it will be overwritten on install.
         Copy the file to $HOME/.config/openbox/ instead. -->
 
-<openbox_config xmlns="http://openbox/.org"
+<openbox_config xmlns="http://openbox.org/"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="
-                http://openbox.org/schema.php?type=rc&amp;version=@version@
+        xsi:schemaLocation="http://openbox.org/
                 file://@xsddir@/rc.xsd">
 
 <resistance>
@@ -16,8 +15,8 @@
 
 <focus>
   <focusNew>yes</focusNew>
-  <followMouse>no</followMouse>
   <focusLast>yes</focusLast>
+  <followMouse>no</followMouse>
   <focusDelay>0</focusDelay>
   <raiseOnFocus>no</raiseOnFocus>
 </focus>
@@ -49,8 +48,14 @@
   <floatingY>0</floatingY>
   <autoHide>no</autoHide>
   <hideDelay>300</hideDelay>
+  <moveButton>A-Left</moveButton>
 </dock>
 
+<dialog>
+  <focus>yes</focus>
+  <desktop>yes</desktop>
+</dialog>
+
 <keyboard>
   <chainQuitKey>C-g</chainQuitKey>
 
@@ -240,12 +245,9 @@
     <mousebind button="Right" action="Press">
       <action name="ShowMenu"><menu>client-menu</menu></action>
     </mousebind>
-    <mousebind button="Left" action="Click">
+    <mousebind button="Left" action="Press">
       <action name="ShowMenu"><menu>client-menu</menu></action>
     </mousebind>
-    <mousebind button="Left" action="DoubleClick">
-      <action name="Close"/>
-    </mousebind>
   </context>
   <context name="AllDesktops">
     <mousebind button="Left" action="Press">
@@ -314,6 +316,7 @@
     </mousebind>
     <mousebind button="Left" action="Press">
       <action name="Focus"/>
+      <action name="Raise"/>
     </mousebind> 
     <mousebind button="Middle" action="Press">
       <action name="ShowMenu"><menu>client-list-menu</menu></action>
@@ -345,7 +348,7 @@
   <!-- debian menu file -->
   <file>/etc/X11/openbox/openbox-menu.xml</file>
 
-  <!-- default menu file (or custom one in $HOME/.openbox/) -->
+  <!-- default menu file (or custom one in $HOME/.config/openbox/) -->
   <file>menu.xml</file>
 </menu>