X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;ds=inline;f=tools%2Fthemetoxml%2Fthemetoxml.c;h=8e3ce40c8fa3b193296a5300bb58d3e094d24a96;hb=aca8327244e0e1ebc4e367a57339ff2dc944782c;hp=bdb331b8ae77474a66e55dcf72359e22e85c4c6d;hpb=2ff10b4260fd01ebb69adc36e0dabb2fb6355885;p=chaz%2Fopenbox

diff --git a/tools/themetoxml/themetoxml.c b/tools/themetoxml/themetoxml.c
index bdb331b8..8e3ce40c 100644
--- a/tools/themetoxml/themetoxml.c
+++ b/tools/themetoxml/themetoxml.c
@@ -351,13 +351,23 @@ int main(int argc, char **argv)
 
     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);
 
@@ -446,15 +456,18 @@ int main(int argc, char **argv)
     if (read_color(db, "menu.items.disabled.text.color",
                    &i, &j, &k)) {
         COLOR3("menu","disabled","primary",i,j,k,255);
-        read_color(db, "menu.items.activedisabled.text.color",
+        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 +478,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 +502,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 +583,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 +596,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);
         }
     }