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.117 by root, Tue Aug 28 17:35:30 2007 UTC vs.
Revision 1.118 by sasha, Wed Sep 12 19:51:41 2007 UTC

1331 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00) 1331 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00)
1332 dst = XftDrawPicture (d2); 1332 dst = XftDrawPicture (d2);
1333 1333
1334 if (bg < 0 || dst != 0) 1334 if (bg < 0 || dst != 0)
1335 { 1335 {
1336 int src_x = x, src_y = y ;
1337
1338 if (term->bgPixmap.is_parentOrigin ())
1339 {
1340 src_x += term->window_vt_x;
1341 src_y += term->window_vt_y;
1342 }
1343
1336 if (term->bgPixmap.pmap_width >= x + term->window_vt_x+w 1344 if (term->bgPixmap.pmap_width >= src_x+w
1337 && term->bgPixmap.pmap_height >= y + term->window_vt_y+h) 1345 && term->bgPixmap.pmap_height >= src_y+h)
1338 { 1346 {
1339 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, 1347 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1340 x + term->window_vt_x, y + term->window_vt_y,
1341 w, h, 0, 0); 1348 src_x, src_y, w, h, 0, 0);
1342 } 1349 }
1343 else 1350 else
1344 { 1351 {
1345 XGCValues gcv; 1352 XGCValues gcv;
1346 1353
1347 gcv.fill_style = FillTiled; 1354 gcv.fill_style = FillTiled;
1348 gcv.tile = term->bgPixmap.pixmap; 1355 gcv.tile = term->bgPixmap.pixmap;
1349 gcv.ts_x_origin = -x; 1356 gcv.ts_x_origin = -src_x;
1350 gcv.ts_y_origin = -y; 1357 gcv.ts_y_origin = -src_y;
1351 1358
1352 XChangeGC (disp, gc, 1359 XChangeGC (disp, gc,
1353 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1360 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1354 &gcv); 1361 &gcv);
1355 1362

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines