| … | |
… | |
| 236 | if (color == Color_bg || color == Color_transparent) |
236 | if (color == Color_bg || color == Color_transparent) |
| 237 | XClearArea (disp, d, x, y, w, h, false); |
237 | XClearArea (disp, d, x, y, w, h, false); |
| 238 | else if (color >= 0) |
238 | else if (color >= 0) |
| 239 | { |
239 | { |
| 240 | #if XFT |
240 | #if XFT |
| 241 | bool done = false; |
241 | Picture dst; |
| 242 | |
242 | |
| 243 | # ifdef HAVE_BG_PIXMAP |
243 | # ifdef HAVE_BG_PIXMAP |
| 244 | if (term->bgPixmap.pixmap && color >= 0 && !term->pix_colors[color].is_opaque ()) |
244 | if (term->bgPixmap.pixmap |
| 245 | { |
245 | && !term->pix_colors[color].is_opaque () |
| 246 | Picture dst = XftDrawPicture (d); |
246 | && ((dst = XftDrawPicture (d)))) |
| 247 | |
|
|
| 248 | if (dst != 0) |
|
|
| 249 | { |
247 | { |
| 250 | XClearArea (disp, d, x, y, w, h, false); |
248 | XClearArea (disp, d, x, y, w, h, false); |
|
|
249 | |
| 251 | Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c); |
250 | Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c); |
| 252 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h); |
251 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h); |
| 253 | done = true; |
|
|
| 254 | } |
252 | } |
| 255 | } |
253 | else |
| 256 | # endif |
254 | # endif |
| 257 | if (!done) |
|
|
| 258 | XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); |
255 | XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h); |
| 259 | |
256 | |
| 260 | #else |
257 | #else |
| 261 | XSetForeground (disp, gc, term->pix_colors[color]); |
258 | XSetForeground (disp, gc, term->pix_colors[color]); |
| 262 | XFillRectangle (disp, d, gc, x, y, w, h); |
259 | XFillRectangle (disp, d, gc, x, y, w, h); |
| … | |
… | |
| 1349 | { |
1346 | { |
| 1350 | bool back_rendered = false; |
1347 | bool back_rendered = false; |
| 1351 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1348 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
| 1352 | |
1349 | |
| 1353 | #ifdef HAVE_BG_PIXMAP |
1350 | #ifdef HAVE_BG_PIXMAP |
|
|
1351 | |
| 1354 | if (term->bgPixmap.pixmap) |
1352 | if (term->bgPixmap.pixmap |
|
|
1353 | && !(bg >= 0 && term->pix_colors[bg].is_opaque ())) |
| 1355 | { |
1354 | { |
| 1356 | Picture dst = 0; |
1355 | Picture dst = XftDrawPicture (d2); |
| 1357 | |
1356 | |
| 1358 | if (bg >= 0 && term->pix_colors[bg].is_opaque ()) |
1357 | int src_x = x, src_y = y; |
| 1359 | XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); |
1358 | |
|
|
1359 | if (term->bgPixmap.is_parentOrigin ()) |
|
|
1360 | { |
|
|
1361 | src_x += term->window_vt_x; |
|
|
1362 | src_y += term->window_vt_y; |
|
|
1363 | } |
|
|
1364 | |
|
|
1365 | if (term->bgPixmap.pmap_width >= src_x+w |
|
|
1366 | && term->bgPixmap.pmap_height >= src_y+h) |
|
|
1367 | { |
|
|
1368 | XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, |
|
|
1369 | src_x, src_y, w, h, 0, 0); |
|
|
1370 | } |
| 1360 | else |
1371 | else |
| 1361 | dst = XftDrawPicture (d2); |
|
|
| 1362 | |
|
|
| 1363 | if (dst) |
|
|
| 1364 | { |
1372 | { |
| 1365 | int src_x = x, src_y = y; |
|
|
| 1366 | |
|
|
| 1367 | if (term->bgPixmap.is_parentOrigin ()) |
|
|
| 1368 | { |
|
|
| 1369 | src_x += term->window_vt_x; |
|
|
| 1370 | src_y += term->window_vt_y; |
|
|
| 1371 | } |
|
|
| 1372 | |
|
|
| 1373 | if (term->bgPixmap.pmap_width >= src_x+w |
|
|
| 1374 | && term->bgPixmap.pmap_height >= src_y+h) |
|
|
| 1375 | { |
|
|
| 1376 | XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, |
|
|
| 1377 | src_x, src_y, w, h, 0, 0); |
|
|
| 1378 | } |
|
|
| 1379 | else |
|
|
| 1380 | { |
|
|
| 1381 | XGCValues gcv; |
1373 | XGCValues gcv; |
| 1382 | |
1374 | |
| 1383 | gcv.fill_style = FillTiled; |
1375 | gcv.fill_style = FillTiled; |
| 1384 | gcv.tile = term->bgPixmap.pixmap; |
1376 | gcv.tile = term->bgPixmap.pixmap; |
| 1385 | gcv.ts_x_origin = -src_x; |
1377 | gcv.ts_x_origin = -src_x; |
| 1386 | gcv.ts_y_origin = -src_y; |
1378 | gcv.ts_y_origin = -src_y; |
| 1387 | |
1379 | |
| 1388 | XChangeGC (disp, gc, |
1380 | XChangeGC (disp, gc, |
| 1389 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
1381 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
| 1390 | &gcv); |
1382 | &gcv); |
| 1391 | |
1383 | |
| 1392 | XFillRectangle (disp, d2, gc, 0, 0, w, h); |
1384 | XFillRectangle (disp, d2, gc, 0, 0, w, h); |
| 1393 | |
1385 | |
| 1394 | gcv.fill_style = FillSolid; |
1386 | gcv.fill_style = FillSolid; |
| 1395 | XChangeGC (disp, gc, GCFillStyle, &gcv); |
1387 | XChangeGC (disp, gc, GCFillStyle, &gcv); |
| 1396 | } |
|
|
| 1397 | |
|
|
| 1398 | if (bg >= 0) |
|
|
| 1399 | { |
|
|
| 1400 | Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); |
|
|
| 1401 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); |
|
|
| 1402 | } |
|
|
| 1403 | |
|
|
| 1404 | back_rendered = true; |
|
|
| 1405 | } |
1388 | } |
|
|
1389 | |
|
|
1390 | if (bg >= 0 && dst) // colour must be (and is) non-opaque here |
|
|
1391 | { |
|
|
1392 | Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); |
|
|
1393 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); |
|
|
1394 | } |
|
|
1395 | |
|
|
1396 | back_rendered = true; |
| 1406 | } |
1397 | } |
| 1407 | #endif |
1398 | #endif |
| 1408 | |
1399 | |
| 1409 | if (!back_rendered) |
1400 | if (!back_rendered) |
| 1410 | XftDrawRect (d2, &term->pix_colors[bg < 0 ? Color_bg : bg].c, 0, 0, w, h); |
1401 | XftDrawRect (d2, &term->pix_colors[bg < 0 ? Color_bg : bg].c, 0, 0, w, h); |
