more cleanup

[chaz/openbox] / data / themerc.xsd

diff --git a/data/themerc.xsd b/data/themerc.xsd
index eb7bd7d0394320cebb53b1f32fc1a0cadef4ba43..3a636b5db9acde2fb92425cd1dd25209df0c10fd 100644 (file)
--- a/data/themerc.xsd
+++ b/data/themerc.xsd
@@ -137,6 +137,7 @@
 
   <xs:complexType name="allosd">
     <xs:all>
+      <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"/>
@@ -146,14 +147,20 @@
 
   <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>
 
@@ -163,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>