From: Dana Jansens <danakj@orodu.net>
Date: Thu, 10 Jun 2010 20:41:08 +0000 (-0400)
Subject: Make pixel's allocated by ObRender opaque on 32-bit visuals by adding 0xff<<24 to... 
X-Git-Tag: cgl~45
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=71f98d975d26c941cebea48cf5e46fbe15a038bb;p=dana%2Fopenbox.git

Make pixel's allocated by ObRender opaque on 32-bit visuals by adding 0xff<<24 to them
---

diff --git a/obrender/color.c b/obrender/color.c
index dd0551ee..39511820 100644
--- a/obrender/color.c
+++ b/obrender/color.c
@@ -71,7 +71,7 @@ RrColor *RrColorNew(const RrInstance *inst, gint r, gint g, gint b)
     g_assert(g >= 0 && g < 256);
     g_assert(b >= 0 && b < 256);
 
-    key = (r << 24) + (g << 16) + (b << 8);
+    key = (r << 24) + (g << 16) + (b << 8) + (0xff << 0);
 #ifndef NO_COLOR_CACHE
     if ((out = g_hash_table_lookup(RrColorHash(inst), &key))) {
         out->refcount++;
@@ -350,7 +350,8 @@ gint RrColorBlue(const RrColor *c)
 
 gulong RrColorPixel(const RrColor *c)
 {
-    return c->pixel;
+    /* make pixels opaque in 32-bit visuals */
+    return c->pixel | 0xff << 24;
 }
 
 GC RrColorGC(RrColor *c)