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