--- rxvt-unicode/src/rxvtcolor.C	2003/11/24 17:28:08	1.1
+++ rxvt-unicode/src/rxvtcolor.C	2004/01/19 17:26:43	1.2
@@ -10,7 +10,7 @@
   XColor xc;
 
   xc.pixel = p;
-  if (!XQueryColor (R->Xdisplay, XCMAP, &xc))
+  if (!XQueryColor (R->Xdisplay, R->Xcmap, &xc))
     return false;
 
   XRenderColor d;
@@ -22,8 +22,8 @@
 
   return
     XftColorAllocValue (R->Xdisplay, 
-                        XVISUAL,
-                        XCMAP,
+                        R->Xvisual,
+                        R->Xcmap,
                         &d,
                         &c);
 #else
@@ -38,7 +38,7 @@
 {
   XColor xc;
 
-  if (XParseColor (R->Xdisplay, XCMAP, name, &xc))
+  if (XParseColor (R->Xdisplay, R->Xcmap, name, &xc))
     return set (aR_ xc.red, xc.green, xc.blue);
 
   return false;
@@ -54,7 +54,7 @@
   xc.blue  = cb;
   xc.flags = DoRed | DoGreen | DoBlue;
 
-  if (XAllocColor (R->Xdisplay, XCMAP, &xc))
+  if (XAllocColor (R->Xdisplay, R->Xcmap, &xc))
     return set (aR_ xc.pixel);
 
   return false;
@@ -71,7 +71,7 @@
   XColor c;
 
   c.pixel = p;
-  XQueryColor (R->Xdisplay, XCMAP, &c);
+  XQueryColor (R->Xdisplay, R->Xcmap, &c);
 
   cr = c.red;
   cg = c.green;