more updates for toggled states. also updating the theme files.

diff --git a/render/theme.c b/render/theme.c
index 933114e..695b7e0 100644 (file)
--- a/render/theme.c
+++ b/render/theme.c
@@ -304,17 +304,17 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
               &theme->titlebut_toggled_hover_focused_color, NULL))
         theme->titlebut_toggled_hover_focused_color =
             RrColorNew(inst,
-                       theme->titlebut_focused_unpressed_color->r,
-                       theme->titlebut_focused_unpressed_color->g,
-                       theme->titlebut_focused_unpressed_color->b);
+                       theme->titlebut_toggled_focused_unpressed_color->r,
+                       theme->titlebut_toggled_focused_unpressed_color->g,
+                       theme->titlebut_toggled_focused_unpressed_color->b);
     if (!FIND(color,
               L("window","inactive","buttons","toggled-hover","image"),
               &theme->titlebut_toggled_hover_unfocused_color, NULL))
         theme->titlebut_toggled_hover_unfocused_color =
             RrColorNew(inst,
-                       theme->titlebut_unfocused_unpressed_color->r,
-                       theme->titlebut_unfocused_unpressed_color->g,
-                       theme->titlebut_unfocused_unpressed_color->b);
+                       theme->titlebut_toggled_unfocused_unpressed_color->r,
+                       theme->titlebut_toggled_unfocused_unpressed_color->g,
+                       theme->titlebut_toggled_unfocused_unpressed_color->b);
     if (!FIND(color, L("menu","title","text","primary"),
               &theme->menu_title_color, NULL))
         theme->menu_title_color = RrColorNew(inst, 0, 0, 0);
@@ -650,14 +650,14 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
     {
         RrAppearanceFree(theme->a_toggled_hover_focused_max);
         theme->a_toggled_hover_focused_max =
-            RrAppearanceCopy(theme->a_focused_unpressed_max);
+            RrAppearanceCopy(theme->a_toggled_focused_unpressed_max);
     }
     if (!FIND(appearance, L("window","inactive","buttons","toggled-hover"),
               theme->a_toggled_hover_unfocused_max, TRUE))
     {
         RrAppearanceFree(theme->a_toggled_hover_unfocused_max);
         theme->a_toggled_hover_unfocused_max =
-            RrAppearanceCopy(theme->a_unfocused_unpressed_max);
+            RrAppearanceCopy(theme->a_toggled_unfocused_unpressed_max);
     }
 
    theme->a_disabled_focused_close =

diff --git a/themes/Mikachu/openbox-3/themerc.xml b/themes/Mikachu/openbox-3/themerc.xml
index 1da7484..515015c 100644 (file)
--- a/themes/Mikachu/openbox-3/themerc.xml
+++ b/themes/Mikachu/openbox-3/themerc.xml
@@ -51,13 +51,13 @@
           <secondary r="0" g="0" b="0" a="255"/>
           <border r="0" g="0" b="0" a="255"/>
         </hover>
-        <toggled>
+        <toggled-unpressed>
           <image r="217" g="217" b="217" a="255"/>
           <style>sunken gradient crossdiagonal bevel2</style>
           <primary r="102" g="153" b="204" a="255"/>
           <secondary r="51" g="72" b="102" a="255"/>
           <border r="0" g="0" b="0" a="255"/>
-        </toggled>
+        </toggled-unpressed>
       </buttons>
       <titlebar>
         <style>raised gradient crossdiagonal bevel1</style>
@@ -122,13 +122,13 @@
           <secondary r="0" g="0" b="0" a="255"/>
           <border r="0" g="0" b="0" a="255"/>
         </hover>
-        <toggled>
+        <toggled-unpressed>
           <image r="153" g="153" b="153" a="255"/>
           <style>sunken gradient crossdiagonal bevel1</style>
           <primary r="153" g="153" b="153" a="255"/>
           <secondary r="51" g="51" b="51" a="255"/>
           <border r="0" g="0" b="0" a="255"/>
-        </toggled>
+        </toggled-unpressed>
       </buttons>
       <titlebar>
         <style>flat gradient diagonal bevel1</style>

diff --git a/themes/Natura/openbox-3/themerc.xml b/themes/Natura/openbox-3/themerc.xml
index d48a55f..5c12641 100644 (file)
--- a/themes/Natura/openbox-3/themerc.xml
+++ b/themes/Natura/openbox-3/themerc.xml
@@ -50,11 +50,11 @@
           <primary r="87" g="103" b="115" a="255"/>
           <border r="154" g="171" b="185" a="255"/>
         </hover>
-        <toggled>
+        <toggled-unpressed>
           <image r="249" g="242" b="238" a="255"/>
           <style>parentrelative</style>
           <border r="78" g="88" b="96" a="255"/>
