Merge branch 'backport' into 3.4-working

[mikachu/openbox.git] / data / rc.xml

diff --git a/data/rc.xml b/data/rc.xml
index eaf3df7..7f6846b 100644 (file)
--- a/data/rc.xml
+++ b/data/rc.xml
@@ -184,40 +184,40 @@
 
   <!-- Keybindings for desktop switching -->
   <keybind key="C-A-Left">
-    <action name="GoToDesktop"><to>left</to><wrap>no</wrap></action>
+    <action name="DesktopLeft"><dialog>no</dialog><wrap>no</wrap></action>
   </keybind>
   <keybind key="C-A-Right">
-    <action name="GoToDesktop"><to>right</to><wrap>no</wrap></action>
+    <action name="DesktopRight"><dialog>no</dialog><wrap>no</wrap></action>
   </keybind>
   <keybind key="C-A-Up">
-    <action name="GoToDesktop"><to>up</to><wrap>no</wrap></action>
+    <action name="DesktopUp"><dialog>no</dialog><wrap>no</wrap></action>
   </keybind>
   <keybind key="C-A-Down">
-    <action name="GoToDesktop"><to>down</to><wrap>no</wrap></action>
+    <action name="DesktopDown"><dialog>no</dialog><wrap>no</wrap></action>
   </keybind>
   <keybind key="S-A-Left">
-    <action name="SendToDesktop"><to>left</to><wrap>no</wrap></action>
+    <action name="SendToDesktopLeft"><dialog>no</dialog><wrap>no</wrap></action>
   </keybind>
   <keybind key="S-A-Right">
-    <action name="SendToDesktop"><to>right</to><wrap>no</wrap></action>
+    <action name="SendToDesktopRight"><dialog>no</dialog><wrap>no</wrap></action>
   </keybind>
   <keybind key="S-A-Up">
-    <action name="SendToDesktop"><to>up</to><wrap>no</wrap></action>
+    <action name="SendToDesktopUp"><dialog>no</dialog><wrap>no</wrap></action>
   </keybind>
   <keybind key="S-A-Down">
-    <action name="SendToDesktop"><to>down</to><wrap>no</wrap></action>
+    <action name="SendToDesktopDown"><dialog>no</dialog><wrap>no</wrap></action>
   </keybind>
   <keybind key="W-F1">
-    <action name="GoToDesktop"><to>1</to></action>
+    <action name="Desktop"><desktop>1</desktop></action>
   </keybind>
   <keybind key="W-F2">
-    <action name="GoToDesktop"><to>2</to></action>
+    <action name="Desktop"><desktop>2</desktop></action>
   </keybind>
   <keybind key="W-F3">
-    <action name="GoToDesktop"><to>3</to></action>
+    <action name="Desktop"><desktop>3</desktop></action>
   </keybind>
   <keybind key="W-F4">
-    <action name="GoToDesktop"><to>4</to></action>
+    <action name="Desktop"><desktop>4</desktop></action>
   </keybind>
   <keybind key="W-d">
     <action name="ToggleShowDesktop"/>
@@ -238,31 +238,14 @@
 
   <!-- Keybindings for window switching -->
   <keybind key="A-Tab">
-    <action name="NextWindow">
-      <finalactions>
-        <action name="Focus"/>
-        <action name="Raise"/>
-        <action name="Unshade"/>
-      </finalactions>
-    </action>
+    <action name="NextWindow"/>
   </keybind>
   <keybind key="A-S-Tab">
-    <action name="PreviousWindow">
-      <finalactions>
-        <action name="Focus"/>
-        <action name="Raise"/>
-        <action name="Unshade"/>
-      </finalactions>
-    </action>
+    <action name="PreviousWindow"/>
   </keybind>
   <keybind key="C-A-Tab">
     <action name="NextWindow">
       <panels>yes</panels><desktop>yes</desktop>
-      <finalactions>
-        <action name="Focus"/>
-        <action name="Raise"/>
-        <action name="Unshade"/>
-      </finalactions>
     </action>
   </keybind>
 
@@ -316,22 +299,22 @@
     </mousebind>
 
     <mousebind button="A-Up" action="Click">
-      <action name="GoToDesktop"><to>previous</to></action>
+      <action name="DesktopPrevious"/>
     </mousebind>
     <mousebind button="A-Down" action="Click">
-      <action name="GoToDesktop"><to>next</to></action>
+      <action name="DesktopNext"/>
     </mousebind>
     <mousebind button="C-A-Up" action="Click">
-      <action name="GoToDesktop"><to>previous</to></action>
+      <action name="DesktopPrevious"/>
     </mousebind>
     <mousebind button="C-A-Down" action="Click">
-      <action name="GoToDesktop"><to>next</to></action>
+      <action name="DesktopNext"/>
     </mousebind>
     <mousebind button="A-S-Up" action="Click">
