X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=data%2Frc.xsd;h=425d53c9fd3fd6e2f4abaaa10df1cc5aa98ba7d3;hb=403483db92a290c7f89ae6cdf27ffc18a7eccd35;hp=03a38e5b9ff0163f0bdcca67c45897720f23f558;hpb=a8dbf2e74ea967158db754e383a88c84c331f97c;p=chaz%2Fopenbox

diff --git a/data/rc.xsd b/data/rc.xsd
index 03a38e5b..425d53c9 100644
--- a/data/rc.xsd
+++ b/data/rc.xsd
@@ -70,9 +70,8 @@
         </xsd:annotation>
         <xsd:sequence>
             <xsd:element minOccurs="0" name="policy" type="ob:placementpolicy"/>
-            <xsd:element minOccurs="0" name="center" type="ob:bool"/>
             <xsd:element minOccurs="0" name="monitor" type="ob:placementmonitor"/>
-            <xsd:element minOccurs="0" name="monitor" type="ob:primarymonitor"/>
+            <xsd:element minOccurs="0" name="primaryMonitor" type="ob:primarymonitor"/>
         </xsd:sequence>
     </xsd:complexType>
     <xsd:complexType name="margins">
@@ -171,7 +170,7 @@
             <xsd:element minOccurs="0" name="edge" type="xsd:string"/>
             <xsd:element minOccurs="0" name="wrap" type="ob:bool"/>
             <xsd:element minOccurs="0" name="follow" type="ob:bool"/>
-            <xsd:element minOccurs="0" name="dialog" type="ob:bool"/>
+            <xsd:element minOccurs="0" name="dialog" type="ob:dialogtype"/>
             <xsd:element minOccurs="0" name="panels" type="ob:bool"/>
             <xsd:element minOccurs="0" name="here" type="ob:bool"/>
             <xsd:element minOccurs="0" name="linear" type="ob:bool"/>
@@ -234,11 +233,18 @@
         </xsd:all>
         <xsd:attribute name="force" type="ob:bool"/>
     </xsd:complexType>
+    <xsd:complexType name="window_size">
+        <xsd:all>
+            <xsd:element name="width" type="ob:size_value"/>
+            <xsd:element name="height" type="ob:size_value"/>
+        </xsd:all>
+    </xsd:complexType>
     <xsd:complexType name="application">
         <xsd:all>
             <xsd:element minOccurs="0" name="decor" type="ob: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="size" type="ob:window_size"/>
             <xsd:element minOccurs="0" name="focus" type="xsd:string"/>
             <xsd:element minOccurs="0" name="desktop" type="xsd:integer"/>
             <xsd:element minOccurs="0" name="layer" type="ob:layer"/>
@@ -393,7 +399,8 @@
             <xsd:enumeration value="InactiveWindow"/>
             <xsd:enumeration value="MenuHeader"/>
             <xsd:enumeration value="MenuItem"/>
-            <xsd:enumeration value="OnScreenDisplay"/>
+            <xsd:enumeration value="ActiveOnScreenDisplay"/>
+            <xsd:enumeration value="InactiveOnScreenDisplay"/>
         </xsd:restriction>
     </xsd:simpleType>
     <xsd:simpleType name="fontweight">
@@ -418,7 +425,12 @@
         <xsd:restriction base="xsd:string">
             <!-- ob: atoi($_) unless $_ eq 'center'; -->
             <!-- I think the regexp DTRT WRT atoi. -->
-            <xsd:pattern value="center|-?(0|[1-9][0-9]*)"/>
+            <xsd:pattern value="default|center|-?(0|[1-9][0-9]*)(|%|/[1-9][0-9]*)"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+    <xsd:simpleType name="size_value">
+        <xsd:restriction base="xsd:string">
+            <xsd:pattern value="default|([1-9][0-9]*)(|%|/[1-9][0-9]*)"/>
         </xsd:restriction>
     </xsd:simpleType>
     <xsd:simpleType name="mouse_or_int">
@@ -525,7 +537,7 @@
         <xsd:restriction base="xsd:string">
             <xsd:enumeration value="Mouse"/>
             <xsd:enumeration value="Active"/>
-            <xsd:enumeration value="[0-9][0-9][0-9][0-9][0-9]"/>
+            <xsd:pattern value="[0-9][0-9][0-9][0-9][0-9]"/>
         </xsd:restriction>
     </xsd:simpleType>
     <xsd:simpleType name="popupposition">
@@ -541,4 +553,11 @@
             <xsd:enumeration value="Nonpixel"/>
         </xsd:restriction>
     </xsd:simpleType>
+    <xsd:simpleType name="dialogtype">
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="None"/>
+            <xsd:enumeration value="Icons"/>
+            <xsd:enumeration value="List"/>
+        </xsd:restriction>
+    </xsd:simpleType>
 </xsd:schema>