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.423 by sf-exg, Fri Jun 29 14:01:53 2012 UTC vs.
Revision 1.429 by root, Sun Jan 13 20:11:21 2013 UTC

… …
280 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); 280 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
281 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 281 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
282 282
283 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);
284 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
285 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);
286 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;
287 } 289 }
288 290
289 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
290 int pend = MOD (term_start + top_row , prev_total_rows); 292 int pend = MOD (term_start + top_row , prev_total_rows);
291 int q = total_rows; // rewrapped row 293 int q = total_rows; // rewrapped row
… …
390 392
391 scr_blank_screen_mem (dst, DEFAULT_RSTYLE); 393 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
392 394
393 memcpy (dst.t, src.t, sizeof (text_t) * common_col); 395 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
394 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;
395 } 398 }
396 399
397 for (int row = prev_nrow; row < nrow; row++) 400 for (int row = prev_nrow; row < nrow; row++)
398 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 401 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
399 402
… …
1706 if (rvideo_state != on) 1709 if (rvideo_state != on)
1707 { 1710 {
1708 rvideo_state = on; 1711 rvideo_state = on;
1709 1712
1710 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1713 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1711#ifdef HAVE_BG_PIXMAP 1714#ifdef HAVE_IMG
1712 if (bg_img == 0) 1715 if (bg_img == 0)
1713#endif 1716#endif
1714 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1717 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1715 1718
1716 XGCValues gcvalue; 1719 XGCValues gcvalue;
… …
2051 */ 2054 */
2052 refresh_count = 0; 2055 refresh_count = 0;
2053 2056
2054 unsigned int old_screen_flags = screen.flags; 2057 unsigned int old_screen_flags = screen.flags;
2055 bool have_bg = 0; 2058 bool have_bg = 0;
2056#ifdef HAVE_BG_PIXMAP 2059#ifdef HAVE_IMG
2057 have_bg = bg_img != 0; 2060 have_bg = bg_img != 0;
2058#endif 2061#endif
2059 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2062 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2060 2063
2061 /* 2064 /*
… …
2532void ecb_cold 2535void ecb_cold
2533rxvt_term::scr_recolour (bool refresh) NOTHROW 2536rxvt_term::scr_recolour (bool refresh) NOTHROW
2534{ 2537{
2535 bool transparent = false; 2538 bool transparent = false;
2536 2539
2537#ifdef HAVE_BG_PIXMAP 2540#ifdef HAVE_IMG
2538 if (bg_img != 0) 2541 if (bg_img != 0)
2539 { 2542 {
2540# if ENABLE_TRANSPARENCY 2543# if ENABLE_TRANSPARENCY
2541 if (bg_flags & BG_IS_TRANSPARENT) 2544 if (bg_flags & BG_IS_TRANSPARENT)
2542 { 2545 {
… …
2564 if (scrollBar.win) 2567 if (scrollBar.win)
2565 { 2568 {
2566 if (transparent) 2569 if (transparent)
2567 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2570 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2568 else 2571 else
2569 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2572 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2570 scrollBar.state = SB_STATE_IDLE; 2573 scrollBar.state = SB_STATE_IDLE;
2571 scrollBar.show (0); 2574 scrollBar.show (0);
2572 } 2575 }
2573 2576
2574 if (refresh) 2577 if (refresh)

Diff Legend

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