ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.422 by root, Thu Jun 28 15:19:15 2012 UTC vs.
Revision 1.430 by root, Sun Jan 13 20:16:40 2013 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines