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

diff --git a/data/rc.xml b/data/rc.xml
index 1630de4..ff5830d 100644 (file)
--- a/data/rc.xml
+++ b/data/rc.xml
@@ -161,40 +161,40 @@
 
   <!-- Keybindings for desktop switching -->
   <keybind key="C-A-Left">
 
   <!-- Keybindings for desktop switching -->
   <keybind key="C-A-Left">

-    <action name="DesktopLeft"><dialog>no</dialog><wrap>no</wrap></action>
+    <action name="GoToDesktop"><to>left</to><wrap>no</wrap></action>

   </keybind>
   <keybind key="C-A-Right">
   </keybind>
   <keybind key="C-A-Right">

-    <action name="DesktopRight"><dialog>no</dialog><wrap>no</wrap></action>
+    <action name="GoToDesktop"><to>right</to><wrap>no</wrap></action>

   </keybind>
   <keybind key="C-A-Up">
   </keybind>
   <keybind key="C-A-Up">

-    <action name="DesktopUp"><dialog>no</dialog><wrap>no</wrap></action>
+    <action name="GoToDesktop"><to>up</to><wrap>no</wrap></action>

   </keybind>
   <keybind key="C-A-Down">
   </keybind>
   <keybind key="C-A-Down">

-    <action name="DesktopDown"><dialog>no</dialog><wrap>no</wrap></action>
+    <action name="GoToDesktop"><to>down</to><wrap>no</wrap></action>

   </keybind>
   <keybind key="S-A-Left">
   </keybind>
   <keybind key="S-A-Left">

-    <action name="SendToDesktopLeft"><dialog>no</dialog><wrap>no</wrap></action>
+    <action name="SendToDesktop"><to>left</to><wrap>no</wrap></action>

   </keybind>
   <keybind key="S-A-Right">
   </keybind>
   <keybind key="S-A-Right">

-    <action name="SendToDesktopRight"><dialog>no</dialog><wrap>no</wrap></action>
+    <action name="SendToDesktop"><to>right</to><wrap>no</wrap></action>

   </keybind>
   <keybind key="S-A-Up">
   </keybind>
   <keybind key="S-A-Up">

-    <action name="SendToDesktopUp"><dialog>no</dialog><wrap>no</wrap></action>
+    <action name="SendToDesktop"><to>up</to><wrap>no</wrap></action>

   </keybind>
   <keybind key="S-A-Down">
   </keybind>
   <keybind key="S-A-Down">

-    <action name="SendToDesktopDown"><dialog>no</dialog><wrap>no</wrap></action>
+    <action name="SendToDesktop"><to>down</to><wrap>no</wrap></action>

   </keybind>
   <keybind key="W-F1">
   </keybind>
   <keybind key="W-F1">

-    <action name="Desktop"><desktop>1</desktop></action>
+    <action name="GoToDesktop"><to>1</to></action>

   </keybind>
   <keybind key="W-F2">
   </keybind>
   <keybind key="W-F2">

-    <action name="Desktop"><desktop>2</desktop></action>
+    <action name="GoToDesktop"><to>2</to></action>

   </keybind>
   <keybind key="W-F3">
   </keybind>
   <keybind key="W-F3">

-    <action name="Desktop"><desktop>3</desktop></action>
+    <action name="GoToDesktop"><to>3</to></action>

   </keybind>
   <keybind key="W-F4">
   </keybind>
   <keybind key="W-F4">

-    <action name="Desktop"><desktop>4</desktop></action>
+    <action name="GoToDesktop"><to>4</to></action>

   </keybind>
   <keybind key="W-d">
     <action name="ToggleShowDesktop"/>
   </keybind>
   <keybind key="W-d">
     <action name="ToggleShowDesktop"/>


@@ -215,14 +215,31 @@
 
   <!-- Keybindings for window switching -->
   <keybind key="A-Tab">
 
   <!-- Keybindings for window switching -->
   <keybind key="A-Tab">

-    <action name="NextWindow"/>
+    <action name="NextWindow">
+      <finalactions>
+        <action name="Focus"/>
+        <action name="Raise"/>
+        <action name="Unshade"/>
+      </finalactions>
+    </action>

   </keybind>
   <keybind key="A-S-Tab">
   </keybind>
   <keybind key="A-S-Tab">

-    <action name="PreviousWindow"/>
+    <action name="PreviousWindow">
+      <finalactions>
+        <action name="Focus"/>
+        <action name="Raise"/>
+        <action name="Unshade"/>
+      </finalactions>
+    </action>

   </keybind>
   <keybind key="C-A-Tab">
     <action name="NextWindow">
       <panels>yes</panels><desktop>yes</desktop>
   </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>
 
     </action>
   </keybind>
 


@@ -233,7 +250,7 @@
         <enabled>true</enabled>
         <name>Konqueror</name>
       </startupnotify>
         <enabled>true</enabled>
         <name>Konqueror</name>
       </startupnotify>

-      <execute>kfmclient openProfile filemanagement</execute>
+      <command>kfmclient openProfile filemanagement</command>

     </action>
   </keybind>
 </keyboard>
     </action>
   </keybind>
 </keyboard>


@@ -276,22 +293,22 @@
     </mousebind>
 
     <mousebind button="A-Up" action="Click">
     </mousebind>
 
     <mousebind button="A-Up" action="Click">

-      <action name="DesktopPrevious"/>
+      <action name="GoToDesktop"><to>previous</to></action>

     </mousebind>
     <mousebind button="A-Down" action="Click">
     </mousebind>
     <mousebind button="A-Down" action="Click">

-      <action name="DesktopNext"/>
+      <action name="GoToDesktop"><to>next</to></action>

     </mousebind>
     <mousebind button="C-A-Up" action="Click">
     </mousebind>
     <mousebind button="C-A-Up" action="Click">

-      <action name="DesktopPrevious"/>
+      <action name="GoToDesktop"><to>previous</to></action>

     </mousebind>
     <mousebind button="C-A-Down" action="Click">
     </mousebind>
     <mousebind button="C-A-Down" action="Click">

-      <action name="DesktopNext"/>
+      <action name="GoToDesktop"><to>next</to></action>

     </mousebind>
     <mousebind button="A-S-Up" action="Click">
     </mousebind>
     <mousebind button="A-S-Up" action="Click">

-      <action name="SendToDesktopPrevious"/>
+      <action name="SendToDesktop"><to>previous</to></action>

     </mousebind>
     <mousebind button="A-S-Down" action="Click">
     </mousebind>
     <mousebind button="A-S-Down" action="Click">

-      <action name="SendToDesktopNext"/>
+      <action name="SendToDesktop"><to>next</to></action>

     </mousebind>
   </context>
 
     </mousebind>
   </context>
 


@@ -304,7 +321,7 @@
       <action name="Move"/>
     </mousebind>
     <mousebind button="Left" action="DoubleClick">
       <action name="Move"/>
     </mousebind>
     <mousebind button="Left" action="DoubleClick">

-      <action name="ToggleMaximizeFull"/>
+      <action name="ToggleMaximize"/>

     </mousebind>
 
     <mousebind button="Middle" action="Press">
     </mousebind>
 
     <mousebind button="Middle" action="Press">


@@ -390,7 +407,7 @@
       <action name="Raise"/>
     </mousebind>
     <mousebind button="Left" action="Drag">
       <action name="Raise"/>
     </mousebind>
     <mousebind button="Left" action="Drag">

-      <action name="Resize"/>
+      <action name="Resize"><edge>bottomleft</edge></action>

     </mousebind>
   </context>
 
     </mousebind>
   </context>
 


@@ -400,7 +417,7 @@
       <action name="Raise"/>
     </mousebind>
     <mousebind button="Left" action="Drag">
       <action name="Raise"/>
     </mousebind>
     <mousebind button="Left" action="Drag">

-      <action name="Resize"/>
+      <action name="Resize"><edge>bottomright</edge></action>

     </mousebind>
   </context>
 
     </mousebind>
   </context>
 


@@ -411,7 +428,7 @@
       <action name="Unshade"/>
     </mousebind>
     <mousebind button="Left" action="Drag">
       <action name="Unshade"/>
     </mousebind>
     <mousebind button="Left" action="Drag">

-      <action name="Resize"/>
+      <action name="Resize"><edge>topleft</edge></action>

     </mousebind>
   </context>
 
     </mousebind>
   </context>
 


@@ -422,7 +439,7 @@
       <action name="Unshade"/>
     </mousebind>
     <mousebind button="Left" action="Drag">
       <action name="Unshade"/>
     </mousebind>
     <mousebind button="Left" action="Drag">

-      <action name="Resize"/>
+      <action name="Resize"><edge>topright</edge></action>

     </mousebind>
   </context>
 
     </mousebind>
   </context>
 


