| … | |
… | |
| 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); |
| … | |
… | |
| 1307 | */ |
1304 | */ |
| 1308 | bool buffered = bg >= Color_transparent; |
1305 | bool buffered = bg >= Color_transparent; |
| 1309 | #ifdef FORCE_UNBUFFERED_XFT |
1306 | #ifdef FORCE_UNBUFFERED_XFT |
| 1310 | buffered = false; |
1307 | buffered = false; |
| 1311 | #endif |
1308 | #endif |
|
|
1309 | buffered=false;//D |
| 1312 | |
1310 | |
| 1313 | // cut trailing spaces |
1311 | // cut trailing spaces |
| 1314 | while (len && text [len - 1] == ' ') |
1312 | while (len && text [len - 1] == ' ') |
| 1315 | len--; |
1313 | len--; |
| 1316 | |
1314 | |
| … | |
… | |
| 1345 | |
1343 | |
| 1346 | if (buffered) |
1344 | if (buffered) |
| 1347 | { |
1345 | { |
| 1348 | if (ep != enc) |
1346 | if (ep != enc) |
| 1349 | { |
1347 | { |
| 1350 | 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 | Picture dst = 0; |
| 1354 | |
1352 | |
| 1355 | if (term->bgPixmap.pixmap |
1353 | if (term->bgPixmap.pixmap |
| 1356 | && !(bg >= 0 && term->pix_colors[bg].is_opaque ())) |
1354 | && (bg == Color_transparent || bg == Color_bg |
|
|
1355 | || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) |
| 1357 | { |
1356 | { |
| 1358 | Picture dst = XftDrawPicture (d2); |
|
|
| 1359 | |
|
|
| 1360 | int src_x = x, src_y = y; |
1357 | int src_x = x, src_y = y; |
| 1361 | |
1358 | |
| 1362 | if (term->bgPixmap.is_parentOrigin ()) |
1359 | if (term->bgPixmap.is_parentOrigin ()) |
| 1363 | { |
1360 | { |
| 1364 | src_x += term->window_vt_x; |
1361 | src_x += term->window_vt_x; |
| 1365 | src_y += term->window_vt_y; |
1362 | src_y += term->window_vt_y; |
| 1366 | } |
1363 | } |
| 1367 | |
1364 | |
| 1368 | if (term->bgPixmap.pmap_width >= src_x+w |
1365 | if (term->bgPixmap.pmap_width >= src_x + w |
| 1369 | && term->bgPixmap.pmap_height >= src_y+h) |
1366 | && term->bgPixmap.pmap_height >= src_y + h) |
| 1370 | { |
1367 | { |
| 1371 | XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, |
1368 | XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, |
| 1372 | src_x, src_y, w, h, 0, 0); |
1369 | src_x, src_y, w, h, 0, 0); |
| 1373 | } |
1370 | } |
| 1374 | else |
1371 | else |
| … | |
… | |
| 1388 | |
1385 | |
| 1389 | gcv.fill_style = FillSolid; |
1386 | gcv.fill_style = FillSolid; |
| 1390 | XChangeGC (disp, gc, GCFillStyle, &gcv); |
1387 | XChangeGC (disp, gc, GCFillStyle, &gcv); |
| 1391 | } |
1388 | } |
| 1392 | |
1389 | |
| 1393 | if (bg >= 0 && dst) // colour must be (and is) non-opaque here |
1390 | if (dst) |
| 1394 | { |
1391 | { |
| 1395 | Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); |
1392 | Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); |
|
|
1393 | |
| 1396 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); |
1394 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); |
| 1397 | } |
1395 | } |
| 1398 | |
|
|
| 1399 | back_rendered = true; |
|
|
| 1400 | } |
1396 | } |
|
|
1397 | else |
| 1401 | #endif |
1398 | #endif |
| 1402 | |
1399 | clear_rect (d, x, y, w, h, bg); |
| 1403 | if (!back_rendered) |
|
|
| 1404 | XftDrawRect (d2, &term->pix_colors[bg < 0 ? Color_bg : bg].c, 0, 0, w, h); |
|
|
| 1405 | |
1400 | |
| 1406 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
1401 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
| 1407 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
1402 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
| 1408 | } |
1403 | } |
| 1409 | else |
1404 | else |
