| … | |
… | |
| 1702 | { |
1702 | { |
| 1703 | rvideo_state = on; |
1703 | rvideo_state = on; |
| 1704 | |
1704 | |
| 1705 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1705 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
| 1706 | #ifdef HAVE_BG_PIXMAP |
1706 | #ifdef HAVE_BG_PIXMAP |
| 1707 | if (bg_pixmap == None) |
1707 | if (bg_img == 0) |
| 1708 | #endif |
1708 | #endif |
| 1709 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1709 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
| 1710 | |
1710 | |
| 1711 | XGCValues gcvalue; |
1711 | XGCValues gcvalue; |
| 1712 | gcvalue.foreground = pix_colors[Color_fg]; |
1712 | gcvalue.foreground = pix_colors[Color_fg]; |
| … | |
… | |
| 2047 | refresh_count = 0; |
2047 | refresh_count = 0; |
| 2048 | |
2048 | |
| 2049 | unsigned int old_screen_flags = screen.flags; |
2049 | unsigned int old_screen_flags = screen.flags; |
| 2050 | bool have_bg = 0; |
2050 | bool have_bg = 0; |
| 2051 | #ifdef HAVE_BG_PIXMAP |
2051 | #ifdef HAVE_BG_PIXMAP |
| 2052 | have_bg = bg_pixmap != None; |
2052 | have_bg = bg_img != 0; |
| 2053 | #endif |
2053 | #endif |
| 2054 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2054 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
| 2055 | |
2055 | |
| 2056 | /* |
2056 | /* |
| 2057 | * B: reverse any characters which are selected |
2057 | * B: reverse any characters which are selected |
| … | |
… | |
| 2528 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
2528 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
| 2529 | { |
2529 | { |
| 2530 | bool transparent = false; |
2530 | bool transparent = false; |
| 2531 | |
2531 | |
| 2532 | #ifdef HAVE_BG_PIXMAP |
2532 | #ifdef HAVE_BG_PIXMAP |
| 2533 | if (bg_pixmap != None) |
2533 | if (bg_img != 0) |
| 2534 | { |
2534 | { |
| 2535 | # if ENABLE_TRANSPARENCY |
2535 | # if ENABLE_TRANSPARENCY |
| 2536 | if (bg_flags & BG_IS_TRANSPARENT) |
2536 | if (bg_flags & BG_IS_TRANSPARENT) |
| 2537 | { |
2537 | { |
| 2538 | XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); |
2538 | XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm); |
| 2539 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
2539 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
| 2540 | |
2540 | |
| 2541 | transparent = true; |
2541 | transparent = true; |
| 2542 | } |
2542 | } |
| 2543 | else |
2543 | else |
| 2544 | # endif |
2544 | # endif |
| 2545 | { |
2545 | { |
| 2546 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
2546 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
| 2547 | XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); |
2547 | XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm); |
| 2548 | } |
2548 | } |
| 2549 | } |
2549 | } |
| 2550 | else |
2550 | else |
| 2551 | #endif |
2551 | #endif |
| 2552 | { |
2552 | { |
