… | |
… | |
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 | |
… | |
… | |
967 | } |
967 | } |
968 | |
968 | |
969 | bool |
969 | bool |
970 | rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
970 | rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const |
971 | { |
971 | { |
|
|
972 | careful = false; |
|
|
973 | |
972 | uint32_t ch = FROM_UNICODE (cs, unicode); |
974 | uint32_t ch = FROM_UNICODE (cs, unicode); |
973 | |
975 | |
974 | if (ch == NOCHAR) |
976 | if (ch == NOCHAR) |
975 | return false; |
977 | return false; |
976 | |
978 | |
… | |
… | |
1406 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1408 | rxvt_drawable &d2 = d.screen->scratch_drawable (w, h); |
1407 | |
1409 | |
1408 | #ifdef HAVE_BG_PIXMAP |
1410 | #ifdef HAVE_BG_PIXMAP |
1409 | Picture dst = 0; // the only assignment is done conditionally in the following if condition |
1411 | Picture dst = 0; // the only assignment is done conditionally in the following if condition |
1410 | |
1412 | |
1411 | if (term->bgPixmap.pixmap |
1413 | if (term->bg_pixmap |
1412 | && (bg == Color_transparent || bg == Color_bg |
1414 | && (bg == Color_transparent || bg == Color_bg |
1413 | || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) |
1415 | || (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2)))))) |
1414 | { |
1416 | { |
1415 | int src_x = x, src_y = y; |
1417 | int src_x = x, src_y = y; |
1416 | |
1418 | |
1417 | if (term->bgPixmap.flags & bgPixmap_t::isTransparent) |
1419 | if (term->bg_flags & rxvt_term::BG_IS_TRANSPARENT) |
1418 | { |
1420 | { |
1419 | src_x += term->window_vt_x; |
1421 | src_x += term->window_vt_x; |
1420 | src_y += term->window_vt_y; |
1422 | src_y += term->window_vt_y; |
1421 | } |
1423 | } |
1422 | |
1424 | |
1423 | if (term->bgPixmap.pmap_width >= src_x + w |
1425 | if (term->bg_pmap_width >= src_x + w |
1424 | && term->bgPixmap.pmap_height >= src_y + h) |
1426 | && term->bg_pmap_height >= src_y + h) |
1425 | { |
1427 | { |
1426 | XCopyArea (disp, term->bgPixmap.pixmap, d2, gc, |
1428 | XCopyArea (disp, term->bg_pixmap, d2, gc, |
1427 | src_x, src_y, w, h, 0, 0); |
1429 | src_x, src_y, w, h, 0, 0); |
1428 | } |
1430 | } |
1429 | else |
1431 | else |
1430 | { |
1432 | { |
1431 | XGCValues gcv; |
1433 | XGCValues gcv; |
1432 | |
1434 | |
1433 | gcv.fill_style = FillTiled; |
1435 | gcv.fill_style = FillTiled; |
1434 | gcv.tile = term->bgPixmap.pixmap; |
1436 | gcv.tile = term->bg_pixmap; |
1435 | gcv.ts_x_origin = -src_x; |
1437 | gcv.ts_x_origin = -src_x; |
1436 | gcv.ts_y_origin = -src_y; |
1438 | gcv.ts_y_origin = -src_y; |
1437 | |
1439 | |
1438 | XChangeGC (disp, gc, |
1440 | XChangeGC (disp, gc, |
1439 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |
1441 | GCTile | GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle, |