relocate the xsd's so they don't clash, and point to the right places

[chaz/openbox] / tools / themetoxml / themetoxml.c

diff --git a/tools/themetoxml/themetoxml.c b/tools/themetoxml/themetoxml.c
index ae9972e20f15fce7d78e137aa3cfcf8269de4335..bdb331b8ae77474a66e55dcf72359e22e85c4c6d 100644 (file)
--- a/tools/themetoxml/themetoxml.c
+++ b/tools/themetoxml/themetoxml.c
@@ -325,7 +325,7 @@ int main(int argc, char **argv)
     xmlSetProp(root, (const xmlChar*)"engine", (const xmlChar*)"box");
     xmlSetProp(root, (const xmlChar*)"version", (const xmlChar*)"1");
     xmlSetProp(root, (const xmlChar*)"xmlns",
-               (const xmlChar*)"http://openbox.org/themerc");
+               (const xmlChar*)"http://openbox.org/4.0/themerc");
     CONT2("about", "author", "");
     CONT2("about", "email", "");
     CONT2("about", "webpage", "");
@@ -346,12 +346,20 @@ int main(int argc, char **argv)
         CONT3("dimensions", "window", "border", NUM(i));
         CONT3("dimensions", "menu", "border", NUM(i));
     }
+    if (read_int(db, "menu.border.width", &i)) 
+        CONT3("dimensions", "menu", "border", NUM(i));
 
     if (read_color(db, "border.color", &i, &j, &k)) {
         COLOR3("window", "active", "border", i, j, k, 255);
         COLOR3("window", "inactive", "border", i, j, k, 255);
         COLOR2("menu", "border", i, j, k, 255);
     }
+    if (read_color(db, "window.active.border.color", &i, &j, &k))
+        COLOR3("window", "active", "border", i, j, k, 255);
+    if (read_color(db, "window.inactive.border.color", &i, &j, &k))
+        COLOR3("window", "inactive", "border", i, j, k, 255);
+    if (read_color(db, "menu.border.color", &i, &j, &k))
+        COLOR2("menu", "border", i, j, k, 255);
 
     if (read_int(db, "window.client.padding.width", &i)) {
         ATTR3("dimensions", "window", "clientpadding", "x", NUM(i));