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 9b688c51e25dd1d49733c4bb712258e2e7bbc6c9..bdb331b8ae77474a66e55dcf72359e22e85c4c6d 100644 (file)
--- a/tools/themetoxml/themetoxml.c
+++ b/tools/themetoxml/themetoxml.c
@@ -325,7 +325,11 @@ 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", "");
+    CONT2("about", "comment", "");
 
     if (read_int(db, "window.handle.width", &i))
         CONT2("dimensions", "handle", NUM(i));
@@ -336,21 +340,30 @@ int main(int argc, char **argv)
     }
     
     if (read_int(db, "borderWidth", &i)) {
-        CONT3("window", "border", "width", NUM(i));
-        CONT3("menu", "border", "width", NUM(i));
+        CONT3("dimensions", "window", "border", NUM(i));
+        CONT3("dimensions", "menu", "border", NUM(i));
     } else if (read_int(db, "border.width", &i)) {
-        CONT3("window", "border", "width", NUM(i));
-        CONT3("menu", "border", "width", NUM(i));
+        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", "border", "primary", i, j, k, 255);
-        COLOR3("menu", "border", "primary", i, j, k, 255);
+        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)) {
-        ATTR2("window", "clientpadding", "x", NUM(i));
-        ATTR2("window", "clientpadding", "y", NUM(i));
+        ATTR3("dimensions", "window", "clientpadding", "x", NUM(i));
+        ATTR3("dimensions", "window", "clientpadding", "y", NUM(i));
     }
 
     if (read_string(db, "window.label.text.justify", &s)) {