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.424 by root, Fri Jun 29 22:10:09 2012 UTC vs.
Revision 1.427 by sf-exg, Sat Dec 29 15:59:51 2012 UTC

… …
409 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 409 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
410 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 410 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
411 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); 411 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
412 } 412 }
413 413
414 printf ("pc %p\n", prev_chunk);//D
415 chunk_free (prev_chunk, prev_chunk_size); 414 chunk_free (prev_chunk, prev_chunk_size);
416 415
417 free (tabs); 416 free (tabs);
418 tabs = (char *)rxvt_malloc (ncol); 417 tabs = (char *)rxvt_malloc (ncol);
419 418
… …
1707 if (rvideo_state != on) 1706 if (rvideo_state != on)
1708 { 1707 {
1709 rvideo_state = on; 1708 rvideo_state = on;
1710 1709
1711 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1710 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1712#ifdef HAVE_BG_PIXMAP 1711#ifdef HAVE_IMG
1713 if (bg_img == 0) 1712 if (bg_img == 0)
1714#endif 1713#endif
1715 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1714 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1716 1715
1717 XGCValues gcvalue; 1716 XGCValues gcvalue;
… …
2052 */ 2051 */
2053 refresh_count = 0; 2052 refresh_count = 0;
2054 2053
2055 unsigned int old_screen_flags = screen.flags; 2054 unsigned int old_screen_flags = screen.flags;
2056 bool have_bg = 0; 2055 bool have_bg = 0;
2057#ifdef HAVE_BG_PIXMAP 2056#ifdef HAVE_IMG
2058 have_bg = bg_img != 0; 2057 have_bg = bg_img != 0;
2059#endif 2058#endif
2060 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2059 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2061 2060
2062 /* 2061 /*
… …
2533void ecb_cold 2532void ecb_cold
2534rxvt_term::scr_recolour (bool refresh) NOTHROW 2533rxvt_term::scr_recolour (bool refresh) NOTHROW
2535{ 2534{
2536 bool transparent = false; 2535 bool transparent = false;
2537 2536
2538#ifdef HAVE_BG_PIXMAP 2537#ifdef HAVE_IMG
2539 if (bg_img != 0) 2538 if (bg_img != 0)
2540 { 2539 {
2541# if ENABLE_TRANSPARENCY 2540# if ENABLE_TRANSPARENCY
2542 if (bg_flags & BG_IS_TRANSPARENT) 2541 if (bg_flags & BG_IS_TRANSPARENT)
2543 { 2542 {
… …
2565 if (scrollBar.win) 2564 if (scrollBar.win)
2566 { 2565 {
2567 if (transparent) 2566 if (transparent)
2568 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2567 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2569 else 2568 else
2570 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2569 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2571 scrollBar.state = SB_STATE_IDLE; 2570 scrollBar.state = SB_STATE_IDLE;
2572 scrollBar.show (0); 2571 scrollBar.show (0);
2573 } 2572 }
2574 2573
2575 if (refresh) 2574 if (refresh)

Diff Legend

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