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.113 by root, Tue Aug 28 17:26:52 2007 UTC vs.
Revision 1.117 by root, Tue Aug 28 17:35:30 2007 UTC

1325 1325
1326#ifdef HAVE_BG_PIXMAP 1326#ifdef HAVE_BG_PIXMAP
1327 if (term->bgPixmap.pixmap) 1327 if (term->bgPixmap.pixmap)
1328 { 1328 {
1329 Picture dst = 0; 1329 Picture dst = 0;
1330
1330 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00) 1331 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0x0ff00)
1331 dst = XftDrawPicture(d2); 1332 dst = XftDrawPicture (d2);
1332 1333
1333 if (bg < 0 || dst != 0) 1334 if (bg < 0 || dst != 0)
1334 { 1335 {
1335 if (term->bgPixmap.pmap_width >= x + term->window_vt_x+w 1336 if (term->bgPixmap.pmap_width >= x + term->window_vt_x+w
1336 && term->bgPixmap.pmap_height >= y + term->window_vt_y+h) 1337 && term->bgPixmap.pmap_height >= y + term->window_vt_y+h)
1350 1351
1351 XChangeGC (disp, gc, 1352 XChangeGC (disp, gc,
1352 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, 1353 GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle,
1353 &gcv); 1354 &gcv);
1354 1355
1355 XFillRectangle (disp, d2, gc/*gc2*/, 0, 0, w, h); 1356 XFillRectangle (disp, d2, gc, 0, 0, w, h);
1356 1357
1357 gcv.fill_style = FillSolid; 1358 gcv.fill_style = FillSolid;
1358 XChangeGC (disp, gc, GCFillStyle, &gcv); 1359 XChangeGC (disp, gc, GCFillStyle, &gcv);
1359 } 1360 }
1360 1361
1367 back_rendered = true; 1368 back_rendered = true;
1368 } 1369 }
1369 } 1370 }
1370#endif 1371#endif
1371 1372
1372 if(bg >= 0 && !back_rendered) 1373 if (bg >= 0 && !back_rendered)
1373 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); 1374 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
1374 1375
1375 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1376 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1376 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1377 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1377 } 1378 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines