relocate the xsd's so they don't clash, and point to the right places

[chaz/openbox] / data / rc.xsd

diff --git a/data/rc.xsd b/data/rc.xsd
index fdb98e7d50393a2ea23ba0cb869ccff1f1de98a5..95c32134f5a051563ead2192922436c8c55eaf19 100644 (file)
--- a/data/rc.xsd
+++ b/data/rc.xsd
@@ -47,14 +47,16 @@
          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
+     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
 -->
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://openbox.org/"
-    xmlns:ob="http://openbox.org/"
+    targetNamespace="http://openbox.org/4.0/rc"
+    xmlns:ob="http://openbox.org/4.0/rc"
     elementFormDefault="qualified">
     <!--
          root node
@@ -109,7 +111,7 @@
         <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="hideDisabled" type="ob:bool"/>
+        <xsd:element minOccurs="0" name="animateIconify" type="ob:bool"/>
         <xsd:element minOccurs="0" name="font" type="ob:font"/>
     </xsd:complexType>
     <xsd:complexType name="font">
@@ -117,6 +119,7 @@
         <xsd:element minOccurs="0" name="size" type="xsd:integer"/>
         <xsd:element minOccurs="0" name="weight" type="ob:fontweight"/>
         <xsd:element minOccurs="0" name="slant" type="ob:fontslant"/>
+        <xsd:attribute name="place" type="ob:fontplace" use="required"/>
     </xsd:complexType>
     <xsd:complexType name="desktops">
         <xsd:annotation>
@@ -195,24 +198,22 @@
     </xsd:complexType>
     <xsd:complexType name="menu">
         <xsd:element maxOccurs="unbounded" name="file" type="xsd:string"/>
-        <xsd:element minOccurs="0" name="warpPointer" type="ob:bool"/>
-        <xsd:element minOccurs="0" name="xorStyle" type="ob:bool"/>
         <xsd:element minOccurs="0" name="hideDelay" type="xsd:integer"/>
         <xsd:element minOccurs="0" name="middle" type="ob:bool"/>
         <xsd:element minOccurs="0" name="submenuShowDelay" type="xsd:integer"/>
-        <xsd:element minOccurs="0" name="desktopMenuIcons" type="ob:bool"/>
+        <xsd:element minOccurs="0" name="applicationIcons" type="ob:bool"/>
     </xsd:complexType>
     <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 minOccurs="0" name="head" type="xsd:string"/>
     </xsd:complexType>
     <xsd:complexType name="application">
-        <xsd:element minOccurs="0" name="decor" type="xsd:string"/>
+        <xsd:element minOccurs="0" name="decor" type="xsd:bool"/>
         <xsd:element minOccurs="0" name="shade" type="ob:bool"/>
         <xsd:element minOccurs="0" name="position" type="ob:window_position"/>
         <xsd:element minOccurs="0" name="focus" type="xsd:string"/>
         <xsd:element minOccurs="0" name="desktop" type="xsd:integer"/>
-        <xsd:element minOccurs="0" name="head" type="xsd:string"/>
         <xsd:element minOccurs="0" name="layer" type="ob:layer"/>
         <xsd:element minOccurs="0" name="iconic" type="ob:bool"/>
         <xsd:element minOccurs="0" name="skip_pager" type="ob:bool"/>
@@ -333,6 +334,15 @@
             <xsd:enumeration value="off"/>
         </xsd:restriction>
     </xsd:simpleType>
+    <xsd:simpleType name="fontplace">
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="ActiveWindow"/>
+            <xsd:enumeration value="InactiveWindow"/>
+            <xsd:enumeration value="MenuHeader"/>
+            <xsd:enumeration value="MenuItem"/>
+            <xsd:enumeration value="OnScreenDisplay"/>
+        </xsd:restriction>
+    </xsd:simpleType>
     <xsd:simpleType name="fontweight">
         <xsd:restriction base="xsd:string">
             <xsd:enumeration value="normal"/>
@@ -378,12 +388,13 @@
             <xsd:enumeration value="Desktop"/>
             <xsd:enumeration value="Client"/>
             <xsd:enumeration value="Titlebar"/>
-            <xsd:enumeration value="Handle"/>
             <xsd:enumeration value="Frame"/>
             <xsd:enumeration value="TLCorner"/>
             <xsd:enumeration value="TRCorner"/>
             <xsd:enumeration value="BLCorner"/>
             <xsd:enumeration value="BRCorner"/>
+            <xsd:enumeration value="Top"/>
+            <xsd:enumeration value="Bottom"/>
             <xsd:enumeration value="Maximize"/>
             <xsd:enumeration value="AllDesktops"/>
             <xsd:enumeration value="Shade"/>
@@ -421,9 +432,9 @@
     </xsd:simpleType>
     <xsd:simpleType name="layer">
         <xsd:restriction base="xsd:string">
-            <xsd:enumeration value="above"/>
-            <xsd:enumeration value="normal"/>
-            <xsd:enumeration value="below"/>
+            <xsd:enumeration value="Above"/>
+            <xsd:enumeration value="Normal"/>
+            <xsd:enumeration value="Below"/>
         </xsd:restriction>
     </xsd:simpleType>
     <xsd:simpleType name="maximization">