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