--- rxvt-unicode/src/rxvtfont.C	2008/01/23 05:14:11	1.128
+++ rxvt-unicode/src/rxvtfont.C	2008/01/23 06:00:53	1.131
@@ -1302,7 +1302,7 @@
    * Maybe make buffering into a resource flag? Compile time option doesn't seems like a
    * good idea from the perspective of packaging for wide variety of user configs.
    */
-  bool buffered = bg >= 0;
+  bool buffered = bg >= Color_transparent;
 #ifdef FORCE_UNBUFFERED_XFT
   buffered = false;
 #endif
@@ -1352,12 +1352,12 @@
             {
               Picture dst = 0;
 
-              if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0xff00)
+              if (bg >= 0 && term->pix_colors[bg].is_opaque ())
                 dst = XftDrawPicture (d2);
 
-              if (bg < 0 || dst != 0)
+              if (dst)
                 {
-                  int src_x = x, src_y = y ;
+                  int src_x = x, src_y = y;
 
                   if (term->bgPixmap.is_parentOrigin ())
                     {
@@ -1402,7 +1402,7 @@
 #endif
 
           if (!back_rendered)
-            XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
+            XftDrawRect (d2, &term->pix_colors[bg < 0 ? Color_bg : bg].c, 0, 0, w, h);
 
           XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
           XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);