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.427 by sf-exg, Sat Dec 29 15:59:51 2012 UTC

1706 if (rvideo_state != on) 1706 if (rvideo_state != on)
1707 { 1707 {
1708 rvideo_state = on; 1708 rvideo_state = on;
1709 1709
1710 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1710 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1711#ifdef HAVE_BG_PIXMAP 1711#ifdef HAVE_IMG
1712 if (bg_img == 0) 1712 if (bg_img == 0)
1713#endif 1713#endif
1714 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1714 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1715 1715
1716 XGCValues gcvalue; 1716 XGCValues gcvalue;
2051 */ 2051 */
2052 refresh_count = 0; 2052 refresh_count = 0;
2053 2053
2054 unsigned int old_screen_flags = screen.flags; 2054 unsigned int old_screen_flags = screen.flags;
2055 bool have_bg = 0; 2055 bool have_bg = 0;
2056#ifdef HAVE_BG_PIXMAP 2056#ifdef HAVE_IMG
2057 have_bg = bg_img != 0; 2057 have_bg = bg_img != 0;
2058#endif 2058#endif
2059 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2059 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2060 2060
2061 /* 2061 /*
2532void ecb_cold 2532void ecb_cold
2533rxvt_term::scr_recolour (bool refresh) NOTHROW 2533rxvt_term::scr_recolour (bool refresh) NOTHROW
2534{ 2534{
2535 bool transparent = false; 2535 bool transparent = false;
2536 2536
2537#ifdef HAVE_BG_PIXMAP 2537#ifdef HAVE_IMG
2538 if (bg_img != 0) 2538 if (bg_img != 0)
2539 { 2539 {
2540# if ENABLE_TRANSPARENCY 2540# if ENABLE_TRANSPARENCY
2541 if (bg_flags & BG_IS_TRANSPARENT) 2541 if (bg_flags & BG_IS_TRANSPARENT)
2542 { 2542 {
2564 if (scrollBar.win) 2564 if (scrollBar.win)
2565 { 2565 {
2566 if (transparent) 2566 if (transparent)
2567 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2567 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2568 else 2568 else
2569 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2569 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2570 scrollBar.state = SB_STATE_IDLE; 2570 scrollBar.state = SB_STATE_IDLE;
2571 scrollBar.show (0); 2571 scrollBar.show (0);
2572 } 2572 }
2573 2573
2574 if (refresh) 2574 if (refresh)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines