X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=tools%2Fthemetoxml%2Fthemetoxml.c;h=464944d1a2c18c182eab88e5a1ced0a4b83ec983;hb=ad3336f70d722258b4bde660e0272d9987924d1f;hp=9b688c51e25dd1d49733c4bb712258e2e7bbc6c9;hpb=73348c28de6d2c1b554476134dd78fda8ea9a9e1;p=chaz%2Fopenbox

diff --git a/tools/themetoxml/themetoxml.c b/tools/themetoxml/themetoxml.c
index 9b688c51..464944d1 100644
--- 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,40 @@ 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", "active", "titleseparator", i, j, k, 255);
+        COLOR3("window", "inactive", "border", i, j, k, 255);
+        COLOR3("window", "inactive", "titleseparator", 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);
+        COLOR3("window", "active", "titleseparator", i, j, k, 255);
+    }
+    if (read_color(db, "window.active.title.separator.color", &i, &j, &k))
+        COLOR3("window", "active", "titleseparator", i, j, k, 255);
+    if (read_color(db, "window.inactive.border.color", &i, &j, &k)) {
+        COLOR3("window", "inactive", "border", i, j, k, 255);
+        COLOR3("window", "inactive", "titleseparator", i, j, k, 255);
+    }
+    if (read_color(db, "window.inactive.title.separator.color", &i, &j, &k))
+        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_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)) {
@@ -433,9 +456,9 @@ int main(int argc, char **argv)
     if (read_color(db, "menu.items.disabled.text.color",
                    &i, &j, &k)) {
         COLOR3("menu","disabled","primary",i,j,k,255);
-        read_color(db, "menu.items.activedisabled.text.color",
+        read_color(db, "menu.items.active.disabled.text.color",
                    &i, &j, &k); /* read this if we can */
-        COLOR4("menu","activedisabled","text","primary",i,j,k,255);
+        COLOR4("menu","active-disabled","text","primary",i,j,k,255);
     }
 
     if (read_color(db, "menu.items.active.text.color",
@@ -452,7 +475,7 @@ int main(int argc, char **argv)
     APPEARANCE3("window.inactive.grip.bg", "window", "inactive", "grip");
     APPEARANCE2("menu.items.bg", "menu", "entries");
     APPEARANCE2("menu.items.active.bg", "menu", "active");
-    APPEARANCE2("menu.items.active.bg", "menu", "activedisabled");
+    APPEARANCE2("menu.items.active.bg", "menu", "active-disabled");
     APPEARANCE2("menu.title.bg", "menu", "title");
 
     APPEARANCE4("window.active.button.disabled.bg",
@@ -552,8 +575,10 @@ int main(int argc, char **argv)
             ATTR5("menu","active","text","shadow","offset","y",NUM(i));
             ATTR4("menu","disabled","shadow","offset","x",NUM(i));
             ATTR4("menu","disabled","shadow","offset","y",NUM(i));
-            ATTR5("menu","activedisabled","text","shadow","offset","x",NUM(i));
-            ATTR5("menu","activedisabled","text","shadow","offset","y",NUM(i));
+            ATTR5("menu","active-disabled","text","shadow","offset","x",
+                  NUM(i));
+            ATTR5("menu","active-disabled","text","shadow","offset","y",
+                  NUM(i));
         }
         if ((p = strstr(s, "shadowtint=")))
         {
@@ -563,7 +588,7 @@ int main(int argc, char **argv)
             COLOR4("menu","inactive","shadow","primary",j,j,j,i);
             COLOR5("menu","active","text","shadow","primary",j,j,j,i);
             COLOR4("menu","disabled","shadow","primary",j,j,j,i);
-            COLOR5("menu","activedisabled","text","shadow","primary",j,j,j,i);
+            COLOR5("menu","active-disabled","text","shadow","primary",j,j,j,i);
         }
     }