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.431 by root, Sun Jan 13 20:19:24 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 = min (src.l, ncol);
399 dst.f = src.f;
395 } 400 }
396 401
397 for (int row = prev_nrow; row < nrow; row++) 402 for (int row = prev_nrow; row < nrow; row++)
398 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 403 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
399 404
… …
1706 if (rvideo_state != on) 1711 if (rvideo_state != on)
1707 { 1712 {
1708 rvideo_state = on; 1713 rvideo_state = on;
1709 1714
1710 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1715 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1711#ifdef HAVE_BG_PIXMAP 1716#ifdef HAVE_IMG
1712 if (bg_img == 0) 1717 if (bg_img == 0)
1713#endif 1718#endif
1714 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1719 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1715 1720
1716 XGCValues gcvalue; 1721 XGCValues gcvalue;
… …
2051 */ 2056 */
2052 refresh_count = 0; 2057 refresh_count = 0;
2053 2058
2054 unsigned int old_screen_flags = screen.flags; 2059 unsigned int old_screen_flags = screen.flags;
2055 bool have_bg = 0; 2060 bool have_bg = 0;
2056#ifdef HAVE_BG_PIXMAP 2061#ifdef HAVE_IMG
2057 have_bg = bg_img != 0; 2062 have_bg = bg_img != 0;
2058#endif 2063#endif
2059 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2064 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2060 2065
2061 /* 2066 /*
… …
2532void ecb_cold 2537void ecb_cold
2533rxvt_term::scr_recolour (bool refresh) NOTHROW 2538rxvt_term::scr_recolour (bool refresh) NOTHROW
2534{ 2539{
2535 bool transparent = false; 2540 bool transparent = false;
2536 2541
2537#ifdef HAVE_BG_PIXMAP 2542#ifdef HAVE_IMG
2538 if (bg_img != 0) 2543 if (bg_img != 0)
2539 { 2544 {
2540# if ENABLE_TRANSPARENCY 2545# if ENABLE_TRANSPARENCY
2541 if (bg_flags & BG_IS_TRANSPARENT) 2546 if (bg_flags & BG_IS_TRANSPARENT)
2542 { 2547 {
… …
2564 if (scrollBar.win) 2569 if (scrollBar.win)
2565 { 2570 {
2566 if (transparent) 2571 if (transparent)
2567 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2572 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2568 else 2573 else
2569 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2574 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2570 scrollBar.state = SB_STATE_IDLE; 2575 scrollBar.state = SB_STATE_IDLE;
2571 scrollBar.show (0); 2576 scrollBar.show (0);
2572 } 2577 }
2573 2578
2574 if (refresh) 2579 if (refresh)

Diff Legend

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