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.106 by root, Thu Nov 2 17:23:50 2006 UTC vs.
Revision 1.109 by sasha, Fri Aug 3 05:33:04 2007 UTC

1274 int w = term->fwidth * len; 1274 int w = term->fwidth * len;
1275 int h = term->fheight; 1275 int h = term->fheight;
1276 1276
1277 bool buffered = bg >= 0 // we don't use a transparent bg 1277 bool buffered = bg >= 0 // we don't use a transparent bg
1278#ifndef FORCE_UNBUFFERED_XFT 1278#ifndef FORCE_UNBUFFERED_XFT
1279# if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 1279# ifdef ENABLE_TRANSPARENCY
1280 || !term->am_transparent // we aren't transparent 1280 || !term->am_transparent // we aren't transparent
1281 || term->am_pixmap_trans // we have a pixmap
1282# endif 1281# endif
1283#endif 1282#endif
1284 ; 1283 ;
1285 1284
1286 // cut trailing spaces 1285 // cut trailing spaces
1322 { 1321 {
1323 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); 1322 rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1324 1323
1325 if (0) 1324 if (0)
1326 ; 1325 ;
1327#ifdef TRANSPARENT 1326#if defined(ENABLE_TRANSPARENCY) || defined(XPM_BACKGROUND)
1328 else if (bg < 0 && term->am_pixmap_trans)
1329 XCopyArea (disp, term->pixmap, d2, gc,
1330 x + term->window_vt_x, y + term->window_vt_y,
1331 w, h, 0, 0);
1332#endif
1333#ifdef XPM_BACKGROUND
1334 else if (bg < 0 && term->bgPixmap.pixmap) 1327 else if (bg < 0 && term->bgPixmap.pixmap)
1335 { 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 {
1336 XGCValues gcv; 1338 XGCValues gcv;
1337 1339
1338 gcv.fill_style = FillTiled; 1340 gcv.fill_style = FillTiled;
1339 gcv.tile = term->pixmap; 1341 gcv.tile = term->bgPixmap.pixmap;
1340 gcv.ts_x_origin = -x; 1342 gcv.ts_x_origin = -x;
1341 gcv.ts_y_origin = -y; 1343 gcv.ts_y_origin = -y;
1342 1344
1345#if 0
1343 GC gc2 = XCreateGC (disp, d2, 1346 GC gc2 = XCreateGC (disp, d2,
1344 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1347 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1345 &gcv); 1348 &gcv);
1349#endif
1350 XChangeGC (disp, gc,
1351 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1352 &gcv);
1346 1353
1347 XFillRectangle (disp, d2, gc2, 0, 0, w, h); 1354 XFillRectangle (disp, d2, gc/*gc2*/, 0, 0, w, h);
1348 1355
1356 gcv.fill_style = FillSolid;
1357 XChangeGC (disp, gc, GCFillStyle, &gcv);
1349 XFreeGC (disp, gc2); 1358 /* XFreeGC (disp, gc2); */
1359
1360 }
1350 } 1361 }
1351#endif 1362#endif
1352 else 1363 else
1353 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); 1364 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
1354 1365

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines