… | |
… | |
159 | * ------------------------------------------------------------------------- */ |
159 | * ------------------------------------------------------------------------- */ |
160 | |
160 | |
161 | void |
161 | void |
162 | rxvt_term::scr_reset () |
162 | rxvt_term::scr_reset () |
163 | { |
163 | { |
|
|
164 | #if ENABLE_OVERLAY |
|
|
165 | scr_overlay_off (); |
|
|
166 | #endif |
|
|
167 | |
164 | view_start = 0; |
168 | view_start = 0; |
165 | num_scr = 0; |
169 | num_scr = 0; |
166 | |
170 | |
167 | if (ncol == 0) |
171 | if (ncol == 0) |
168 | ncol = 80; |
172 | ncol = 80; |
… | |
… | |
1920 | |
1924 | |
1921 | # ifndef NO_MAPALERT |
1925 | # ifndef NO_MAPALERT |
1922 | # ifdef MAPALERT_OPTION |
1926 | # ifdef MAPALERT_OPTION |
1923 | if (option (Opt_mapAlert)) |
1927 | if (option (Opt_mapAlert)) |
1924 | # endif |
1928 | # endif |
1925 | XMapWindow (dpy, parent[0]); |
1929 | XMapWindow (dpy, parent); |
1926 | # endif |
1930 | # endif |
1927 | |
1931 | |
1928 | # if ENABLE_FRILLS |
1932 | # if ENABLE_FRILLS |
1929 | if (option (Opt_urgentOnBell)) |
1933 | if (option (Opt_urgentOnBell)) |
1930 | set_urgency (1); |
1934 | set_urgency (1); |
… | |
… | |
2516 | if (bg_pixmap != None) |
2520 | if (bg_pixmap != None) |
2517 | { |
2521 | { |
2518 | # ifdef ENABLE_TRANSPARENCY |
2522 | # ifdef ENABLE_TRANSPARENCY |
2519 | if (bg_flags & BG_IS_TRANSPARENT) |
2523 | if (bg_flags & BG_IS_TRANSPARENT) |
2520 | { |
2524 | { |
2521 | XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap); |
2525 | XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); |
2522 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
2526 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
2523 | |
2527 | |
2524 | transparent = true; |
2528 | transparent = true; |
2525 | } |
2529 | } |
2526 | else |
2530 | else |
2527 | # endif |
2531 | # endif |
2528 | { |
2532 | { |
2529 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2533 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
2530 | XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); |
2534 | XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); |
2531 | } |
2535 | } |
2532 | } |
2536 | } |
2533 | else |
2537 | else |
2534 | #endif |
2538 | #endif |
2535 | { |
2539 | { |
2536 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2540 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
2537 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2541 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2538 | } |
2542 | } |
2539 | |
2543 | |
2540 | XClearWindow (dpy, parent[0]); |
2544 | XClearWindow (dpy, parent); |
2541 | |
2545 | |
2542 | if (scrollBar.win) |
2546 | if (scrollBar.win) |
2543 | { |
2547 | { |
2544 | if (transparent) |
2548 | if (transparent) |
2545 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
2549 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |