merge some contexts together in the default rc.xml mouse bindings

diff --git a/data/rc.xml b/data/rc.xml
index e4376a4b30ec84113f0328d569e4b352118b35d8..21b0c87f0a9f49cc45f6ef381158dc47a647094e 100644 (file)
--- a/data/rc.xml
+++ b/data/rc.xml
@@ -370,10 +370,6 @@
   </context>
 
   <context name="Titlebar">
-    <mousebind button="Left" action="Press">
-      <action name="Focus"/>
-      <action name="Raise"/>
-    </mousebind>
     <mousebind button="Left" action="Drag">
       <action name="Move"/>
     </mousebind>
@@ -381,12 +377,6 @@
       <action name="ToggleMaximize"/>
     </mousebind>
 
-    <mousebind button="Middle" action="Press">
-      <action name="Lower"/>
-      <action name="FocusToBottom"/>
-      <action name="Unfocus"/>
-    </mousebind>
-
     <mousebind button="Up" action="Click">
       <action name="if">
         <shaded>no</shaded>
@@ -407,6 +397,20 @@
         </then>
       </action>
     </mousebind>
+  </context>
+
+  <context name="Titlebar Top Right Bottom Left TLCorner TRCorner BRCorner BLCorner">
+    <mousebind button="Left" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+      <action name="Unshade"/>
+    </mousebind>
+
+    <mousebind button="Middle" action="Press">
+      <action name="Lower"/>
+      <action name="FocusToBottom"/>
+      <action name="Unfocus"/>
+    </mousebind>
 
     <mousebind button="Right" action="Press">
       <action name="Focus"/>
@@ -416,63 +420,28 @@
   </context>
 
   <context name="Top">
-    <mousebind button="Left" action="Press">
-      <action name="Focus"/>
-      <action name="Raise"/>
-      <action name="Unshade"/>
-    </mousebind>
     <mousebind button="Left" action="Drag">
       <action name="Resize"><edge>top</edge></action>
     </mousebind>
   </context>
 
   <context name="Left">
-    <mousebind button="Left" action="Press">
-      <action name="Focus"/>
-      <action name="Raise"/>
-    </mousebind>
     <mousebind button="Left" action="Drag">
       <action name="Resize"><edge>left</edge></action>
     </mousebind>
-
-    <mousebind button="Right" action="Press">
-      <action name="Focus"/>
-      <action name="Raise"/>
-      <action name="ShowMenu"><menu>client-menu</menu></action>
-    </mousebind>
   </context>
 
   <context name="Right">
-    <mousebind button="Left" action="Press">
-      <action name="Focus"/>
-      <action name="Raise"/>
-    </mousebind>
     <mousebind button="Left" action="Drag">
       <action name="Resize"><edge>right</edge></action>
     </mousebind>
-
-    <mousebind button="Right" action="Press">
-      <action name="Focus"/>
-      <action name="Raise"/>
-      <action name="ShowMenu"><menu>client-menu</menu></action>
-    </mousebind>
   </context>
 
   <context name="Bottom">
-    <mousebind button="Left" action="Press">
-      <action name="Focus"/>
-      <action name="Raise"/>
-    </mousebind>
     <mousebind button="Left" action="Drag">
       <action name="Resize"><edge>bottom</edge></action>
     </mousebind>
 
-    <mousebind button="Middle" action="Press">
-      <action name="Lower"/>
-      <action name="FocusToBottom"/>
-      <action name="Unfocus"/>
-    </mousebind>
-
     <mousebind button="Right" action="Press">
       <action name="Focus"/>
       <action name="Raise"/>
@@ -480,45 +449,14 @@
     </mousebind>
   </context>
 
-  <context name="BLCorner">
-    <mousebind button="Left" action="Press">
-      <action name="Focus"/>
-      <action name="Raise"/>
-    </mousebind>
-    <mousebind button="Left" action="Drag">
-      <action name="Resize"><edge>bottomleft</edge></action>
-    </mousebind>
-  </context>
-
-  <context name="BRCorner">
-    <mousebind button="Left" action="Press">
-      <action name="Focus"/>
-      <action name="Raise"/>
-    </mousebind>
-    <mousebind button="Left" action="Drag">
-      <action name="Resize"><edge>bottomright</edge></action>
-    </mousebind>
-  </context>
-
-  <context name="TLCorner">
+  <context name="TRCorner BRCorner TLCorner BLCorner">
     <mousebind button="Left" action="Press">
       <action name="Focus"/>
       <action name="Raise"/>
       <action name="Unshade"/>
     </mousebind>
     <mousebind button="Left" action="Drag">
-      <action name="Resize"><edge>topleft</edge></action>
-    </mousebind>
-  </context>
-
-  <context name="TRCorner">
-    <mousebind button="Left" action="Press">
-      <action name="Focus"/>
-      <action name="Raise"/>
-      <action name="Unshade"/>
-    </mousebind>
-    <mousebind button="Left" action="Drag">
-      <action name="Resize"><edge>topright</edge></action>
+      <action name="Resize"/>
     </mousebind>
   </context>