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

diff --git a/tools/themetoxml/themetoxml.c b/tools/themetoxml/themetoxml.c
index a75cf19a..9b688c51 100644
--- a/tools/themetoxml/themetoxml.c
+++ b/tools/themetoxml/themetoxml.c
@@ -89,8 +89,7 @@ static gboolean read_string(XrmDatabase db, const gchar *rname,
   
     if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) &&
         retvalue.addr != NULL) {
-        *value = retvalue.addr;
-        g_strstrip(*value);
+        *value = g_strstrip(retvalue.addr);
         ret = TRUE;
     }
 
@@ -115,7 +114,7 @@ static gboolean parse_color(const gchar *c, gint *r, gint *g, gint *b)
         c += 4;
         for (i = 0; i < 3; ++i) {
             dig1 = hextodec(c[0]);
-            if (c[1] == '/') { dig2 = dig1; c+=2; }
+            if (c[1] == '/' || (c[1] == '\0' && i == 2)) { dig2 = dig1; c+=2; }
             else { dig2 = hextodec(c[1]); c+=3; }
 
             if (dig1 < 0 || dig2 < 0) return FALSE;
@@ -284,14 +283,15 @@ int main(int argc, char **argv)
     const gchar *s;
     int ret = 0;
 
-    if (argc > 1) {
+    if (argc > 2) {
         fprintf(stderr, "themetoxml (C) 2007 Dana Jansens\n"
-                "This tool takes an older Openbox3 themerc file on stdin,"
-                " and gives back the\n"
-                "theme in the newer themerc.xml XML style.\n");
+                "This tool takes an older Openbox3 themerc file and prints "
+                "out the theme in\n"
+                "theme in the newer XML (themerc.xml) style.\n");
         return 0;
     }
-    {
+
+    if (argc == 1 || !strcmp(argv[1], "-")) {
         gchar *buf = g_new(gchar, 1000);
         gint sz = 1000;
         gint r = 0, rthis;
@@ -311,10 +311,18 @@ int main(int argc, char **argv)
         }
         g_free(buf);
     }
+    else if (argc == 2) {
+        if ((db = XrmGetFileDatabase(argv[1])) == NULL) {
+            fprintf(stderr, "Unable to read the database from %s\n", argv[1]);
+            return 1;
+        }
+    }
+
 
     doc = xmlNewDoc((const xmlChar*) "1.0");
     xmlDocSetRootElement
         (doc,(root = xmlNewNode(NULL, (const xmlChar*)"openbox_theme")));
+    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");
@@ -423,8 +431,12 @@ int main(int argc, char **argv)
         COLOR3("menu","inactive","primary",i,j,k,255);
 
     if (read_color(db, "menu.items.disabled.text.color",
-                   &i, &j, &k))
+                   &i, &j, &k)) {
         COLOR3("menu","disabled","primary",i,j,k,255);
+        read_color(db, "menu.items.activedisabled.text.color",
+                   &i, &j, &k); /* read this if we can */
+        COLOR4("menu","activedisabled","text","primary",i,j,k,255);
+    }
 
     if (read_color(db, "menu.items.active.text.color",
                    &i, &j, &k))
@@ -440,6 +452,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.title.bg", "menu", "title");
 
     APPEARANCE4("window.active.button.disabled.bg",
@@ -451,9 +464,9 @@ int main(int argc, char **argv)
     APPEARANCE4("window.inactive.button.pressed.bg",
                 "window", "inactive", "buttons", "pressed");
     APPEARANCE4("window.active.button.toggled.bg",
-                "window", "active", "buttons", "toggled");
+                "window", "active", "buttons", "toggled-unpressed");
     APPEARANCE4("window.inactive.button.toggled.bg",
-                "window", "inactive", "buttons", "toggled");
+                "window", "inactive", "buttons", "toggled-unpressed");
     APPEARANCE4("window.active.button.unpressed.bg",
                 "window", "active", "buttons", "unpressed");
     APPEARANCE4("window.inactive.button.unpressed.bg",
@@ -539,6 +552,8 @@ 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));
         }
         if ((p = strstr(s, "shadowtint=")))
         {
@@ -548,6 +563,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);
         }
     }