X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=tools%2Fthemetoxml%2Fthemetoxml.c;h=bdb331b8ae77474a66e55dcf72359e22e85c4c6d;hb=92e54e48eeba743a4f826c62adea649ccf8c475a;hp=52645972e087cdc19166ddfa59e390629f40900b;hpb=82be671c64ec1b8c18c2b554513aedbe0c90346d;p=chaz%2Fopenbox diff --git a/tools/themetoxml/themetoxml.c b/tools/themetoxml/themetoxml.c index 52645972..bdb331b8 100644 --- a/tools/themetoxml/themetoxml.c +++ b/tools/themetoxml/themetoxml.c @@ -26,12 +26,13 @@ #include #include -static gboolean read_int(XrmDatabase db, gchar *rname, gint *value); -static gboolean read_string(XrmDatabase db, gchar *rname, gchar **value); -static gboolean read_color(XrmDatabase db, gchar *rname, +static gboolean read_int(XrmDatabase db, const gchar *rname, gint *value); +static gboolean read_string(XrmDatabase db, const gchar *rname, + const gchar **value); +static gboolean read_color(XrmDatabase db, const gchar *rname, gint *r, gint *g, gint *b); -static int parse_inline_number(char *p) +static int parse_inline_number(const char *p) { int neg = 1; int res = 0; @@ -45,7 +46,7 @@ static int parse_inline_number(char *p) return res; } -static gchar *create_class_name(gchar *rname) +static gchar *create_class_name(const gchar *rname) { gchar *rclass = g_strdup(rname); gchar *p = rclass; @@ -60,7 +61,7 @@ static gchar *create_class_name(gchar *rname) return rclass; } -static gboolean read_int(XrmDatabase db, gchar *rname, gint *value) +static gboolean read_int(XrmDatabase db, const gchar *rname, gint *value) { gboolean ret = FALSE; gchar *rclass = create_class_name(rname); @@ -78,7 +79,8 @@ static gboolean read_int(XrmDatabase db, gchar *rname, gint *value) return ret; } -static gboolean read_string(XrmDatabase db, gchar *rname, gchar **value) +static gboolean read_string(XrmDatabase db, const gchar *rname, + const gchar **value) { gboolean ret = FALSE; gchar *rclass = create_class_name(rname); @@ -87,8 +89,7 @@ static gboolean read_string(XrmDatabase db, gchar *rname, gchar **value) if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && retvalue.addr != NULL) { - *value = retvalue.addr; - g_strstrip(*value); + *value = g_strstrip(retvalue.addr); ret = TRUE; } @@ -104,7 +105,7 @@ static gchar hextodec(gchar h) return -1; } -static gboolean parse_color(gchar *c, gint *r, gint *g, gint *b) +static gboolean parse_color(const gchar *c, gint *r, gint *g, gint *b) { int dig1, dig2, i, color[3]; int len = strlen(c); @@ -113,7 +114,7 @@ static gboolean parse_color(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; @@ -150,7 +151,7 @@ static gboolean parse_color(gchar *c, gint *r, gint *g, gint *b) return FALSE; } -static gboolean read_color(XrmDatabase db, gchar *rname, +static gboolean read_color(XrmDatabase db, const gchar *rname, gint *r, gint *g, gint *b) { gboolean ret = FALSE; @@ -279,17 +280,18 @@ int main(int argc, char **argv) { XrmDatabase db; int i,j,k; - gchar *s; + 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; @@ -309,13 +311,25 @@ 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"); + (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)); @@ -326,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)) { @@ -406,11 +429,11 @@ int main(int argc, char **argv) if (read_color(db, "window.active.button.toggled.image.color", &i, &j, &k)) - COLOR5("window","active","buttons","toggled","image",i,j,k,255); + COLOR5("window","active","buttons","toggled-unpressed","image",i,j,k,255); if (read_color(db, "window.inactive.button.toggled.image.color", &i, &j, &k)) - COLOR5("window","inactive","buttons","toggled","image",i,j,k,255); + COLOR5("window","inactive","buttons","toggled-unpressed","image",i,j,k,255); if (read_color(db, "menu.title.text.color", &i, &j, &k)) @@ -421,8 +444,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)) @@ -438,6 +465,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", @@ -449,9 +477,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", @@ -537,6 +565,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="))) { @@ -546,6 +576,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); } }