give different border colors to active and inactive windows. adjust the xml theme...

[chaz/openbox] / data / themerc.xsd

diff --git a/data/themerc.xsd b/data/themerc.xsd
index 63f8af514b378c6b0d3cac1adaa6bad21fe24f41..61f6d9388aa0c2424d01d0cb6302806dc7e8781d 100755 (executable)
--- a/data/themerc.xsd
+++ b/data/themerc.xsd
@@ -88,16 +88,9 @@
    </xs:all>
   </xs:complexType>
 
-  <xs:complexType name="border">
-    <xs:all>
-      <xs:element name="primary" type="obt:color" minOccurs="0"/>
-      <xs:element name="width" type="xs:integer" minOccurs="0"/>
-    </xs:all>
-  </xs:complexType>
-
   <xs:complexType name="allmenus">
     <xs:all>
-      <xs:element name="border" type="obt:border" minOccurs="0"/>
+      <xs:element name="border" type="obt:color" minOccurs="0"/>
       <xs:element name="overlap" type="xs:integer" minOccurs="0"/>
       <xs:element name="justify" type="obt:justify" minOccurs="0"/>
       <xs:element name="title" type="obt:textarea" minOccurs="0"/>
@@ -123,6 +116,7 @@
 
   <xs:complexType name="window">
     <xs:all>
+      <xs:element name="border" type="obt:border" 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"/>
@@ -134,9 +128,7 @@
 
   <xs:complexType name="allwindows">
     <xs:all>
-      <xs:element name="clientpadding" type="obt:point" minOccurs="0"/>
       <xs:element name="justify" type="obt:justify" minOccurs="0"/>
-      <xs:element name="border" type="obt:border" minOccurs="0"/>
       <xs:element name="inactive" type="obt:window" minOccurs="0"/>
       <xs:element name="active" type="obt:window" minOccurs="0"/>
     </xs:all>
@@ -148,10 +140,25 @@
     </xs:all>
   </xs:complexType>
 
+  <xs:complexType name="windowDimensions">
+    <xs:all>
+      <xs:element name="borderwidth" 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:all>
+  </xs:complexType>
+
   <xs:complexType name="themeDimensions">
     <xs:all>
       <xs:element name="padding" type="obt:point" minOccurs="0"/>
       <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:all>
   </xs:complexType>