ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtfont.C
(Generate patch)

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.164 by sf-exg, Thu Apr 1 08:55:09 2010 UTC vs.
Revision 1.166 by sf-exg, Fri Oct 22 18:03:10 2010 UTC

1403 && (bg == Color_transparent || bg == Color_bg 1403 && (bg == Color_transparent || bg == Color_bg
1404 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) 1404 || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1405 { 1405 {
1406 int src_x = x, src_y = y; 1406 int src_x = x, src_y = y;
1407 1407
1408 if (term->bgPixmap.is_parentOrigin ()) 1408 if (term->bgPixmap.flags & bgPixmap_t::isTransparent)
1409 { 1409 {
1410 src_x += term->window_vt_x; 1410 src_x += term->window_vt_x;
1411 src_y += term->window_vt_y; 1411 src_y += term->window_vt_y;
1412 } 1412 }
1413 1413
1482 prop.width = prop.height = prop.ascent = prop.weight = prop.slant 1482 prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1483 = rxvt_fontprop::unset; 1483 = rxvt_fontprop::unset;
1484 force_prop = false; 1484 force_prop = false;
1485 1485
1486 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++) 1486 for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1487 FONT_UNREF (*i); 1487 (*i)->unref ();
1488 1488
1489 for (pagemap **p = fmap.begin (); p != fmap.end (); p++) 1489 for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1490 delete *p; 1490 delete *p;
1491 1491
1492 free (fontdesc); fontdesc = 0; 1492 free (fontdesc); fontdesc = 0;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines