| … | |
… | |
| 241 | { |
241 | { |
| 242 | #if XFT |
242 | #if XFT |
| 243 | Picture dst; |
243 | Picture dst; |
| 244 | |
244 | |
| 245 | # ifdef HAVE_BG_PIXMAP |
245 | # ifdef HAVE_BG_PIXMAP |
| 246 | if (term->bgPixmap.pixmap |
246 | if (term->bg_pixmap |
| 247 | && !term->pix_colors[color].is_opaque () |
247 | && !term->pix_colors[color].is_opaque () |
| 248 | && ((dst = XftDrawPicture (d)))) |
248 | && ((dst = XftDrawPicture (d)))) |
| 249 | { |
249 | { |
| 250 | XClearArea (disp, d, x, y, w, h, false); |
250 | XClearArea (disp, d, x, y, w, h, false); |
| 251 | |
251 | |
| … | |
… | |
| 1406 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1406 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
| 1407 | |
1407 | |
| 1408 | #ifdef HAVE_BG_PIXMAP |
1408 | #ifdef HAVE_BG_PIXMAP |
| 1409 | Picture dst = 0; // the only assignment is done conditionally in the following if condition |
1409 | Picture dst = 0; // the only assignment is done conditionally in the following if condition |
| 1410 | |
1410 | |
| 1411 | if (term->bgPixmap.pixmap |
1411 | if (term->bg_pixmap |
| 1412 | && (bg == Color_transparent || bg == Color_bg |
1412 | && (bg == Color_transparent || bg == Color_bg |
| 1413 | || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) |
1413 | || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) |
| 1414 | { |
1414 | { |
| 1415 | int src_x = x, src_y = y; |
1415 | int src_x = x, src_y = y; |
| 1416 | |
1416 | |
| 1417 | if (term->bgPixmap.flags & bgPixmap_t::isTransparent) |
1417 | if (term->bg_flags & rxvt_term::isTransparent) |
| 1418 | { |
1418 | { |
| 1419 | src_x += term->window_vt_x; |
1419 | src_x += term->window_vt_x; |
| 1420 | src_y += term->window_vt_y; |
1420 | src_y += term->window_vt_y; |
| 1421 | } |
1421 | } |
| 1422 | |
1422 | |
| 1423 | if (term->bgPixmap.pmap_width >= src_x + w |
1423 | if (term->bg_pmap_width >= src_x + w |
| 1424 | && term->bgPixmap.pmap_height >= src_y + h) |
1424 | && term->bg_pmap_height >= src_y + h) |
| 1425 | { |
1425 | { |
| 1426 | XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, |
1426 | XCopyArea (disp, term->bg_pixmap, d2, gc, |
| 1427 | src_x, src_y, w, h, 0, 0); |
1427 | src_x, src_y, w, h, 0, 0); |
| 1428 | } |
1428 | } |
| 1429 | else |
1429 | else |
| 1430 | { |
1430 | { |
| 1431 | XGCValues gcv; |
1431 | XGCValues gcv; |
| 1432 | |
1432 | |
| 1433 | gcv.fill_style = FillTiled; |
1433 | gcv.fill_style = FillTiled; |
| 1434 | gcv.tile = term->bgPixmap.pixmap; |
1434 | gcv.tile = term->bg_pixmap; |
| 1435 | gcv.ts_x_origin = -src_x; |
1435 | gcv.ts_x_origin = -src_x; |
| 1436 | gcv.ts_y_origin = -src_y; |
1436 | gcv.ts_y_origin = -src_y; |
| 1437 | |
1437 | |
| 1438 | XChangeGC (disp, gc, |
1438 | XChangeGC (disp, gc, |
| 1439 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
1439 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
