From: Dana Jansens <danakj@orodu.net>
Date: Sun, 15 Jul 2007 17:29:27 +0000 (-0400)
Subject: Revert "update the default rc.xml with the new actions syntax and the rc.xsd"
X-Git-Tag: release-3.4.3~31
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=bb19251afc043fbffde0f9bbf3c7bc485fdac90a;p=dana%2Fopenbox.git

Revert "update the default rc.xml with the new actions syntax and the rc.xsd"

This is not a part of 3.4

This reverts commit 9ac7e283a871e078444a4d2cfee8c59f8a059211.
---

diff --git a/data/rc.xml b/data/rc.xml
index ff5830dc..1630de43 100644
--- a/data/rc.xml
+++ b/data/rc.xml
@@ -161,40 +161,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"/>
@@ -215,31 +215,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>
 
@@ -250,7 +233,7 @@
         <enabled>true</enabled>
         <name>Konqueror</name>
       </startupnotify>
-      <command>kfmclient openProfile filemanagement</command>
+      <execute>kfmclient openProfile filemanagement</execute>
     </action>
   </keybind>
 </keyboard>
@@ -293,22 +276,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>
 
@@ -321,7 +304,7 @@
       <action name="Move"/>
     </mousebind>
     <mousebind button="Left" action="DoubleClick">
-      <action name="ToggleMaximize"/>
+      <action name="ToggleMaximizeFull"/>
     </mousebind>
 
     <mousebind button="Middle" action="Press">
@@ -407,7 +390,7 @@
       <action name="Raise"/>
     </mousebind>
     <mousebind button="Left" action="Drag">
-      <action name="Resize"><edge>bottomleft</edge></action>
+      <action name="Resize"/>
     </mousebind>
   </context>
 
@@ -417,7 +400,7 @@
       <action name="Raise"/>
     </mousebind>
     <mousebind button="Left" action="Drag">
-      <action name="Resize"><edge>bottomright</edge></action>
+      <action name="Resize"/>
     </mousebind>
   </context>
 
@@ -428,7 +411,7 @@
       <action name="Unshade"/>
     </mousebind>
     <mousebind button="Left" action="Drag">
-      <action name="Resize"><edge>topleft</edge></action>
+      <action name="Resize"/>
     </mousebind>
   </context>
 
@@ -439,7 +422,7 @@
       <action name="Unshade"/>
     </mousebind>
     <mousebind button="Left" action="Drag">
-      <action name="Resize"><edge>topright</edge></action>
+      <action name="Resize"/>
     </mousebind>
   </context>
 
@@ -520,13 +503,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>
 
@@ -543,23 +526,23 @@
 
   <context name="Desktop">
     <mousebind button="Up" action="Press">
-      <action name="GoToDesktop"><to>previous</to></action>
+      <action name="DesktopPrevious"/>
     </mousebind>
     <mousebind button="Down" action="Press">
-      <action name="GoToDesktop"><to>next</to></action>
+      <action name="DesktopNext"/>
     </mousebind>
 
     <mousebind button="A-Up" action="Press">
-      <action name="GoToDesktop"><to>previous</to></action>
+      <action name="DesktopPrevious"/>
     </mousebind>
     <mousebind button="A-Down" action="Press">
-      <action name="GoToDesktop"><to>next</to></action>
+      <action name="DesktopNext"/>
     </mousebind>
     <mousebind button="C-A-Up" action="Press">
-      <action name="GoToDesktop"><to>previous</to></action>
+      <action name="DesktopPrevious"/>
     </mousebind>
     <mousebind button="C-A-Down" action="Press">
-      <action name="GoToDesktop"><to>next</to></action>
+      <action name="DesktopNext"/>
     </mousebind>
 
     <mousebind button="Left" action="Press">
@@ -580,16 +563,16 @@
 
   <context name="MoveResize">
     <mousebind button="Up" action="Press">
-      <action name="GoToDesktop"><to>previous</to></action>
+      <action name="DesktopPrevious"/>
     </mousebind>
     <mousebind button="Down" action="Press">
-      <action name="GoToDesktop"><to>next</to></action>
+      <action name="DesktopNext"/>
     </mousebind>
     <mousebind button="A-Up" action="Press">
-      <action name="GoToDesktop"><to>previous</to></action>
+      <action name="DesktopPrevious"/>
     </mousebind>
     <mousebind button="A-Down" action="Press">
-      <action name="GoToDesktop"><to>next</to></action>
+      <action name="DesktopNext"/>
     </mousebind>
   </context>
 </mouse>
diff --git a/data/rc.xsd b/data/rc.xsd
index 450ac928..f37b6b11 100644
--- a/data/rc.xsd
+++ b/data/rc.xsd
@@ -192,54 +192,94 @@
       -->
     <xsd:simpleType name="actionname">
         <xsd:restriction base="xsd:string">
-            <xsd:enumeration value="AddDesktop"/>
+            <xsd:enumeration value="Activate"/>
             <xsd:enumeration value="BreakChroot"/>
             <xsd:enumeration value="Close"/>
