#include <ctype.h>
#include <string.h>
-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;
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;
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);
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);
if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) &&
retvalue.addr != NULL) {
- *value = retvalue.addr;
- g_strstrip(*value);
+ *value = g_strstrip(retvalue.addr);
ret = TRUE;
}
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);
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;
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;
{
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;
}
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)) {
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))
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.active.disabled.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))
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",
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",
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=")))
{
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);
}
}
projects / mikachu / openbox.git / blobdiff