-        </toggled>
+        </toggled-unpressed>
       </buttons>
       <titlebar>
         <style>flat gradient splitvertical</style>
@@ -111,12 +111,12 @@
           <primary r="175" g="177" b="178" a="255"/>
           <border r="217" g="223" b="228" a="255"/>
         </hover>
-        <toggled>
+        <toggled-unpressed>
           <image r="182" g="182" b="182" a="255"/>
           <style>parentrelative</style>
           <primary r="238" g="238" b="238" a="255"/>
           <border r="201" g="201" b="201" a="255"/>
-        </toggled>
+        </toggled-unpressed>
       </buttons>
       <titlebar>
         <style>flat gradient vertical</style>

diff --git a/themes/artwiz-boxed/openbox-3/themerc.xml b/themes/artwiz-boxed/openbox-3/themerc.xml
index 104f7a2..9c360b6 100644 (file)
--- a/themes/artwiz-boxed/openbox-3/themerc.xml
+++ b/themes/artwiz-boxed/openbox-3/themerc.xml
@@ -33,12 +33,12 @@
           <primary r="144" g="148" b="152" a="255"/>
           <secondary r="32" g="36" b="40" a="255"/>
         </disabled>
-        <toggled>
+        <toggled-unpressed>
           <image r="255" g="255" b="255" a="255"/>
           <style>raised gradient diagonal</style>
           <primary r="144" g="148" b="152" a="255"/>
           <secondary r="32" g="36" b="40" a="255"/>
-        </toggled>
+        </toggled-unpressed>
         <pressed>
           <style>sunken gradient diagonal</style>
           <primary r="32" g="64" b="80" a="255"/>
@@ -90,12 +90,12 @@
           <primary r="80" g="84" b="88" a="255"/>
           <secondary r="0" g="0" b="0" a="255"/>
         </disabled>
-        <toggled>
+        <toggled-unpressed>
           <image r="112" g="116" b="120" a="255"/>
           <style>raised gradient diagonal</style>
           <primary r="80" g="84" b="88" a="255"/>
           <secondary r="0" g="0" b="0" a="255"/>
-        </toggled>
+        </toggled-unpressed>
       </buttons>
       <titlebar>
         <style>raised vertical gradient</style>

diff --git a/themes/bear2/openbox-3/themerc.xml b/themes/bear2/openbox-3/themerc.xml
index 39d4bab..bda587d 100644 (file)
--- a/themes/bear2/openbox-3/themerc.xml
+++ b/themes/bear2/openbox-3/themerc.xml
@@ -42,10 +42,10 @@
           <style>parentrelative</style>
           <primary r="114" g="159" b="207" a="255"/>
         </hover>
-        <toggled>
+        <toggled-unpressed>
           <image r="239" g="239" b="239" a="255"/>
           <style>parentrelative</style>
-        </toggled>
+        </toggled-unpressed>
       </buttons>
       <titlebar>
         <style>flat border gradient mirrorhorizontal</style>
@@ -91,10 +91,10 @@
           <image r="136" g="138" b="133" a="255"/>
           <style>parentrelative</style>
         </hover>
-        <toggled>
+        <toggled-unpressed>
           <image r="136" g="138" b="133" a="255"/>
           <style>parentrelative</style>
-        </toggled>
+        </toggled-unpressed>
       </buttons>
       <titlebar>
         <style>flat border gradient mirrorhorizontal</style>

diff --git a/themes/orang/openbox-3/themerc.xml b/themes/orang/openbox-3/themerc.xml
index 4b25b36..84ded30 100644 (file)
--- a/themes/orang/openbox-3/themerc.xml
+++ b/themes/orang/openbox-3/themerc.xml
@@ -41,10 +41,10 @@
           <style>flat solid</style>
           <primary r="252" g="175" b="62" a="255"/>
         </hover>
-        <toggled>
+        <toggled-unpressed>
           <image r="255" g="255" b="255" a="255"/>
           <style>parentrelative</style>
-        </toggled>
+        </toggled-unpressed>
       </buttons>
       <titlebar>
         <style>flat border solid</style>
@@ -82,9 +82,9 @@
           <primary r="170" g="170" b="170" a="255"/>
           <border r="229" g="229" b="229" a="255"/>
         </pressed>
-        <toggled>
+        <toggled-unpressed>
           <style>parentrelative</style>
-        </toggled>
+        </toggled-unpressed>
         <hover>
           <style>flat solid</style>
           <primary r="227" g="227" b="227" a="255"/>

diff --git a/tools/themetoxml/themetoxml.c b/tools/themetoxml/themetoxml.c
index a75cf19..e6f947b 100644 (file)
--- a/tools/themetoxml/themetoxml.c
+++ b/tools/themetoxml/themetoxml.c
@@ -451,9 +451,9 @@ int main(int argc, char **argv)
     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",