X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=data%2Fthemerc.xsd;h=3a636b5db9acde2fb92425cd1dd25209df0c10fd;hb=94c95663a86b1b40463fcd1e25a9ac4bc10954c1;hp=63f8af514b378c6b0d3cac1adaa6bad21fe24f41;hpb=24c0d618471276fd514cd666bc7067d30be8d0ca;p=chaz%2Fopenbox

diff --git a/data/themerc.xsd b/data/themerc.xsd
old mode 100755
new mode 100644
index 63f8af51..3a636b5d
--- a/data/themerc.xsd
+++ b/data/themerc.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://openbox.org/themerc"
-    xmlns:obt="http://openbox.org/themerc"
+    targetNamespace="http://openbox.org/4.0/themerc"
+    xmlns:obt="http://openbox.org/4.0/themerc"
     elementFormDefault="qualified"
     version="1.0">
 
@@ -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,8 @@
 
   <xs:complexType name="window">
     <xs:all>
+      <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"/>
@@ -134,9 +129,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>
@@ -144,7 +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="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="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>
 
@@ -152,11 +168,24 @@
     <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:element name="osd" type="obt:osdDimensions" minOccurs="0"/>
+    </xs:all>
+  </xs:complexType>
+
+  <xs:complexType name="about">
+    <xs:all>
+      <xs:element name="author" type="xs:string" minOccurs="0"/>
+      <xs:element name="email" type="xs:string" minOccurs="0"/>
+      <xs:element name="webpage" type="xs:string" minOccurs="0"/>
+      <xs:element name="comment" type="xs:string" minOccurs="0"/>
     </xs:all>
   </xs:complexType>
 
   <xs:complexType name="theme">
     <xs:all>
+      <xs:element name="about" type="obt:about" minOccurs="0"/>
       <xs:element name="dimensions" type="obt:themeDimensions" minOccurs="0"/>
       <xs:element name="osd" type="obt:allosd" minOccurs="0"/>
       <xs:element name="menu" type="obt:allmenus" minOccurs="0"/>