… | |
… | |
225 | |
225 | |
226 | screen.tscroll = 0; |
226 | screen.tscroll = 0; |
227 | screen.bscroll = nrow - 1; |
227 | screen.bscroll = nrow - 1; |
228 | |
228 | |
229 | void *prev_chunk = chunk; |
229 | void *prev_chunk = chunk; |
|
|
230 | size_t prev_chunk_size = chunk_size; |
230 | line_t *prev_drawn_buf = drawn_buf; |
231 | line_t *prev_drawn_buf = drawn_buf; |
231 | line_t *prev_swap_buf = swap_buf; |
232 | line_t *prev_swap_buf = swap_buf; |
232 | line_t *prev_row_buf = row_buf; |
233 | line_t *prev_row_buf = row_buf; |
233 | |
234 | |
234 | int common_col = min (prev_ncol, ncol); |
235 | int common_col = min (prev_ncol, ncol); |
… | |
… | |
279 | scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); |
280 | scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); |
280 | scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
281 | scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
281 | |
282 | |
282 | memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col); |
283 | memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col); |
283 | memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col); |
284 | memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col); |
|
|
285 | |
284 | memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col); |
286 | memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col); |
285 | memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col); |
287 | memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col); |
|
|
288 | swap_buf [row].l = prev_swap_buf [row].l; |
286 | } |
289 | } |
287 | |
290 | |
288 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
291 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
289 | int pend = MOD (term_start + top_row , prev_total_rows); |
292 | int pend = MOD (term_start + top_row , prev_total_rows); |
290 | int q = total_rows; // rewrapped row |
293 | int q = total_rows; // rewrapped row |
… | |
… | |
389 | |
392 | |
390 | scr_blank_screen_mem (dst, DEFAULT_RSTYLE); |
393 | scr_blank_screen_mem (dst, DEFAULT_RSTYLE); |
391 | |
394 | |
392 | memcpy (dst.t, src.t, sizeof (text_t) * common_col); |
395 | memcpy (dst.t, src.t, sizeof (text_t) * common_col); |
393 | memcpy (dst.r, src.r, sizeof (rend_t) * common_col); |
396 | memcpy (dst.r, src.r, sizeof (rend_t) * common_col); |
|
|
397 | dst.l = common_col; |
394 | } |
398 | } |
395 | |
399 | |
396 | for (int row = prev_nrow; row < nrow; row++) |
400 | for (int row = prev_nrow; row < nrow; row++) |
397 | scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); |
401 | scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); |
398 | |
402 | |
… | |
… | |
408 | if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); |
412 | if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); |
409 | if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
413 | if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
410 | if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); |
414 | if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); |
411 | } |
415 | } |
412 | |
416 | |
413 | free (prev_chunk); |
417 | chunk_free (prev_chunk, prev_chunk_size); |
414 | |
418 | |
415 | free (tabs); |
419 | free (tabs); |
416 | tabs = (char *)rxvt_malloc (ncol); |
420 | tabs = (char *)rxvt_malloc (ncol); |
417 | |
421 | |
418 | for (int col = ncol; col--; ) |
422 | for (int col = ncol; col--; ) |
… | |
… | |
1705 | if (rvideo_state != on) |
1709 | if (rvideo_state != on) |
1706 | { |
1710 | { |
1707 | rvideo_state = on; |
1711 | rvideo_state = on; |
1708 | |
1712 | |
1709 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1713 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1710 | #ifdef HAVE_BG_PIXMAP |
1714 | #ifdef HAVE_IMG |
1711 | if (bg_img == 0) |
1715 | if (bg_img == 0) |
1712 | #endif |
1716 | #endif |
1713 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1717 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1714 | |
1718 | |
1715 | XGCValues gcvalue; |
1719 | XGCValues gcvalue; |
… | |
… | |
2050 | */ |
2054 | */ |
2051 | refresh_count = 0; |
2055 | refresh_count = 0; |
2052 | |
2056 | |
2053 | unsigned int old_screen_flags = screen.flags; |
2057 | unsigned int old_screen_flags = screen.flags; |
2054 | bool have_bg = 0; |
2058 | bool have_bg = 0; |
2055 | #ifdef HAVE_BG_PIXMAP |
2059 | #ifdef HAVE_IMG |
2056 | have_bg = bg_img != 0; |
2060 | have_bg = bg_img != 0; |
2057 | #endif |
2061 | #endif |
2058 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2062 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2059 | |
2063 | |
2060 | /* |
2064 | /* |
… | |
… | |
2531 | void ecb_cold |
2535 | void ecb_cold |
2532 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
2536 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
2533 | { |
2537 | { |
2534 | bool transparent = false; |
2538 | bool transparent = false; |
2535 | |
2539 | |
2536 | #ifdef HAVE_BG_PIXMAP |
2540 | #ifdef HAVE_IMG |
2537 | if (bg_img != 0) |
2541 | if (bg_img != 0) |
2538 | { |
2542 | { |
2539 | # if ENABLE_TRANSPARENCY |
2543 | # if ENABLE_TRANSPARENCY |
2540 | if (bg_flags & BG_IS_TRANSPARENT) |
2544 | if (bg_flags & BG_IS_TRANSPARENT) |
2541 | { |
2545 | { |
… | |
… | |
2563 | if (scrollBar.win) |
2567 | if (scrollBar.win) |
2564 | { |
2568 | { |
2565 | if (transparent) |
2569 | if (transparent) |
2566 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
2570 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
2567 | else |
2571 | else |
2568 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2572 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]); |
2569 | scrollBar.state = SB_STATE_IDLE; |
2573 | scrollBar.state = SB_STATE_IDLE; |
2570 | scrollBar.show (0); |
2574 | scrollBar.show (0); |
2571 | } |
2575 | } |
2572 | |
2576 | |
2573 | if (refresh) |
2577 | if (refresh) |