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.426 by sf-exg, Tue Oct 2 10:29:12 2012 UTC vs.
Revision 1.430 by root, Sun Jan 13 20:16:40 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 = min (prev_swap_buf [row].l, ncol);
289 swap_buf [row].f = prev_swap_buf [row].f;
287 } 290 }
288 291
289 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
290 int pend = MOD (term_start + top_row , prev_total_rows); 293 int pend = MOD (term_start + top_row , prev_total_rows);
291 int q = total_rows; // rewrapped row 294 int q = total_rows; // rewrapped row
… …
390 393
391 scr_blank_screen_mem (dst, DEFAULT_RSTYLE); 394 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
392 395
393 memcpy (dst.t, src.t, sizeof (text_t) * common_col); 396 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
394 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;
395 } 399 }
396 400
397 for (int row = prev_nrow; row < nrow; row++) 401 for (int row = prev_nrow; row < nrow; row++)
398 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 402 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
399 403
… …
1706 if (rvideo_state != on) 1710 if (rvideo_state != on)
1707 { 1711 {
1708 rvideo_state = on; 1712 rvideo_state = on;
1709 1713
1710 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1714 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1711#ifdef HAVE_BG_PIXMAP 1715#ifdef HAVE_IMG
1712 if (bg_img == 0) 1716 if (bg_img == 0)
1713#endif 1717#endif
1714 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1718 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1715 1719
1716 XGCValues gcvalue; 1720 XGCValues gcvalue;
… …
2051 */ 2055 */
2052 refresh_count = 0; 2056 refresh_count = 0;
2053 2057
2054 unsigned int old_screen_flags = screen.flags; 2058 unsigned int old_screen_flags = screen.flags;
2055 bool have_bg = 0; 2059 bool have_bg = 0;
2056#ifdef HAVE_BG_PIXMAP 2060#ifdef HAVE_IMG
2057 have_bg = bg_img != 0; 2061 have_bg = bg_img != 0;
2058#endif 2062#endif
2059 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2063 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2060 2064
2061 /* 2065 /*
… …
2532void ecb_cold 2536void ecb_cold
2533rxvt_term::scr_recolour (bool refresh) NOTHROW 2537rxvt_term::scr_recolour (bool refresh) NOTHROW
2534{ 2538{
2535 bool transparent = false; 2539 bool transparent = false;
2536 2540
2537#ifdef HAVE_BG_PIXMAP 2541#ifdef HAVE_IMG
2538 if (bg_img != 0) 2542 if (bg_img != 0)
2539 { 2543 {
2540# if ENABLE_TRANSPARENCY 2544# if ENABLE_TRANSPARENCY
2541 if (bg_flags & BG_IS_TRANSPARENT) 2545 if (bg_flags & BG_IS_TRANSPARENT)
2542 { 2546 {

Diff Legend

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