X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=tools%2Fthemetoxml%2Fthemetoxml.c;h=464944d1a2c18c182eab88e5a1ced0a4b83ec983;hb=ad3336f70d722258b4bde660e0272d9987924d1f;hp=b1600aec8ab9ffe4450a6e14d3d6c1cc873d8afd;hpb=9cc523aa71d5c25a7ac0380c2349e3634d240f6d;p=chaz%2Fopenbox

diff --git a/tools/themetoxml/themetoxml.c b/tools/themetoxml/themetoxml.c
index b1600aec..464944d1 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);
 
@@ -448,7 +458,7 @@ 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",
@@ -465,7 +475,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",
@@ -565,8 +575,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 +588,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);
+            COLOR5("menu","active-disabled","text","shadow","primary",j,j,j,i);
         }
     }