add app_(un)hilite_fg, which is never parentrelative

diff --git a/render/theme.c b/render/theme.c
index e61974e691448791c5d4a12e6429ae5357efbf26..e658d8731f8a264eba9af2ecabe97866aacef509 100644 (file)
--- a/render/theme.c
+++ b/render/theme.c
@@ -73,6 +73,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
 
     theme->app_hilite_bg = RrAppearanceNew(inst, 0);
     theme->app_unhilite_bg = RrAppearanceNew(inst, 0);
+    theme->app_hilite_fg = RrAppearanceNew(inst, 0);
+    theme->app_unhilite_fg = RrAppearanceNew(inst, 0);
     theme->app_hilite_label = RrAppearanceNew(inst, 1);
     theme->app_unhilite_label = RrAppearanceNew(inst, 1);
 
@@ -478,12 +480,16 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
                          "window.active.label.bg", theme->app_hilite_label,
                          TRUE))
         set_default_appearance(theme->app_hilite_label);
+    if (!read_appearance(db, inst,
+                         "window.active.label.bg", theme->app_hilite_fg,
+                         TRUE))
+        set_default_appearance(theme->app_hilite_fg);
     else if (theme->app_hilite_label->surface.grad == RR_SURFACE_PARENTREL) {
         if (!read_appearance(db, inst,
                              "window.active.title.bg",
-                             theme->app_hilite_label,
+                             theme->app_hilite_fg,
                              FALSE))
-            set_default_appearance(theme->app_hilite_label);
+            set_default_appearance(theme->app_hilite_fg);
     }
     if (!read_appearance(db, inst,
                          "window.inactive.title.bg", theme->app_unhilite_bg,
@@ -493,12 +499,16 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
                          "window.inactive.label.bg", theme->app_unhilite_label,
                          TRUE))
         set_default_appearance(theme->app_unhilite_label);
+    if (!read_appearance(db, inst,
+                         "window.inactive.label.bg", theme->app_unhilite_fg,
+                         TRUE))
+        set_default_appearance(theme->app_unhilite_fg);
     else if (theme->app_unhilite_label->surface.grad == RR_SURFACE_PARENTREL) {
         if (!read_appearance(db, inst,
                              "window.inactive.title.bg",
-                             theme->app_unhilite_label,
+                             theme->app_unhilite_fg,
                              FALSE))
-            set_default_appearance(theme->app_unhilite_label);
+            set_default_appearance(theme->app_unhilite_fg);
     }
         
 
@@ -1037,6 +1047,8 @@ void RrThemeFree(RrTheme *theme)
         RrAppearanceFree(theme->a_clear_tex);
         RrAppearanceFree(theme->app_hilite_bg);
         RrAppearanceFree(theme->app_unhilite_bg);
+        RrAppearanceFree(theme->app_hilite_fg);
+        RrAppearanceFree(theme->app_unhilite_fg);
         RrAppearanceFree(theme->app_hilite_label);
         RrAppearanceFree(theme->app_unhilite_label);
     }

diff --git a/render/theme.h b/render/theme.h
index 5c6507eb9e302493ed89ce24c679df8470cbaa8d..1985e4ae45de93c90aba0b52aa9cd1f280d3bebc 100644 (file)
--- a/render/theme.h
+++ b/render/theme.h
@@ -158,8 +158,10 @@ struct _RrTheme {
 
     RrAppearance *app_hilite_bg;
     RrAppearance *app_unhilite_bg;
-    RrAppearance *app_hilite_label;
-    RrAppearance *app_unhilite_label;
+    RrAppearance *app_hilite_fg; /* never parent relative */
+    RrAppearance *app_unhilite_fg; /* never parent relative */
+    RrAppearance *app_hilite_label; /* can be parent relative */
+    RrAppearance *app_unhilite_label; /* can be parent relative */
 
 };