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.270 by root, Tue Jun 26 00:40:19 2007 UTC vs.
Revision 1.275 by sasha, Wed Aug 15 22:41:52 2007 UTC

… …
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <X11/Xmd.h> /* get the typedef for CARD32 */
32
33#include <inttypes.h> 31#include <inttypes.h>
34 32
35#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a seperate compile!
36 34
37inline void fill_text (text_t *start, text_t value, int len) 35inline void fill_text (text_t *start, text_t value, int len)
… …
161{ 159{
162#if ENABLE_OVERLAY 160#if ENABLE_OVERLAY
163 scr_overlay_off (); 161 scr_overlay_off ();
164#endif 162#endif
165 163
164 rvideo_mode = false;
166 view_start = 0; 165 view_start = 0;
167 num_scr = 0; 166 num_scr = 0;
168 167
169 if (ncol == 0) 168 if (ncol == 0)
170 ncol = 80; 169 ncol = 80;
… …
237 selection.text = NULL; 236 selection.text = NULL;
238 selection.len = 0; 237 selection.len = 0;
239 selection.op = SELECTION_CLEAR; 238 selection.op = SELECTION_CLEAR;
240 selection.screen = PRIMARY; 239 selection.screen = PRIMARY;
241 selection.clicks = 0; 240 selection.clicks = 0;
242 rvideo_state = rvideo_mode = false;
243 } 241 }
244 else 242 else
245 { 243 {
246 /* 244 /*
247 * add or delete rows as appropriate 245 * add or delete rows as appropriate
… …
1648 if (rvideo_state != on) 1646 if (rvideo_state != on)
1649 { 1647 {
1650 rvideo_state = on; 1648 rvideo_state = on;
1651 1649
1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1650 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653#if XPM_BACKGROUND 1651#ifdef HAVE_BG_PIXMAP
1654 if (bgPixmap.pixmap == None) 1652 if (bgPixmap.pixmap == None)
1655#endif
1656#if ENABLE_TRANSPARENCY
1657 if (!option (Opt_transparent) || am_transparent == 0)
1658#endif 1653#endif
1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1654 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1660 1655
1661 XGCValues gcvalue; 1656 XGCValues gcvalue;
1662 gcvalue.foreground = pix_colors[Color_fg]; 1657 gcvalue.foreground = pix_colors[Color_fg];
… …
1806 for (i = PART_BEG; i < RC_COUNT; i++) 1801 for (i = PART_BEG; i < RC_COUNT; i++)
1807 { 1802 {
1808 min_it (rc[i].col, ncol - 1); 1803 min_it (rc[i].col, ncol - 1);
1809 min_it (rc[i].row, nrow - 1); 1804 min_it (rc[i].row, nrow - 1);
1810 } 1805 }
1811 1806// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1812 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1807 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1813 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1808 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1814 1809
1815 num_scr_allow = 0; 1810 num_scr_allow = 0;
1816 1811
… …
1914 1909
1915 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1910 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1916 } 1911 }
1917 else 1912 else
1918 XBell (dpy, 0); 1913 XBell (dpy, 0);
1919
1920#endif 1914#endif
1921} 1915}
1922 1916
1923/* ------------------------------------------------------------------------- */ 1917/* ------------------------------------------------------------------------- */
1924/* ARGSUSED */ 1918/* ARGSUSED */
… …
2005 * A: set up vars 1999 * A: set up vars
2006 */ 2000 */
2007 have_bg = 0; 2001 have_bg = 0;
2008 refresh_count = 0; 2002 refresh_count = 0;
2009 2003
2010#if XPM_BACKGROUND 2004#ifdef HAVE_BG_PIXMAP
2011 have_bg |= bgPixmap.pixmap != None; 2005 have_bg |= bgPixmap.pixmap != None;
2012#endif
2013#if ENABLE_TRANSPARENCY
2014 have_bg |= option (Opt_transparent) && am_transparent;
2015#endif 2006#endif
2016 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2007 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2017 2008
2018 /* 2009 /*
2019 * B: reverse any characters which are selected 2010 * B: reverse any characters which are selected
… …
2481} 2472}
2482 2473
2483void 2474void
2484rxvt_term::scr_recolour () NOTHROW 2475rxvt_term::scr_recolour () NOTHROW
2485{ 2476{
2486 if (1 2477#ifdef HAVE_BG_PIXMAP
2487#if ENABLE_TRANSPARENCY 2478 bgPixmap.apply ();
2488 && !am_transparent 2479#else
2489#endif
2490#if XPM_BACKGROUND
2491 && !bgPixmap.pixmap
2492#endif
2493 )
2494 {
2495 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2480 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2496 XClearWindow (dpy, parent[0]); 2481 XClearWindow (dpy, parent[0]);
2497 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2482 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2498#if HAVE_SCROLLBARS 2483# if HAVE_SCROLLBARS
2499 if (scrollBar.win) 2484 if (scrollBar.win)
2500 { 2485 {
2501 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2486 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2502 scrollBar.setIdle (); 2487 scrollBar.setIdle ();
2503 scrollbar_show (0); 2488 scrollbar_show (0);
2504 } 2489 }
2505#endif 2490# endif
2506 } 2491#endif
2507 2492
2508 scr_clear (); 2493 scr_clear ();
2509 scr_touch (true); 2494 scr_touch (true);
2510 want_refresh = 1; 2495 want_refresh = 1;
2511} 2496}
2512 2497

Diff Legend

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