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.108 by root, Tue Jun 26 00:40:19 2007 UTC vs.
Revision 1.109 by sasha, Fri Aug 3 05:33:04 2007 UTC

1321 { 1321 {
1322 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1322 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1323 1323
1324 if (0) 1324 if (0)
1325 ; 1325 ;
1326#ifdef ENABLE_TRANSPARENCY 1326#if defined(ENABLE_TRANSPARENCY) || defined(XPM_BACKGROUND)
1327 else if (bg < 0 && term->am_pixmap_trans)
1328 XCopyArea (disp, term->pixmap, d2, gc,
1329 x + term->window_vt_x, y + term->window_vt_y,
1330 w, h, 0, 0);
1331#endif
1332#ifdef XPM_BACKGROUND
1333 else if (bg < 0 && term->bgPixmap.pixmap) 1327 else if (bg < 0 && term->bgPixmap.pixmap)
1334 { 1328 {
1329 if (term->bgPixmap.pmap_width >= x + term->window_vt_x+w
1330 && term->bgPixmap.pmap_height >= y + term->window_vt_y+h)
1331 {
1332 XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1333 x + term->window_vt_x, y + term->window_vt_y,
1334 w, h, 0, 0);
1335 }
1336 else
1337 {
1335 XGCValues gcv; 1338 XGCValues gcv;
1336 1339
1337 gcv.fill_style = FillTiled; 1340 gcv.fill_style = FillTiled;
1338 gcv.tile = term->pixmap; 1341 gcv.tile = term->bgPixmap.pixmap;
1339 gcv.ts_x_origin = -x; 1342 gcv.ts_x_origin = -x;
1340 gcv.ts_y_origin = -y; 1343 gcv.ts_y_origin = -y;
1341 1344
1345#if 0
1342 GC gc2 = XCreateGC (disp, d2, 1346 GC gc2 = XCreateGC (disp, d2,
1343 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1347 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1344 &gcv); 1348 &gcv);
1349#endif
1350 XChangeGC (disp, gc,
1351 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1352 &gcv);
1345 1353
1346 XFillRectangle (disp, d2, gc2, 0, 0, w, h); 1354 XFillRectangle (disp, d2, gc/*gc2*/, 0, 0, w, h);
1347 1355
1356 gcv.fill_style = FillSolid;
1357 XChangeGC (disp, gc, GCFillStyle, &gcv);
1348 XFreeGC (disp, gc2); 1358 /* XFreeGC (disp, gc2); */
1359
1360 }
1349 } 1361 }
1350#endif 1362#endif
1351 else 1363 else
1352 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); 1364 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
1353 1365

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines