[ViewVC] Diff of: cvs/rxvt-unicode/src/rxvtfont.C

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.104 by root, Tue Oct 3 10:28:25 2006 UTC vs.
Revision 1.107 by ayin, Sat Feb 17 16:19:09 2007 UTC

 rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
 {
   dTermDisplay;
   dTermGC;
-  if (color < 0 || color == Color_bg)
+  if (color == Color_bg || color == Color_transparent)
     XClearArea (disp, d, x, y, w, h, false);
-  else
+  else if (color >= 0)
     {
 #if XFT
       XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
 #else
       XSetForeground (disp, gc, term->pix_colors[color]);
               *chrs = cc->c2;
               rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
                                 ? f1
                                 : (*fs)[fs->find_font (cc->c2)];
-              f2->draw (d, x, y, chrs, width, fg, -1);
+              f2->draw (d, x, y, chrs, width, fg, Color_none);
             }
         }
 #endif
       else
         switch (t)
   int w = term->fwidth * len;
   int h = term->fheight;
   bool buffered = bg >= 0                         // we don't use a transparent bg
 #ifndef FORCE_UNBUFFERED_XFT
-# if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
+# ifdef TRANSPARENT
                   || !term->am_transparent        // we aren't transparent
-                  || term->am_pixmap_trans        // we have a pixmap
 # endif
 #endif
                   ;
   // cut trailing spaces

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines