Merge branch 'backport'

diff --combined data/rc.xml
index e54cb04,3cd88ee..567ca28
--- 1/data/rc.xml
--- 2/data/rc.xml
+++ b/data/rc.xml
@@@ -35,6 -35,9 +35,9 @@@
    <center>yes</center>
    <!-- whether to place windows in the center of the free area found or
         the top left corner -->
+   <active>no</active>
+   <!-- force new windows ont the active monitor on a multi-head system, unless
+        they are part of an application already on another monitor -->
  </placement>
  
  <theme>
@@@ -126,7 -129,17 +129,17 @@@
    <popupShow>Nonpixel</popupShow>
    <!-- 'Always', 'Never', or 'Nonpixel' (xterms and such) -->
    <popupPosition>Center</popupPosition>
-   <!-- 'Center' or 'Top' -->
+   <!-- 'Center', 'Top', or 'Fixed' -->
+   <popupFixedPosition>
+     <!-- these are used if popupPosition is set to 'Fixed' -->
+ 
+     <x>10</x>
+     <!-- positive number for distance from left edge, negative number for
+          distance from right edge, or 'Center' -->
+     <y>10</y>
+     <!-- positive number for distance from top edge, negative number for
+          distance from bottom edge, or 'Center' -->
+   </popupFixedPosition>
  </resize>
  
  <!-- You can reserve a portion of your screen where windows will not cover when
@@@ -334,24 -347,14 +347,24 @@@
      </mousebind>
  
      <mousebind button="Up" action="Click">
 -      <action name="Shade"/>
 -      <action name="FocusToBottom"/>
 -      <action name="Unfocus"/>
 -      <action name="Lower"/>
 +      <action name="if">
 +        <shaded>no</shaded>
 +        <then>
 +          <action name="Shade"/>
 +          <action name="FocusToBottom"/>
 +          <action name="Unfocus"/>
 +          <action name="Lower"/>
 +        </then>
 +      </action>
      </mousebind>
      <mousebind button="Down" action="Click">
 -      <action name="Unshade"/>
 -      <action name="Raise"/>
 +      <action name="if">
 +        <shaded>yes</shaded>
 +        <then>
 +          <action name="Unshade"/>
 +          <action name="Raise"/>
 +        </then>
 +      </action>
      </mousebind>
  
      <mousebind button="Right" action="Press">
@@@ -555,23 -558,23 +568,23 @@@
    </context>
  
    <context name="Desktop">
 -    <mousebind button="Up" action="Press">
 +    <mousebind button="Up" action="Click">
        <action name="GoToDesktop"><to>previous</to></action>
      </mousebind>
 -    <mousebind button="Down" action="Press">
 +    <mousebind button="Down" action="Click">
        <action name="GoToDesktop"><to>next</to></action>
      </mousebind>
  
 -    <mousebind button="A-Up" action="Press">
 +    <mousebind button="A-Up" action="Click">
        <action name="GoToDesktop"><to>previous</to></action>
      </mousebind>
 -    <mousebind button="A-Down" action="Press">
 +    <mousebind button="A-Down" action="Click">
        <action name="GoToDesktop"><to>next</to></action>
      </mousebind>
 -    <mousebind button="C-A-Up" action="Press">
 +    <mousebind button="C-A-Up" action="Click">
        <action name="GoToDesktop"><to>previous</to></action>
      </mousebind>
 -    <mousebind button="C-A-Down" action="Press">
 +    <mousebind button="C-A-Down" action="Click">
        <action name="GoToDesktop"><to>next</to></action>
      </mousebind>
  
@@@ -579,6 -582,10 +592,10 @@@
        <action name="Focus"/>
        <action name="Raise"/>
      </mousebind>
+     <mousebind button="Right" action="Press">
+       <action name="Focus"/>
+       <action name="Raise"/>
+     </mousebind>
    </context>
  
    <context name="Root">
@@@ -592,16 -599,16 +609,16 @@@
    </context>
  
    <context name="MoveResize">
 -    <mousebind button="Up" action="Press">
 +    <mousebind button="Up" action="Click">
        <action name="GoToDesktop"><to>previous</to></action>
      </mousebind>
 -    <mousebind button="Down" action="Press">
 +    <mousebind button="Down" action="Click">
        <action name="GoToDesktop"><to>next</to></action>
      </mousebind>
 -    <mousebind button="A-Up" action="Press">
 +    <mousebind button="A-Up" action="Click">
        <action name="GoToDesktop"><to>previous</to></action>
      </mousebind>
 -    <mousebind button="A-Down" action="Press">
 +    <mousebind button="A-Down" action="Click">
        <action name="GoToDesktop"><to>next</to></action>
      </mousebind>
    </context>