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.129 by root, Wed Jan 23 05:18:43 2008 UTC vs.
Revision 1.130 by root, Wed Jan 23 05:59:29 2008 UTC

1300 1300
1301 /* 1301 /*
1302 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a 1302 * Maybe make buffering into a resource flag? Compile time option doesn't seems like a
1303 * good idea from the perspective of packaging for wide variety of user configs. 1303 * good idea from the perspective of packaging for wide variety of user configs.
1304 */ 1304 */
1305 bool buffered = bg >= 0; 1305 bool buffered = bg >= Color_transparent;
1306#ifdef FORCE_UNBUFFERED_XFT 1306#ifdef FORCE_UNBUFFERED_XFT
1307 buffered = false; 1307 buffered = false;
1308#endif 1308#endif
1309 1309
1310 // cut trailing spaces 1310 // cut trailing spaces
1350#ifdef HAVE_BG_PIXMAP 1350#ifdef HAVE_BG_PIXMAP
1351 if (term->bgPixmap.pixmap) 1351 if (term->bgPixmap.pixmap)
1352 { 1352 {
1353 Picture dst = 0; 1353 Picture dst = 0;
1354 1354
1355 if (bg >= 0 && term->pix_colors[bg].c.color.alpha < 0xff00) 1355 if (bg >= 0 && term->pix_colors[bg].is_opaque ())
1356 dst = XftDrawPicture (d2); 1356 dst = XftDrawPicture (d2);
1357 1357
1358 if (bg < 0 || dst != 0) 1358 if (dst)
1359 { 1359 {
1360 int src_x = x, src_y = y ; 1360 int src_x = x, src_y = y;
1361 1361
1362 if (term->bgPixmap.is_parentOrigin ()) 1362 if (term->bgPixmap.is_parentOrigin ())
1363 { 1363 {
1364 src_x += term->window_vt_x; 1364 src_x += term->window_vt_x;
1365 src_y += term->window_vt_y; 1365 src_y += term->window_vt_y;
1388 1388
1389 gcv.fill_style = FillSolid; 1389 gcv.fill_style = FillSolid;
1390 XChangeGC (disp, gc, GCFillStyle, &gcv); 1390 XChangeGC (disp, gc, GCFillStyle, &gcv);
1391 } 1391 }
1392 1392
1393 if (bg >= 0)
1394 {
1393 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); 1395 Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
1394 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); 1396 XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1397 }
1395 1398
1396 back_rendered = true; 1399 back_rendered = true;
1397 } 1400 }
1398 } 1401 }
1399#endif 1402#endif
1400 1403
1401 if (!back_rendered) 1404 if (bg >= 0 && !back_rendered)
1402 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); 1405 XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);
1403 1406
1404 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); 1407 XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1405 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); 1408 XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1406 } 1409 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines