X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=data%2Frc.xsd;h=0544cfd4fa199772e9d056c0a790184b40775a54;hb=d81c4be6001a711e9f0dea247f43d8de670bc27f;hp=95c32134f5a051563ead2192922436c8c55eaf19;hpb=2ff10b4260fd01ebb69adc36e0dabb2fb6355885;p=chaz%2Fopenbox

diff --git a/data/rc.xsd b/data/rc.xsd
index 95c32134..0544cfd4 100644
--- a/data/rc.xsd
+++ b/data/rc.xsd
@@ -1,59 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?> <!-- -*- nxml -*- -->
-<!--
-     xml Schema for the openbox windowmanager configuration file
 
-     Changes:
-     Son Aug 10 15:49:10 CEST 2003 - pch(a)myzel.net
-         restrictions added, up to current format
-     Don Aug 14 21:10:27 CEST 2003 - pch(a)myzel.net
-         up to current (from action.c,config.c)
-     Don Aug 21 23:07:30 CEST 2003 - pch(a)myzel.net
-         new element - follow
-     Mon Sep  1 00:57:55 CEST 2003 - pch(a)myzel.net
-         up to alpha7
-     Mit Sep  3 12:40:10 CEST 2003 - pch(a)myzel.net
-         up to alpha8, a little documentation
-     Mon Sep  8 11:52:07 CEST 2003 - pch(a)myzel.net
-         up to cvs 1.12
-     Mon Sep 15 14:27:42 CEST 2003 - pch(a)myzel.net
-         up to cvs 1.14
-     Die Sep 16 20:56:37 CEST 2003 - pch(a)myzel.net
-         use a namespace
-     Fri Sep 19 14:36:33 EDT 2003 - xor(a)orodu.net
-         use openbox.org for namespace
-     Mon Sep 22 02:34:53 EDT 2003 - xor(a)orodu.net
-         add the focusLast and raiseOnFocus options
-         fix some capitalization
-     Mon Sep 22 14:08:16 EDT 2003 - xor(a)orodu.net
-         update hideTimeout to hideDelay
-     Thu Apr 22 12:33:11 UTC 2004 - mikachu(a)openbox.org
-         add diffs between 3.1 and 3.2
-     Sun Oct 31 10:08:34 UTC 2004 - mikachu(a)openbox.org
-         we haven't remembered to update this changelog in a while,
-         adding desktopMenuIcons.
-     Thu Nov  4 12:07:08 UTC 2004 - mikachu(a)openbox.org
-         Add fourCorners to resize context.
-     Sat Feb 12 01:57:16 UTC 2005 - mikachu(a)openbox.org
-         Add the group option to raise/lower stuff.
-     Sun Sep 25 14:44:21 UTC 2005 - mikachu(a)openbox.org
-         Add showDelay for the dock
-     Tue Jul 18 23:43:15 CEST 2006 - jonaskoelker(a)gnu.org
-         hack code for great justice
-     Tue Oct 31 03:30:26 UTC 2006 - mikachu(a)openbox.org
-         Add movefromedge* actions
-     Sun Mar  4 12:12:19 EST 2007 - danakj(a)orodu.net
-         Add font section to theme section
-     Sun Mar  4 13:49:37 EST 2007 - danakj(a)orodu.net
-         Removing font shadows - they are going back into the themerc
-     Tue Apr 24 18:42:24 UTC 2007 - mikachu(a)openbox.org
-         Removed fourCorners option.
-     Wed Apr 25 14:02:40 UTC 2007 - mikachu(a)openbox.org
-         Fixed values for layer to be above/below, not top/bottom.
-         Add chroot attribute and keybind element to keybind element.
-         Remove xsd:sequence from everywhere, we don't care about order.
-     Thu Apr 26 09:11:03 EDT 2007 - danakj(a)orodu.net
-         Add the place attribute for fonts
--->
+<!-- XML Schema for the Openbox window manager configuration file -->
+
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     targetNamespace="http://openbox.org/4.0/rc"
     xmlns:ob="http://openbox.org/4.0/rc"
@@ -88,7 +36,6 @@
         </xsd:annotation>
         <xsd:element minOccurs="0" name="strength" type="xsd:integer"/>
         <xsd:element minOccurs="0" name="screen_edge_strength" type="xsd:integer"/>
-        <xsd:element minOccurs="0" name="edges_hit_layers_below" type="ob:bool"/>
     </xsd:complexType>
     <xsd:complexType name="focus">
         <xsd:annotation>
@@ -97,6 +44,7 @@
         <xsd:element minOccurs="0" name="focusNew" type="ob:bool"/>
         <xsd:element minOccurs="0" name="focusLast" type="ob:bool"/>
         <xsd:element minOccurs="0" name="followMouse" type="ob:bool"/>
+        <xsd:element minOccurs="0" name="underMouse" type="ob:bool"/>
         <xsd:element minOccurs="0" name="focusDelay" type="xsd:integer"/>
         <xsd:element minOccurs="0" name="raiseOnFocus" type="ob:bool"/>
     </xsd:complexType>
@@ -105,11 +53,21 @@
             <xsd:documentation>defines how new windows are placed</xsd:documentation>
         </xsd:annotation>
         <xsd:element name="policy" type="ob:placementpolicy"/>
+        <xsd:element name="center" type="ob:bool"/>
+        <xsd:element name="active" type="ob:bool"/>
     </xsd:complexType>
+    <xsd:complexType name="margins">
+        <xsd:annotation>
+            <xsd:documentation>defines desktop margins</xsd:documentation>
+        </xsd:annotation>
+        <xsd:element minOccurs="0" name="top" type="xsd:integer"/>
+        <xsd:element minOccurs="0" name="left" type="xsd:integer"/>
+        <xsd:element minOccurs="0" name="right" type="xsd:integer"/>
+        <xsd:element minOccurs="0" name="bottom" type="xsd:integer"/>
+    </xsd:complexType>              
     <xsd:complexType name="theme">
         <xsd:element minOccurs="0" name="name" type="xsd:string"/>
         <xsd:element minOccurs="0" name="titleLayout" type="xsd:string"/>
-        <xsd:element minOccurs="0" name="titleNumber" type="ob:bool"/>
         <xsd:element minOccurs="0" name="keepBorder" type="ob:bool"/>
         <xsd:element minOccurs="0" name="animateIconify" type="ob:bool"/>
         <xsd:element minOccurs="0" name="font" type="ob:font"/>
@@ -132,11 +90,17 @@
                 <xsd:element maxOccurs="unbounded" name="name" type="xsd:string"/>
             </xsd:complexType>
         </xsd:element>
+        <xsd:element minOccurs="0" name="popupTime" type="xsd:integer"/>
     </xsd:complexType>
     <xsd:complexType name="resize">
         <xsd:element minOccurs="0" name="drawContents" type="ob:bool"/>
         <xsd:element minOccurs="0" name="popupShow" type="ob:popupshow"/>
         <xsd:element minOccurs="0" name="popupPosition" type="ob:popupposition"/>
+        <xsd:element minOccurs="0" name="popupPosition" type="ob:popupfixedposition"/>
+    </xsd:complexType>
+    <xsd:complexType name="popupfixedposition">
+        <xsd:element minOccurs="0" name="x" type="ob:center_or_int"/>
+        <xsd:element minOccurs="0" name="y" type="ob:center_or_int"/>
     </xsd:complexType>
     <xsd:complexType name="dock">
         <xsd:element minOccurs="0" name="position" type="ob:dock_position"/>
@@ -152,6 +116,7 @@
     </xsd:complexType>
     <xsd:complexType name="action">
         <xsd:element minOccurs="0" name="execute" type="xsd:string"/>
+        <xsd:element minOccurs="0" name="command" type="xsd:string"/>
         <xsd:element minOccurs="0" name="menu" type="xsd:string"/>
         <xsd:element minOccurs="0" name="delta" type="xsd:integer"/>
         <xsd:element minOccurs="0" name="x" type="xsd:integer"/>
@@ -194,6 +159,7 @@
     <xsd:complexType name="mouse">
         <xsd:element minOccurs="0" name="dragThreshold" type="xsd:integer"/>
         <xsd:element minOccurs="0" name="doubleClickTime" type="xsd:integer"/>
+        <xsd:element minOccurs="0" name="screenEdgeWarpTime" type="xsd:integer"/>
         <xsd:element maxOccurs="unbounded" name="context" type="ob:context"/>
     </xsd:complexType>
     <xsd:complexType name="menu">
@@ -206,6 +172,7 @@
     <xsd:complexType name="window_position">
         <xsd:element name="x" type="ob:center_or_int"/>
         <xsd:element name="y" type="ob:center_or_int"/>
+	<xsd:element name="monitor" type="ob:mouse_or_int"/>	
         <xsd:element minOccurs="0" name="head" type="xsd:string"/>
     </xsd:complexType>
     <xsd:complexType name="application">
@@ -233,94 +200,54 @@
       -->
     <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="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="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="If"/>
             <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="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="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="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="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="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="Undecorate"/>
             <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="UnshadeRaise"/>
-            <xsd:enumeration value="UnShowDesktop"/>
         </xsd:restriction>
     </xsd:simpleType>
     <xsd:simpleType name="bool">
@@ -383,9 +310,17 @@
             <xsd:pattern value="center|0|[1-9][0-9]*"/>
         </xsd:restriction>
     </xsd:simpleType>
+    <xsd:simpleType name="mouse_or_int">
+        <xsd:restriction base="xsd:string">
+            <!-- ob: atoi($_) unless $_ eq 'center'; -->
+            <!-- I think the regexp DTRT WRT atoi. -->
+            <xsd:pattern value="mouse|0|[1-9][0-9]*"/>
+        </xsd:restriction>
+    </xsd:simpleType>
     <xsd:simpleType name="contextname">
         <xsd:restriction base="xsd:string">
             <xsd:enumeration value="Desktop"/>
+            <xsd:enumeration value="Root"/>
             <xsd:enumeration value="Client"/>
             <xsd:enumeration value="Titlebar"/>
             <xsd:enumeration value="Frame"/>
@@ -394,6 +329,8 @@
             <xsd:enumeration value="BLCorner"/>
             <xsd:enumeration value="BRCorner"/>
             <xsd:enumeration value="Top"/>
+            <xsd:enumeration value="Left"/>
+            <xsd:enumeration value="Right"/>
             <xsd:enumeration value="Bottom"/>
             <xsd:enumeration value="Maximize"/>
             <xsd:enumeration value="AllDesktops"/>