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.268 by root, Tue May 1 21:30:01 2007 UTC vs.
Revision 1.272 by root, Fri Aug 10 23:52:12 2007 UTC

… …
161{ 161{
162#if ENABLE_OVERLAY 162#if ENABLE_OVERLAY
163 scr_overlay_off (); 163 scr_overlay_off ();
164#endif 164#endif
165 165
166 rvideo_mode = false;
166 view_start = 0; 167 view_start = 0;
167 num_scr = 0; 168 num_scr = 0;
168 169
169 if (ncol == 0) 170 if (ncol == 0)
170 ncol = 80; 171 ncol = 80;
… …
237 selection.text = NULL; 238 selection.text = NULL;
238 selection.len = 0; 239 selection.len = 0;
239 selection.op = SELECTION_CLEAR; 240 selection.op = SELECTION_CLEAR;
240 selection.screen = PRIMARY; 241 selection.screen = PRIMARY;
241 selection.clicks = 0; 242 selection.clicks = 0;
242 rvideo_state = rvideo_mode = false;
243 } 243 }
244 else 244 else
245 { 245 {
246 /* 246 /*
247 * add or delete rows as appropriate 247 * add or delete rows as appropriate
… …
1648 if (rvideo_state != on) 1648 if (rvideo_state != on)
1649 { 1649 {
1650 rvideo_state = on; 1650 rvideo_state = on;
1651 1651
1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653#if XPM_BACKGROUND 1653#ifdef HAVE_BG_PIXMAP
1654 if (bgPixmap.pixmap == None) 1654 if (bgPixmap.pixmap == None)
1655#endif 1655#endif
1656#if TRANSPARENT 1656#if ENABLE_TRANSPARENCY
1657 if (!option (Opt_transparent) || am_transparent == 0) 1657 if (!option (Opt_transparent) || am_transparent == 0)
1658#endif 1658#endif
1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1660 1660
1661 XGCValues gcvalue; 1661 XGCValues gcvalue;
… …
1890# ifdef MAPALERT_OPTION 1890# ifdef MAPALERT_OPTION
1891 if (option (Opt_mapAlert)) 1891 if (option (Opt_mapAlert))
1892# endif 1892# endif
1893 XMapWindow (dpy, parent[0]); 1893 XMapWindow (dpy, parent[0]);
1894# endif 1894# endif
1895# if ENABLE_FRILLS
1896 if (option (Opt_urgentOnBell))
1897 {
1898 XWMHints *h;
1899
1900 h = XGetWMHints(dpy, parent[0]);
1901 if (h != NULL)
1902 {
1903 h->flags |= XUrgencyHint;
1904 XSetWMHints(dpy, parent[0], h);
1905 }
1906 }
1907# endif
1895 1908
1896 if (option (Opt_visualBell)) 1909 if (option (Opt_visualBell))
1897 { 1910 {
1898 rvideo_bell = true; 1911 rvideo_bell = true;
1899 scr_rvideo_mode (rvideo_mode); 1912 scr_rvideo_mode (rvideo_mode);
… …
1901 1914
1902 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1915 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1903 } 1916 }
1904 else 1917 else
1905 XBell (dpy, 0); 1918 XBell (dpy, 0);
1906
1907#endif 1919#endif
1908} 1920}
1909 1921
1910/* ------------------------------------------------------------------------- */ 1922/* ------------------------------------------------------------------------- */
1911/* ARGSUSED */ 1923/* ARGSUSED */
… …
1992 * A: set up vars 2004 * A: set up vars
1993 */ 2005 */
1994 have_bg = 0; 2006 have_bg = 0;
1995 refresh_count = 0; 2007 refresh_count = 0;
1996 2008
1997#if XPM_BACKGROUND 2009#ifdef HAVE_BG_PIXMAP
1998 have_bg |= bgPixmap.pixmap != None; 2010 have_bg |= bgPixmap.pixmap != None;
1999#endif 2011#endif
2000#if TRANSPARENT 2012#if ENABLE_TRANSPARENCY
2001 have_bg |= option (Opt_transparent) && am_transparent; 2013 have_bg |= option (Opt_transparent) && am_transparent;
2002#endif 2014#endif
2003 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2015 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2004 2016
2005 /* 2017 /*
… …
2469 2481
2470void 2482void
2471rxvt_term::scr_recolour () NOTHROW 2483rxvt_term::scr_recolour () NOTHROW
2472{ 2484{
2473 if (1 2485 if (1
2474#if TRANSPARENT 2486#if ENABLE_TRANSPARENCY
2475 && !am_transparent 2487 && !am_transparent
2476#endif 2488#endif
2477#if XPM_BACKGROUND 2489#ifdef HAVE_BG_PIXMAP
2478 && !bgPixmap.pixmap 2490 && !bgPixmap.pixmap
2479#endif 2491#endif
2480 ) 2492 )
2481 { 2493 {
2482 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2494 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);

Diff Legend

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