From: Dana Jansens <danakj@orodu.net>
Date: Wed, 13 Jun 2007 14:03:46 +0000 (+0000)
Subject: let the theme specify all splitgradient colors
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=b70afd10166f7cf93eecc0c0b3d4014bfbc20662;p=chaz%2Fopenbox

let the theme specify all splitgradient colors
---

diff --git a/render/theme.c b/render/theme.c
index 0edc81d7..26537853 100644
--- a/render/theme.c
+++ b/render/theme.c
@@ -1761,6 +1761,7 @@ static gboolean read_appearance(XrmDatabase db, const RrInstance *inst,
     gboolean ret = FALSE;
     gchar *rclass = create_class_name(rname);
     gchar *cname, *ctoname, *bcname, *icname, *hname, *sname;
+    gchar *csplitname, *ctosplitname;
     gchar *rettype;
     XrmValue retvalue;
     gint i;
@@ -1771,6 +1772,8 @@ static gboolean read_appearance(XrmDatabase db, const RrInstance *inst,
     icname = g_strconcat(rname, ".interlace.color", NULL);
     hname = g_strconcat(rname, ".highlight", NULL);
     sname = g_strconcat(rname, ".shadow", NULL);
+    csplitname = g_strconcat(rname, ".color.splitTo", NULL);
+    ctosplitname = g_strconcat(rname, ".colorTo.splitTo", NULL);
 
     if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) &&
         retvalue.addr != NULL) {
@@ -1801,32 +1804,42 @@ static gboolean read_appearance(XrmDatabase db, const RrInstance *inst,
         if (value->surface.grad == RR_SURFACE_SPLIT_VERTICAL) {
             gint r, g, b;
 
-            r = value->surface.primary->r;
-            r += r >> 2;
-            g = value->surface.primary->g;
-            g += g >> 2;
-            b = value->surface.primary->b;
-            b += b >> 2;
-            if (r > 0xFF) r = 0xFF;
-            if (g > 0xFF) g = 0xFF;
-            if (b > 0xFF) b = 0xFF;
-            value->surface.split_primary = RrColorNew(inst, r, g, b);
-
-            r = value->surface.secondary->r;
-            r += r >> 4;
-            g = value->surface.secondary->g;
-            g += g >> 4;
-            b = value->surface.secondary->b;
-            b += b >> 4;
-            if (r > 0xFF) r = 0xFF;
-            if (g > 0xFF) g = 0xFF;
-            if (b > 0xFF) b = 0xFF;
-            value->surface.split_secondary = RrColorNew(inst, r, g, b);
+            if (!read_color(db, inst, csplitname,
+                            &value->surface.split_primary))
+            {
+                r = value->surface.primary->r;
+                r += r >> 2;
+                g = value->surface.primary->g;
+                g += g >> 2;
+                b = value->surface.primary->b;
+                b += b >> 2;
+                if (r > 0xFF) r = 0xFF;
+                if (g > 0xFF) g = 0xFF;
+                if (b > 0xFF) b = 0xFF;
+                value->surface.split_primary = RrColorNew(inst, r, g, b);
+            }
+
+            if (!read_color(db, inst, ctosplitname,
+                            &value->surface.split_secondary))
+            {
+                r = value->surface.secondary->r;
+                r += r >> 4;
+                g = value->surface.secondary->g;
+                g += g >> 4;
+                b = value->surface.secondary->b;
+                b += b >> 4;
+                if (r > 0xFF) r = 0xFF;
+                if (g > 0xFF) g = 0xFF;
+                if (b > 0xFF) b = 0xFF;
+                value->surface.split_secondary = RrColorNew(inst, r, g, b);
+            }
         }
 
         ret = TRUE;
     }
 
+    g_free(ctosplitname);
+    g_free(csplitname);
     g_free(sname);
     g_free(hname);
     g_free(icname);