X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=data%2Fthemerc.xsd;h=3a636b5db9acde2fb92425cd1dd25209df0c10fd;hb=428880d75ad74b6a1b964385f85984b493daa657;hp=209d52ac92fbc3e770d46af6b0ff756efaa77129;hpb=73f4b16d8eda00d865dd1c7f5d2a0ed9b244b3cc;p=chaz%2Fopenbox

diff --git a/data/themerc.xsd b/data/themerc.xsd
index 209d52ac..3a636b5d 100644
--- a/data/themerc.xsd
+++ b/data/themerc.xsd
@@ -116,7 +116,8 @@
 
   <xs:complexType name="window">
     <xs:all>
-      <xs:element name="border" type="obt:border" minOccurs="0"/>
+      <xs:element name="border" type="obt:color" minOccurs="0"/>
+      <xs:element name="titleseparator" type="obt:color" minOccurs="0"/>
       <xs:element name="clientpadding" type="obt:color" minOccurs="0"/>
       <xs:element name="titlebar" type="obt:area" minOccurs="0"/>
       <xs:element name="label" type="obt:textarea" minOccurs="0"/>
@@ -136,20 +137,30 @@
 
   <xs:complexType name="allosd">
     <xs:all>
-      <xs:element name="text" type="obt:text" minOccurs="0"/>
+      <xs:element name="border" type="obt:color" minOccurs="0"/>
+      <xs:element name="label" type="obt:textarea" minOccurs="0"/>
+      <xs:element name="background" type="obt:area" minOccurs="0"/>
+      <xs:element name="hilight" type="obt:area" minOccurs="0"/>
+      <xs:element name="unhilight" type="obt:area" minOccurs="0"/>
     </xs:all>
   </xs:complexType>
 
   <xs:complexType name="windowDimensions">
     <xs:all>
-      <xs:element name="borderwidth" type="xs:integer" minOccurs="0"/>
+      <xs:element name="border" type="xs:integer" minOccurs="0"/>
       <xs:element name="clientpadding" type="obt:point" minOccurs="0"/>
     </xs:all>
   </xs:complexType>
 
   <xs:complexType name="menuDimensions">
     <xs:all>
-      <xs:element name="borderwidth" type="xs:integer" minOccurs="0"/>
+      <xs:element name="border" type="xs:integer" minOccurs="0"/>
+    </xs:all>
+  </xs:complexType>
+
+  <xs:complexType name="osdDimensions">
+    <xs:all>
+      <xs:element name="border" type="xs:integer" minOccurs="0"/>
     </xs:all>
   </xs:complexType>
 
@@ -159,6 +170,7 @@
       <xs:element name="handle" type="xs:integer" minOccurs="0"/>
       <xs:element name="window" type="obt:windowDimensions" minOccurs="0"/>
       <xs:element name="menu" type="obt:menuDimensions" minOccurs="0"/>
+      <xs:element name="osd" type="obt:osdDimensions" minOccurs="0"/>
     </xs:all>
   </xs:complexType>