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.425 by root, Fri Jun 29 22:10:18 2012 UTC vs.
Revision 1.428 by sf-exg, Sun Jan 13 17:42:24 2013 UTC

… …
390 390
391 scr_blank_screen_mem (dst, DEFAULT_RSTYLE); 391 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
392 392
393 memcpy (dst.t, src.t, sizeof (text_t) * common_col); 393 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
394 memcpy (dst.r, src.r, sizeof (rend_t) * common_col); 394 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
395 dst.l = common_col;
395 } 396 }
396 397
397 for (int row = prev_nrow; row < nrow; row++) 398 for (int row = prev_nrow; row < nrow; row++)
398 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 399 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
399 400
… …
1706 if (rvideo_state != on) 1707 if (rvideo_state != on)
1707 { 1708 {
1708 rvideo_state = on; 1709 rvideo_state = on;
1709 1710
1710 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1711 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1711#ifdef HAVE_BG_PIXMAP 1712#ifdef HAVE_IMG
1712 if (bg_img == 0) 1713 if (bg_img == 0)
1713#endif 1714#endif
1714 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1715 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1715 1716
1716 XGCValues gcvalue; 1717 XGCValues gcvalue;
… …
2051 */ 2052 */
2052 refresh_count = 0; 2053 refresh_count = 0;
2053 2054
2054 unsigned int old_screen_flags = screen.flags; 2055 unsigned int old_screen_flags = screen.flags;
2055 bool have_bg = 0; 2056 bool have_bg = 0;
2056#ifdef HAVE_BG_PIXMAP 2057#ifdef HAVE_IMG
2057 have_bg = bg_img != 0; 2058 have_bg = bg_img != 0;
2058#endif 2059#endif
2059 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2060 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2060 2061
2061 /* 2062 /*
… …
2532void ecb_cold 2533void ecb_cold
2533rxvt_term::scr_recolour (bool refresh) NOTHROW 2534rxvt_term::scr_recolour (bool refresh) NOTHROW
2534{ 2535{
2535 bool transparent = false; 2536 bool transparent = false;
2536 2537
2537#ifdef HAVE_BG_PIXMAP 2538#ifdef HAVE_IMG
2538 if (bg_img != 0) 2539 if (bg_img != 0)
2539 { 2540 {
2540# if ENABLE_TRANSPARENCY 2541# if ENABLE_TRANSPARENCY
2541 if (bg_flags & BG_IS_TRANSPARENT) 2542 if (bg_flags & BG_IS_TRANSPARENT)
2542 { 2543 {
… …
2564 if (scrollBar.win) 2565 if (scrollBar.win)
2565 { 2566 {
2566 if (transparent) 2567 if (transparent)
2567 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2568 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2568 else 2569 else
2569 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2570 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2570 scrollBar.state = SB_STATE_IDLE; 2571 scrollBar.state = SB_STATE_IDLE;
2571 scrollBar.show (0); 2572 scrollBar.show (0);
2572 } 2573 }
2573 2574
2574 if (refresh) 2575 if (refresh)

Diff Legend

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