-            <xsd:enumeration value="Debug"/>
-            <xsd:enumeration value="Decorate"/>
-            <xsd:enumeration value="DirectionalCycleWindows"/>
-            <xsd:enumeration value="DirectionalTargetWindow"/>
+            <xsd:enumeration value="Desktop"/>
+            <xsd:enumeration value="DesktopDown"/>
+            <xsd:enumeration value="DesktopLast"/>
+            <xsd:enumeration value="DesktopLeft"/>
+            <xsd:enumeration value="DesktopNext"/>
+            <xsd:enumeration value="DesktopPrevious"/>
+            <xsd:enumeration value="DesktopRight"/>
+            <xsd:enumeration value="DesktopUp"/>
+            <xsd:enumeration value="DirectionalFocusEast"/>
+            <xsd:enumeration value="DirectionalFocusNorth"/>
+            <xsd:enumeration value="DirectionalFocusNortheast"/>
+            <xsd:enumeration value="DirectionalFocusNorthwest"/>
+            <xsd:enumeration value="DirectionalFocusSouth"/>
+            <xsd:enumeration value="DirectionalFocusSoutheast"/>
+            <xsd:enumeration value="DirectionalFocusSouthwest"/>
+            <xsd:enumeration value="DirectionalFocusWest"/>
             <xsd:enumeration value="Execute"/>
             <xsd:enumeration value="Exit"/>
             <xsd:enumeration value="Focus"/>
             <xsd:enumeration value="FocusToBottom"/>
-            <xsd:enumeration value="GoToDesktop"/>
-            <xsd:enumeration value="GrowToEdge"/>
+            <xsd:enumeration value="GrowToEdgeEast"/>
+            <xsd:enumeration value="GrowToEdgeNorth"/>
+            <xsd:enumeration value="GrowToEdgeSouth"/>
+            <xsd:enumeration value="GrowToEdgeWest"/>
             <xsd:enumeration value="Iconify"/>
-            <xsd:enumeration value="If"/>
             <xsd:enumeration value="Kill"/>
             <xsd:enumeration value="Lower"/>
-            <xsd:enumeration value="Maximize"/>
+            <xsd:enumeration value="MaximizeFull"/>
+            <xsd:enumeration value="MaximizeHorz"/>
+            <xsd:enumeration value="MaximizeVert"/>
             <xsd:enumeration value="Move"/>
             <xsd:enumeration value="MoveRelative"/>
-            <xsd:enumeration value="MoveResizeTo"/>
-            <xsd:enumeration value="MoveToEdge"/>
+            <xsd:enumeration value="MoveRelativeHorz"/>
+            <xsd:enumeration value="MoveRelativeVert"/>
+            <xsd:enumeration value="MoveToCenter"/>
+            <xsd:enumeration value="MoveFromEdgeEast"/>
+            <xsd:enumeration value="MoveFromEdgeNorth"/>
+            <xsd:enumeration value="MoveFromEdgeSouth"/>
+            <xsd:enumeration value="MoveFromEdgeWest"/>
+            <xsd:enumeration value="MoveToEdgeEast"/>
+            <xsd:enumeration value="MoveToEdgeNorth"/>
+            <xsd:enumeration value="MoveToEdgeSouth"/>
+            <xsd:enumeration value="MoveToEdgeWest"/>
             <xsd:enumeration value="NextWindow"/>
             <xsd:enumeration value="PreviousWindow"/>
             <xsd:enumeration value="Raise"/>
             <xsd:enumeration value="RaiseLower"/>
             <xsd:enumeration value="Reconfigure"/>
-            <xsd:enumeration value="RemoveDesktop"/>
             <xsd:enumeration value="Resize"/>
             <xsd:enumeration value="ResizeRelative"/>
+            <xsd:enumeration value="ResizeRelativeHorz"/>
+            <xsd:enumeration value="ResizeRelativeVert"/>
             <xsd:enumeration value="Restart"/>
+            <xsd:enumeration value="SendToBottomLayer"/>
             <xsd:enumeration value="SendToDesktop"/>
-            <xsd:enumeration value="SendToLayer"/>
+            <xsd:enumeration value="SendToDesktopDown"/>
+            <xsd:enumeration value="SendToDesktopLeft"/>
+            <xsd:enumeration value="SendToDesktopNext"/>
+            <xsd:enumeration value="SendToDesktopPrevious"/>
+            <xsd:enumeration value="SendToDesktopRight"/>
+            <xsd:enumeration value="SendToDesktopUp"/>
+            <xsd:enumeration value="SendToNormalLayer"/>
+            <xsd:enumeration value="SendToTopLayer"/>
             <xsd:enumeration value="Shade"/>
+            <xsd:enumeration value="ShadeLower"/>
+            <xsd:enumeration value="ShowDesktop"/>
             <xsd:enumeration value="ShowMenu"/>
             <xsd:enumeration value="ToggleAlwaysOnBottom"/>
             <xsd:enumeration value="ToggleAlwaysOnTop"/>
             <xsd:enumeration value="ToggleDecorations"/>
             <xsd:enumeration value="ToggleDockAutoHide"/>
             <xsd:enumeration value="ToggleFullscreen"/>
-            <xsd:enumeration value="ToggleMaximize"/>
+            <xsd:enumeration value="ToggleMaximizeFull"/>
+            <xsd:enumeration value="ToggleMaximizeHorz"/>
+            <xsd:enumeration value="ToggleMaximizeVert"/>
             <xsd:enumeration value="ToggleOmnipresent"/>
             <xsd:enumeration value="ToggleShade"/>
             <xsd:enumeration value="ToggleShowDesktop"/>
-            <xsd:enumeration value="Undecorate"/>
             <xsd:enumeration value="Unfocus"/>
-            <xsd:enumeration value="Unmaximize"/>
+            <xsd:enumeration value="UnmaximizeFull"/>
+            <xsd:enumeration value="UnmaximizeHorz"/>
+            <xsd:enumeration value="UnmaximizeVert"/>
             <xsd:enumeration value="Unshade"/>
+            <xsd:enumeration value="UnshadeRaise"/>
+            <xsd:enumeration value="UnShowDesktop"/>
         </xsd:restriction>
     </xsd:simpleType>
     <xsd:simpleType name="bool">