@@ -503,13 +520,13 @@
       <action name="Unshade"/>
     </mousebind>
     <mousebind button="Left" action="Click">
       <action name="Unshade"/>
     </mousebind>
     <mousebind button="Left" action="Click">

-      <action name="ToggleMaximizeFull"/>
+      <action name="ToggleMaximize"/>

     </mousebind>
     <mousebind button="Middle" action="Click">
     </mousebind>
     <mousebind button="Middle" action="Click">

-      <action name="ToggleMaximizeVert"/>
+      <action name="ToggleMaximize"><direction>vertical</direction></action>

     </mousebind>
     <mousebind button="Right" action="Click">
     </mousebind>
     <mousebind button="Right" action="Click">

-      <action name="ToggleMaximizeHorz"/>
+      <action name="ToggleMaximize"><direction>horizontal</direction></action>

     </mousebind>
   </context>
 
     </mousebind>
   </context>
 


@@ -526,23 +543,23 @@
 
   <context name="Desktop">
     <mousebind button="Up" action="Press">
 
   <context name="Desktop">
     <mousebind button="Up" action="Press">

-      <action name="DesktopPrevious"/>
+      <action name="GoToDesktop"><to>previous</to></action>

     </mousebind>
     <mousebind button="Down" action="Press">
     </mousebind>
     <mousebind button="Down" action="Press">

-      <action name="DesktopNext"/>
+      <action name="GoToDesktop"><to>next</to></action>

     </mousebind>
 
     <mousebind button="A-Up" action="Press">
     </mousebind>
 
     <mousebind button="A-Up" action="Press">

-      <action name="DesktopPrevious"/>
+      <action name="GoToDesktop"><to>previous</to></action>

     </mousebind>
     <mousebind button="A-Down" action="Press">
     </mousebind>
     <mousebind button="A-Down" action="Press">

-      <action name="DesktopNext"/>
+      <action name="GoToDesktop"><to>next</to></action>

     </mousebind>
     <mousebind button="C-A-Up" action="Press">
     </mousebind>
     <mousebind button="C-A-Up" action="Press">

-      <action name="DesktopPrevious"/>
+      <action name="GoToDesktop"><to>previous</to></action>

     </mousebind>
     <mousebind button="C-A-Down" action="Press">
     </mousebind>
     <mousebind button="C-A-Down" action="Press">

-      <action name="DesktopNext"/>
+      <action name="GoToDesktop"><to>next</to></action>

     </mousebind>
 
     <mousebind button="Left" action="Press">
     </mousebind>
 
     <mousebind button="Left" action="Press">


@@ -563,16 +580,16 @@
 
   <context name="MoveResize">
     <mousebind button="Up" action="Press">
 
   <context name="MoveResize">
     <mousebind button="Up" action="Press">

-      <action name="DesktopPrevious"/>
+      <action name="GoToDesktop"><to>previous</to></action>

     </mousebind>
     <mousebind button="Down" action="Press">
     </mousebind>
     <mousebind button="Down" action="Press">

-      <action name="DesktopNext"/>
+      <action name="GoToDesktop"><to>next</to></action>

     </mousebind>
     <mousebind button="A-Up" action="Press">
     </mousebind>
     <mousebind button="A-Up" action="Press">

-      <action name="DesktopPrevious"/>
+      <action name="GoToDesktop"><to>previous</to></action>

     </mousebind>
     <mousebind button="A-Down" action="Press">
     </mousebind>
     <mousebind button="A-Down" action="Press">

-      <action name="DesktopNext"/>
+      <action name="GoToDesktop"><to>next</to></action>

     </mousebind>
   </context>
 </mouse>
     </mousebind>
   </context>
 </mouse>

diff --git a/data/rc.xsd b/data/rc.xsd
index debac5b..13306f2 100644 (file)
--- a/data/rc.xsd
+++ b/data/rc.xsd
@@ -192,94 +192,54 @@
       -->
     <xsd:simpleType name="actionname">
         <xsd:restriction base="xsd:string">
       -->
     <xsd:simpleType name="actionname">
         <xsd:restriction base="xsd:string">

-            <xsd:enumeration value="Activate"/>
+            <xsd:enumeration value="AddDesktop"/>

             <xsd:enumeration value="BreakChroot"/>
             <xsd:enumeration value="Close"/>
             <xsd:enumeration value="BreakChroot"/>
             <xsd:enumeration value="Close"/>

