| … | |
… | |
| 1685 | { |
1685 | { |
| 1686 | rvideo_state = on; |
1686 | rvideo_state = on; |
| 1687 | |
1687 | |
| 1688 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1688 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
| 1689 | #ifdef HAVE_BG_PIXMAP |
1689 | #ifdef HAVE_BG_PIXMAP |
| 1690 | if (bgPixmap.pixmap == None) |
1690 | if (bg_pixmap == None) |
| 1691 | #endif |
1691 | #endif |
| 1692 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1692 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
| 1693 | |
1693 | |
| 1694 | XGCValues gcvalue; |
1694 | XGCValues gcvalue; |
| 1695 | gcvalue.foreground = pix_colors[Color_fg]; |
1695 | gcvalue.foreground = pix_colors[Color_fg]; |
| … | |
… | |
| 2031 | refresh_count = 0; |
2031 | refresh_count = 0; |
| 2032 | |
2032 | |
| 2033 | unsigned int old_screen_flags = screen.flags; |
2033 | unsigned int old_screen_flags = screen.flags; |
| 2034 | char have_bg = 0; |
2034 | char have_bg = 0; |
| 2035 | #ifdef HAVE_BG_PIXMAP |
2035 | #ifdef HAVE_BG_PIXMAP |
| 2036 | have_bg = bgPixmap.pixmap != None; |
2036 | have_bg = bg_pixmap != None; |
| 2037 | #endif |
2037 | #endif |
| 2038 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2038 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
| 2039 | |
2039 | |
| 2040 | /* |
2040 | /* |
| 2041 | * B: reverse any characters which are selected |
2041 | * B: reverse any characters which are selected |
| … | |
… | |
| 2513 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
2513 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
| 2514 | { |
2514 | { |
| 2515 | bool transparent = false; |
2515 | bool transparent = false; |
| 2516 | |
2516 | |
| 2517 | #ifdef HAVE_BG_PIXMAP |
2517 | #ifdef HAVE_BG_PIXMAP |
| 2518 | if (bgPixmap.pixmap != None) |
2518 | if (bg_pixmap != None) |
| 2519 | { |
2519 | { |
| 2520 | # ifdef ENABLE_TRANSPARENCY |
2520 | # ifdef ENABLE_TRANSPARENCY |
| 2521 | if (bgPixmap.flags & bgPixmap_t::isTransparent) |
2521 | if (bg_flags & isTransparent) |
| 2522 | { |
2522 | { |
| 2523 | XSetWindowBackgroundPixmap (dpy, parent[0], bgPixmap.pixmap); |
2523 | XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap); |
| 2524 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
2524 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
| 2525 | |
2525 | |
| 2526 | transparent = true; |
2526 | transparent = true; |
| 2527 | } |
2527 | } |
| 2528 | else |
2528 | else |
| 2529 | # endif |
2529 | # endif |
| 2530 | { |
2530 | { |
| 2531 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2531 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
| 2532 | XSetWindowBackgroundPixmap (dpy, vt, bgPixmap.pixmap); |
2532 | XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); |
| 2533 | } |
2533 | } |
| 2534 | } |
2534 | } |
| 2535 | else |
2535 | else |
| 2536 | #endif |
2536 | #endif |
| 2537 | { |
2537 | { |
