border, not borderwidth.

[chaz/openbox] / tools / themetoxml / themetoxml.c

diff --git a/tools/themetoxml/themetoxml.c b/tools/themetoxml/themetoxml.c
index b1600aec8ab9ffe4450a6e14d3d6c1cc873d8afd..b53599b2356b4033e37880f62082baf7dbf530a3 100644 (file)
--- a/tools/themetoxml/themetoxml.c
+++ b/tools/themetoxml/themetoxml.c
@@ -342,24 +342,40 @@ int main(int argc, char **argv)
     if (read_int(db, "borderWidth", &i)) {
         CONT3("dimensions", "window", "border", NUM(i));
         CONT3("dimensions", "menu", "border", NUM(i));
+        CONT3("dimensions", "osd", "border", NUM(i));
     } else if (read_int(db, "border.width", &i)) {
         CONT3("dimensions", "window", "border", NUM(i));
         CONT3("dimensions", "menu", "border", NUM(i));
+        CONT3("dimensions", "osd", "border", NUM(i));
     }
     if (read_int(db, "menu.border.width", &i)) 
         CONT3("dimensions", "menu", "border", NUM(i));
+    if (read_int(db, "osd.border.width", &i)) 
+        CONT3("dimensions", "osd", "border", NUM(i));
 
     if (read_color(db, "border.color", &i, &j, &k)) {
         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))
+    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", "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_color(db, "osd.border.color", &i, &j, &k))
+        COLOR2("osd", "border", i, j, k, 255);
 
     if (read_int(db, "window.client.padding.width", &i)) {
         ATTR3("dimensions", "window", "clientpadding", "x", NUM(i));
@@ -448,13 +464,16 @@ int main(int argc, char **argv)
         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);
+        COLOR4("menu","active-disabled","text","primary",i,j,k,255);
     }
 
     if (read_color(db, "menu.items.active.text.color",
                    &i, &j, &k))
         COLOR4("menu","active","text","primary",i,j,k,255);
 
+    if (read_color(db, "osd.label.text.color", &i, &j, &k))
+        COLOR4("osd","label","text","primary",i,j,k,255);
+
     APPEARANCE3("window.active.title.bg", "window", "active", "titlebar");
     APPEARANCE3("window.inactive.title.bg", "window", "inactive", "titlebar");
     APPEARANCE3("window.active.label.bg", "window", "active", "label");
@@ -465,7 +484,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",
@@ -489,6 +508,11 @@ int main(int argc, char **argv)
     APPEARANCE4("window.inactive.button.hover.bg",
                 "window", "inactive", "buttons", "hover");
 
+    APPEARANCE2("osd.bg", "osd", "background");
+    APPEARANCE2("osd.label.bg", "osd", "label");
+    APPEARANCE2("osd.hilight.bg", "osd", "hilight");
+    APPEARANCE2("osd.unhilight.bg", "osd", "unhilight");
+
     if (read_string(db, "window.active.label.text.font", &s)) {
         char *p;
         if (strstr(s, "shadow=y")) {
@@ -565,8 +589,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=")))
         {
@@ -576,7 +602,26 @@ 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);
+        }
+    }
+
+    if (read_string(db, "osd.label.text.font", &s)) {
+        char *p;
+        if (strstr(s, "shadow=y")) {
+            if ((p = strstr(s, "shadowoffset=")))
+                i = parse_inline_number(p + strlen("shadowoffset="));
+            else
+                i = 1;
+            ATTR5("osd","label","text","shadow","offset","x",NUM(i));
+            ATTR5("osd","label","text","shadow","offset","y",NUM(i));
+        }
+        if ((p = strstr(s, "shadowtint=")))
+        {
+            i = parse_inline_number(p + strlen("shadowtint="));
+            j = (i > 0 ? 0 : 255);
+            i = ABS(i*255/100);
+            COLOR5("osd","label","text","shadow","primary",j,j,j,i);
         }
     }