-            <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="Debug"/>
+            <xsd:enumeration value="Decorate"/>
+            <xsd:enumeration value="DirectionalCycleWindows"/>
+            <xsd:enumeration value="DirectionalTargetWindow"/>

             <xsd:enumeration value="Execute"/>
             <xsd:enumeration value="Exit"/>
             <xsd:enumeration value="Focus"/>
             <xsd:enumeration value="FocusToBottom"/>
             <xsd:enumeration value="Execute"/>
             <xsd:enumeration value="Exit"/>
             <xsd:enumeration value="Focus"/>
             <xsd:enumeration value="FocusToBottom"/>

-            <xsd:enumeration value="GrowToEdgeEast"/>
-            <xsd:enumeration value="GrowToEdgeNorth"/>
-            <xsd:enumeration value="GrowToEdgeSouth"/>
-            <xsd:enumeration value="GrowToEdgeWest"/>
+            <xsd:enumeration value="GoToDesktop"/>
+            <xsd:enumeration value="GrowToEdge"/>

             <xsd:enumeration value="Iconify"/>
             <xsd:enumeration value="Iconify"/>

+            <xsd:enumeration value="If"/>

             <xsd:enumeration value="Kill"/>
             <xsd:enumeration value="Lower"/>
             <xsd:enumeration value="Kill"/>
             <xsd:enumeration value="Lower"/>

-            <xsd:enumeration value="MaximizeFull"/>
-            <xsd:enumeration value="MaximizeHorz"/>
-            <xsd:enumeration value="MaximizeVert"/>
+            <xsd:enumeration value="Maximize"/>

             <xsd:enumeration value="Move"/>
             <xsd:enumeration value="MoveRelative"/>
             <xsd:enumeration value="Move"/>
             <xsd:enumeration value="MoveRelative"/>

-            <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="MoveResizeTo"/>
+            <xsd:enumeration value="MoveToEdge"/>

             <xsd:enumeration value="NextWindow"/>
             <xsd:enumeration value="PreviousWindow"/>
             <xsd:enumeration value="Raise"/>
             <xsd:enumeration value="RaiseLower"/>
             <xsd:enumeration value="Reconfigure"/>
             <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="Resize"/>
             <xsd:enumeration value="ResizeRelative"/>

-            <xsd:enumeration value="ResizeRelativeHorz"/>
-            <xsd:enumeration value="ResizeRelativeVert"/>

             <xsd:enumeration value="Restart"/>
             <xsd:enumeration value="Restart"/>

-            <xsd:enumeration value="SendToBottomLayer"/>

             <xsd:enumeration value="SendToDesktop"/>
             <xsd:enumeration value="SendToDesktop"/>

-            <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="SendToLayer"/>

             <xsd:enumeration value="Shade"/>
             <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="ShowMenu"/>
             <xsd:enumeration value="ToggleAlwaysOnBottom"/>
             <xsd:enumeration value="ToggleAlwaysOnTop"/>
             <xsd:enumeration value="ToggleDecorations"/>
             <xsd:enumeration value="ToggleDockAutoHide"/>
             <xsd:enumeration value="ToggleFullscreen"/>

-            <xsd:enumeration value="ToggleMaximizeFull"/>
-            <xsd:enumeration value="ToggleMaximizeHorz"/>
-            <xsd:enumeration value="ToggleMaximizeVert"/>
+            <xsd:enumeration value="ToggleMaximize"/>

             <xsd:enumeration value="ToggleOmnipresent"/>
             <xsd:enumeration value="ToggleShade"/>
             <xsd:enumeration value="ToggleShowDesktop"/>
             <xsd:enumeration value="ToggleOmnipresent"/>
             <xsd:enumeration value="ToggleShade"/>
             <xsd:enumeration value="ToggleShowDesktop"/>

+            <xsd:enumeration value="Undecorate"/>

             <xsd:enumeration value="Unfocus"/>
             <xsd:enumeration value="Unfocus"/>

-            <xsd:enumeration value="UnmaximizeFull"/>
-            <xsd:enumeration value="UnmaximizeHorz"/>
-            <xsd:enumeration value="UnmaximizeVert"/>
+            <xsd:enumeration value="Unmaximize"/>

             <xsd:enumeration value="Unshade"/>
             <xsd:enumeration value="Unshade"/>

-            <xsd:enumeration value="UnshadeRaise"/>
-            <xsd:enumeration value="UnShowDesktop"/>

         </xsd:restriction>
     </xsd:simpleType>
     <xsd:simpleType name="bool">
         </xsd:restriction>
     </xsd:simpleType>
     <xsd:simpleType name="bool">