| … | |
… | |
| 1342 | |
1342 | |
| 1343 | if (buffered) |
1343 | if (buffered) |
| 1344 | { |
1344 | { |
| 1345 | if (ep != enc) |
1345 | if (ep != enc) |
| 1346 | { |
1346 | { |
| 1347 | bool back_rendered = false; |
|
|
| 1348 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1347 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
| 1349 | |
1348 | |
| 1350 | #ifdef HAVE_BG_PIXMAP |
1349 | #ifdef HAVE_BG_PIXMAP |
|
|
1350 | Picture dst = 0; |
| 1351 | |
1351 | |
| 1352 | if (term->bgPixmap.pixmap |
1352 | if (term->bgPixmap.pixmap |
| 1353 | && !(bg >= 0 && term->pix_colors[bg].is_opaque ())) |
1353 | && (bg == Color_transparent || bg == Color_bg |
|
|
1354 | || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) |
| 1354 | { |
1355 | { |
| 1355 | Picture dst = XftDrawPicture (d2); |
|
|
| 1356 | |
|
|
| 1357 | int src_x = x, src_y = y; |
1356 | int src_x = x, src_y = y; |
| 1358 | |
1357 | |
| 1359 | if (term->bgPixmap.is_parentOrigin ()) |
1358 | if (term->bgPixmap.is_parentOrigin ()) |
| 1360 | { |
1359 | { |
| 1361 | src_x += term->window_vt_x; |
1360 | src_x += term->window_vt_x; |
| 1362 | src_y += term->window_vt_y; |
1361 | src_y += term->window_vt_y; |
| 1363 | } |
1362 | } |
| 1364 | |
1363 | |
| 1365 | if (term->bgPixmap.pmap_width >= src_x+w |
1364 | if (term->bgPixmap.pmap_width >= src_x + w |
| 1366 | && term->bgPixmap.pmap_height >= src_y+h) |
1365 | && term->bgPixmap.pmap_height >= src_y + h) |
| 1367 | { |
1366 | { |
| 1368 | XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, |
1367 | XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, |
| 1369 | src_x, src_y, w, h, 0, 0); |
1368 | src_x, src_y, w, h, 0, 0); |
| 1370 | } |
1369 | } |
| 1371 | else |
1370 | else |
| … | |
… | |
| 1385 | |
1384 | |
| 1386 | gcv.fill_style = FillSolid; |
1385 | gcv.fill_style = FillSolid; |
| 1387 | XChangeGC (disp, gc, GCFillStyle, &gcv); |
1386 | XChangeGC (disp, gc, GCFillStyle, &gcv); |
| 1388 | } |
1387 | } |
| 1389 | |
1388 | |
| 1390 | if (bg >= 0 && dst) // colour must be (and is) non-opaque here |
1389 | if (dst) |
| 1391 | { |
1390 | { |
| 1392 | Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); |
1391 | Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); |
|
|
1392 | |
| 1393 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); |
1393 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); |
| 1394 | } |
1394 | } |
| 1395 | |
|
|
| 1396 | back_rendered = true; |
|
|
| 1397 | } |
1395 | } |
|
|
1396 | else |
| 1398 | #endif |
1397 | #endif |
| 1399 | |
|
|
| 1400 | if (!back_rendered) |
|
|
| 1401 | XftDrawRect (d2, &term->pix_colors[bg < 0 ? Color_bg : bg].c, 0, 0, w, h); |
1398 | XftDrawRect (d2, &term->pix_colors[bg < 0 ? Color_bg : bg].c, 0, 0, w, h); |
| 1402 | |
1399 | |
| 1403 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
1400 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
| 1404 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
1401 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
| 1405 | } |
1402 | } |
