Merge branch 'backport' into work

[chaz/openbox] / doc / rc-mouse-focus.xml

diff --git a/doc/rc-mouse-focus.xml b/doc/rc-mouse-focus.xml
index dcfc3811e86ecfaa02df6865b872efa468cdc458..0e71c03c5ca8e03a232970cf6faeaf5874bdfd27 100644 (file)
--- a/doc/rc-mouse-focus.xml
+++ b/doc/rc-mouse-focus.xml
@@ -14,11 +14,13 @@
   <focusNew>yes</focusNew>
   <!-- always try to focus new windows when they appear. other rules do
        apply -->
+  <followMouse>yes</followMouse>
+  <!-- move focus to a window when you move the mouse into it -->
   <focusLast>yes</focusLast>
   <!-- focus the last used window when changing desktops, instead of the one
        under the mouse pointer. when followMouse is enabled -->
-  <followMouse>yes</followMouse>
-  <!-- move focus to a window when you move the mouse into it -->
+  <underMouse>no</underMouse>
+  <!-- move focus under the mouse, even when the mouse is not moving -->
   <focusDelay>200</focusDelay>
   <!-- when followMouse is enabled, the mouse must be inside the window for
        this many milliseconds (1000 = 1 sec) before moving focus to it -->
@@ -215,13 +217,13 @@
         <enabled>true</enabled>
         <name>Konqueror</name>
       </startupnotify>
-      <execute>kfmclient openProfile filemanagement</execute>
+      <command>kfmclient openProfile filemanagement</command>
     </action>
   </keybind>
 </keyboard>
 
 <mouse>
-  <dragThreshold>3</dragThreshold>
+  <dragThreshold>8</dragThreshold>
   <!-- number of pixels the mouse must move before a drag begins -->
   <doubleClickTime>200</doubleClickTime>
   <!-- in milliseconds (1000 = 1 second) -->
@@ -514,6 +516,9 @@
     <mousebind button="Left" action="Press">
       <action name="Focus"/>
     </mousebind>
+    <mousebind button="Right" action="Press">
+      <action name="Focus"/>
+    </mousebind>
   </context>
 
   <context name="Root">