border, not borderwidth.

add osd.border stuff to themetoxml

diff --git a/data/themerc.xsd b/data/themerc.xsd
index 40b036a5bdefae913d3b2930ed80ad17e60f08b1..3a636b5db9acde2fb92425cd1dd25209df0c10fd 100644 (file)
--- a/data/themerc.xsd
+++ b/data/themerc.xsd
@@ -147,20 +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="borderwidth" type="xs:integer" minOccurs="0"/>
+      <xs:element name="border" type="xs:integer" minOccurs="0"/>
     </xs:all>
   </xs:complexType>
 

diff --git a/tools/themetoxml/themetoxml.c b/tools/themetoxml/themetoxml.c
index 5c7ac8af56c95228f4115dfc3a1bbb4b803db38a..b53599b2356b4033e37880f62082baf7dbf530a3 100644 (file)
--- a/tools/themetoxml/themetoxml.c
+++ b/tools/themetoxml/themetoxml.c
@@ -374,6 +374,8 @@ int main(int argc, char **argv)
         COLOR3("window", "inactive", "titleseparator", i, j, k, 255);
     if (read_color(db, "menu.border.color", &i, &j, &k))
         COLOR2("menu", "border", i, j, k, 255);
+    if (read_color(db, "osd.border.color", &i, &j, &k))
+        COLOR2("osd", "border", i, j, k, 255);
 
     if (read_int(db, "window.client.padding.width", &i)) {
         ATTR3("dimensions", "window", "clientpadding", "x", NUM(i));