| … | |
… | |
| 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 | } |
| … | |
… | |
| 1300 | |
1303 | |
| 1301 | /* |
1304 | /* |
| 1302 | * Maybe make buffering into a resource flag? Compile time option doesn't seems like a |
1305 | * Maybe make buffering into a resource flag? Compile time option doesn't seems like a |
| 1303 | * good idea from the perspective of packaging for wide variety of user configs. |
1306 | * good idea from the perspective of packaging for wide variety of user configs. |
| 1304 | */ |
1307 | */ |
| 1305 | bool buffered = bg >= 0; |
1308 | bool buffered = bg >= Color_transparent; |
| 1306 | #ifdef FORCE_UNBUFFERED_XFT |
1309 | #ifdef FORCE_UNBUFFERED_XFT |
| 1307 | buffered = false; |
1310 | buffered = false; |
| 1308 | #endif |
1311 | #endif |
| 1309 | |
1312 | |
| 1310 | // cut trailing spaces |
1313 | // cut trailing spaces |
| … | |
… | |
| 1350 | #ifdef HAVE_BG_PIXMAP |
1353 | #ifdef HAVE_BG_PIXMAP |
| 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].c.color.alpha < 0xff00) |
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 (bg < 0 || dst != 0) |
1363 | if (dst) |
| 1359 | { |
1364 | { |
| 1360 | int src_x = x, src_y = y ; |
1365 | int src_x = x, src_y = y; |
| 1361 | |
1366 | |
| 1362 | if (term->bgPixmap.is_parentOrigin ()) |
1367 | if (term->bgPixmap.is_parentOrigin ()) |
| 1363 | { |
1368 | { |
| 1364 | src_x += term->window_vt_x; |
1369 | src_x += term->window_vt_x; |
| 1365 | src_y += term->window_vt_y; |
1370 | src_y += term->window_vt_y; |
| … | |
… | |
| 1388 | |
1393 | |
| 1389 | gcv.fill_style = FillSolid; |
1394 | gcv.fill_style = FillSolid; |
| 1390 | XChangeGC (disp, gc, GCFillStyle, &gcv); |
1395 | XChangeGC (disp, gc, GCFillStyle, &gcv); |
| 1391 | } |
1396 | } |
| 1392 | |
1397 | |
|
|
1398 | if (bg >= 0) |
|
|
1399 | { |
| 1393 | Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); |
1400 | Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c); |
| 1394 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); |
1401 | XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h); |
|
|
1402 | } |
| 1395 | |
1403 | |
| 1396 | back_rendered = true; |
1404 | back_rendered = true; |
| 1397 | } |
1405 | } |
| 1398 | } |
1406 | } |
| 1399 | #endif |
1407 | #endif |
| 1400 | |
1408 | |
| 1401 | if (!back_rendered) |
1409 | if (!back_rendered) |
| 1402 | 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); |
| 1403 | |
1411 | |
| 1404 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
1412 | XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc); |
| 1405 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
1413 | XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y); |
| 1406 | } |
1414 | } |
| 1407 | else |
1415 | else |
