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;
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;
}
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));
}
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)) {