… | |
… | |
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 | } |
… | |
… | |
1351 | if (term->bgPixmap.pixmap) |
1354 | if (term->bgPixmap.pixmap) |
1352 | { |
1355 | { |
1353 | Picture dst = 0; |
1356 | Picture dst = 0; |
1354 | |
1357 | |
1355 | if (bg >= 0 && term->pix_colors[bg].is_opaque ()) |
1358 | if (bg >= 0 && term->pix_colors[bg].is_opaque ()) |
|
|
1359 | XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); |
|
|
1360 | else |
1356 | dst = XftDrawPicture (d2); |
1361 | dst = XftDrawPicture (d2); |
1357 | |
1362 | |
1358 | if (dst) |
1363 | if (dst) |
1359 | { |
1364 | { |
1360 | int src_x = x, src_y = y; |
1365 | int src_x = x, src_y = y; |
… | |
… | |
1399 | back_rendered = true; |
1404 | back_rendered = true; |
1400 | } |
1405 | } |
1401 | } |
1406 | } |
1402 | #endif |
1407 | #endif |
1403 | |
1408 | |
1404 | if (bg >= 0 && !back_rendered) |
1409 | if (!back_rendered) |
1405 | XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h); |
1410 | XftDrawRect (d2, &term->pix_colors[bg < 0 ? Color_bg : bg].c, 0, 0, w, h); |
1406 | |
1411 | |
1407 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
1412 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
1408 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
1413 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
1409 | } |
1414 | } |
1410 | else |
1415 | else |