X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fopenbox;a=blobdiff_plain;f=data%2Frc.xsd;h=0fd98ffb87c01c0df645f813c5b772ad5ee48699;hp=8e46d93ad6b6035bd1e3d758455a3bf5eaca5f18;hb=9325c92056ff4268db2263cdf8c07bb529e158aa;hpb=445056664fbd8501a47724cf3976a45fab2f448e

diff --git a/data/rc.xsd b/data/rc.xsd
index 8e46d93a..0fd98ffb 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">
@@ -94,7 +93,6 @@
             <xsd:element minOccurs="0" name="animateIconify" type="ob:bool"/>
             <xsd:element minOccurs="0" name="flashFrameDelay" type="ob:integer"/>
             <xsd:element minOccurs="0" name="flashFrameDuration" type="ob:integer"/>
-            <xsd:element minOccurs="0" name="animateIconify" type="ob:bool"/>
             <xsd:element minOccurs="0" maxOccurs="unbounded" name="font" type="ob:font"/>
         </xsd:sequence>
     </xsd:complexType>
@@ -237,11 +235,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"/>
@@ -250,6 +255,7 @@
             <xsd:element minOccurs="0" name="skip_taskbar" type="ob:bool"/>
             <xsd:element minOccurs="0" name="fullscreen" type="ob:bool"/>
             <xsd:element minOccurs="0" name="maximized" type="ob:maximization"/>
+            <xsd:element minOccurs="0" name="opacity" type="xsd:unsignedByte"/>
         </xsd:all>
         <!-- at least one of these must be present -->
         <xsd:attribute name="role" type="xsd:string"/>
@@ -396,7 +402,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">
@@ -421,7 +428,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">
@@ -528,7 +540,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">