From: Dana Jansens <danakj@orodu.net>
Date: Sat, 21 Jun 2003 02:38:47 +0000 (+0000)
Subject: use the pseudo shit in the instance now
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=16066ed282bbc70aa3cefa81a674a8c6e8fe69b8;p=chaz%2Fopenbox

use the pseudo shit in the instance now
---

diff --git a/render/color.c b/render/color.c
index 564fb7cf..b4856853 100644
--- a/render/color.c
+++ b/render/color.c
@@ -4,9 +4,6 @@
 #include "render.h"
 #include "color.h"
 
-XColor *pseudo_colors;
-int pseudo_bpc;
-
 void RrColorAllocateGC(RrColor *in)
 {
     XGCValues gcv;
@@ -130,11 +127,11 @@ void RrReduceDepth(const RrInstance *inst, RrPixel32 *data, XImage *im)
 
 XColor *RrPickColor(const RrInstance *inst, gint r, gint g, gint b) 
 {
-  r = (r & 0xff) >> (8-pseudo_bpc);
-  g = (g & 0xff) >> (8-pseudo_bpc);
-  b = (b & 0xff) >> (8-pseudo_bpc);
-  return &RrPseudoColors(inst)[(r << (2*pseudo_bpc)) +
-                               (g << (1*pseudo_bpc)) +
+  r = (r & 0xff) >> (8-RrPseudoBPC(inst));
+  g = (g & 0xff) >> (8-RrPseudoBPC(inst));
+  b = (b & 0xff) >> (8-RrPseudoBPC(inst));
+  return &RrPseudoColors(inst)[(r << (2*RrPseudoBPC(inst))) +
+                               (g << (1*RrPseudoBPC(inst))) +
                                b];
 }