-      <action name="SendToDesktop"><to>previous</to></action>
+      <action name="SendToDesktopPrevious"/>
     </mousebind>
     <mousebind button="A-S-Down" action="Click">
-      <action name="SendToDesktop"><to>next</to></action>
+      <action name="SendToDesktopNext"/>
     </mousebind>
   </context>
 
@@ -344,7 +327,7 @@
       <action name="Move"/>
     </mousebind>
     <mousebind button="Left" action="DoubleClick">
-      <action name="ToggleMaximize"/>
+      <action name="ToggleMaximizeFull"/>
     </mousebind>
 
     <mousebind button="Middle" action="Press">
@@ -430,7 +413,7 @@
       <action name="Raise"/>
     </mousebind>
     <mousebind button="Left" action="Drag">
-      <action name="Resize"><edge>bottomleft</edge></action>
+      <action name="Resize"/>
     </mousebind>
   </context>
 
@@ -440,7 +423,7 @@
       <action name="Raise"/>
     </mousebind>
     <mousebind button="Left" action="Drag">
-      <action name="Resize"><edge>bottomright</edge></action>
+      <action name="Resize"/>
     </mousebind>
   </context>
 
@@ -451,7 +434,7 @@
       <action name="Unshade"/>
     </mousebind>
     <mousebind button="Left" action="Drag">
-      <action name="Resize"><edge>topleft</edge></action>
+      <action name="Resize"/>
     </mousebind>
   </context>
 
@@ -462,7 +445,7 @@
       <action name="Unshade"/>
     </mousebind>
     <mousebind button="Left" action="Drag">
-      <action name="Resize"><edge>topright</edge></action>
+      <action name="Resize"/>
     </mousebind>
   </context>
 
@@ -543,13 +526,13 @@
       <action name="Unshade"/>
     </mousebind>
     <mousebind button="Left" action="Click">
-      <action name="ToggleMaximize"/>
+      <action name="ToggleMaximizeFull"/>
     </mousebind>
     <mousebind button="Middle" action="Click">
-      <action name="ToggleMaximize"><direction>vertical</direction></action>
+      <action name="ToggleMaximizeVert"/>
     </mousebind>
     <mousebind button="Right" action="Click">
-      <action name="ToggleMaximize"><direction>horizontal</direction></action>
+      <action name="ToggleMaximizeHorz"/>
     </mousebind>
   </context>
 
@@ -565,24 +548,24 @@
   </context>
 
   <context name="Desktop">
-    <mousebind button="Up" action="Press">
-      <action name="GoToDesktop"><to>previous</to></action>
+    <mousebind button="Up" action="Click">
+      <action name="DesktopPrevious"/>
     </mousebind>
-    <mousebind button="Down" action="Press">
-      <action name="GoToDesktop"><to>next</to></action>
+    <mousebind button="Down" action="Click">
+      <action name="DesktopNext"/>
     </mousebind>
 
-    <mousebind button="A-Up" action="Press">
-      <action name="GoToDesktop"><to>previous</to></action>
+    <mousebind button="A-Up" action="Click">
+      <action name="DesktopPrevious"/>
     </mousebind>
-    <mousebind button="A-Down" action="Press">
-      <action name="GoToDesktop"><to>next</to></action>
+    <mousebind button="A-Down" action="Click">
+      <action name="DesktopNext"/>
     </mousebind>
-    <mousebind button="C-A-Up" action="Press">
-      <action name="GoToDesktop"><to>previous</to></action>
+    <mousebind button="C-A-Up" action="Click">
+      <action name="DesktopPrevious"/>
     </mousebind>
-    <mousebind button="C-A-Down" action="Press">
-      <action name="GoToDesktop"><to>next</to></action>
+    <mousebind button="C-A-Down" action="Click">
+      <action name="DesktopNext"/>
     </mousebind>
 
     <mousebind button="Left" action="Press">
@@ -606,17 +589,17 @@
   </context>
 
   <context name="MoveResize">
-    <mousebind button="Up" action="Press">
-      <action name="GoToDesktop"><to>previous</to></action>
+    <mousebind button="Up" action="Click">
+      <action name="DesktopPrevious"/>
     </mousebind>
-    <mousebind button="Down" action="Press">
-      <action name="GoToDesktop"><to>next</to></action>
+    <mousebind button="Down" action="Click">
+      <action name="DesktopNext"/>
     </mousebind>
-    <mousebind button="A-Up" action="Press">
-      <action name="GoToDesktop"><to>previous</to></action>
+    <mousebind button="A-Up" action="Click">
+      <action name="DesktopPrevious"/>
     </mousebind>
-    <mousebind button="A-Down" action="Press">
-      <action name="GoToDesktop"><to>next</to></action>
+    <mousebind button="A-Down" action="Click">
+      <action name="DesktopNext"/>
     </mousebind>
   </context>
 </mouse>