ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.257 by root, Sun Nov 11 17:10:45 2007 UTC vs.
Revision 1.261 by root, Mon Nov 19 15:33:34 2007 UTC

… …
181#endif 181#endif
182#ifdef POINTER_BLANK 182#ifdef POINTER_BLANK
183 pointer_ev (this, &rxvt_term::pointer_cb), 183 pointer_ev (this, &rxvt_term::pointer_cb),
184#endif 184#endif
185#ifdef USE_XIM 185#ifdef USE_XIM
186 im_ev (this, &rxvt_term::im_cb), 186 im_ev (this, &rxvt_term::im_cb),
187#endif 187#endif
188#ifndef NO_BELL 188#ifndef NO_BELL
189 bell_ev (this, &rxvt_term::bell_cb), 189 bell_ev (this, &rxvt_term::bell_cb),
190#endif 190#endif
191 termwin_ev (this, &rxvt_term::x_cb), 191 termwin_ev (this, &rxvt_term::x_cb),
192 vt_ev (this, &rxvt_term::x_cb), 192 vt_ev (this, &rxvt_term::x_cb),
193 child_ev (this, &rxvt_term::child_cb), 193 child_ev (this, &rxvt_term::child_cb),
194 prepare_ev (this, &rxvt_term::prepare_cb), 194 prepare_ev (this, &rxvt_term::prepare_cb),
195 flush_ev (this, &rxvt_term::flush_cb), 195 flush_ev (this, &rxvt_term::flush_cb),
196 destroy_ev (this, &rxvt_term::destroy_cb), 196 destroy_ev (this, &rxvt_term::destroy_cb),
197 pty_ev (this, &rxvt_term::pty_cb), 197 pty_ev (this, &rxvt_term::pty_cb),
198 incr_ev (this, &rxvt_term::incr_cb) 198 incr_ev (this, &rxvt_term::incr_cb)
199{ 199{
200 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 200 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
201 201
202 termlist.push_back (this); 202 termlist.push_back (this);
203 203
… …
284 delete [] pix_colors_focused; 284 delete [] pix_colors_focused;
285#if OFF_FOCUS_FADING 285#if OFF_FOCUS_FADING
286 delete [] pix_colors_unfocused; 286 delete [] pix_colors_unfocused;
287#endif 287#endif
288 288
289 bgPixmap.destroy ();
289 displays.put (display); 290 displays.put (display);
290 291
291 scr_release (); 292 scr_release ();
292 293
293 /* clear all resources */ 294 /* clear all resources */
… …
370 371
371 destroy_ev.start (); 372 destroy_ev.start ();
372} 373}
373 374
374void 375void
375rxvt_term::destroy_cb (ev::check &w, int revents) 376rxvt_term::destroy_cb (ev::idle &w, int revents)
376{ 377{
377 make_current (); 378 make_current ();
378 379
379 delete this; 380 delete this;
380} 381}
… …
1003 /*TODO: handle Color_BD, scrollbar background, etc. */ 1004 /*TODO: handle Color_BD, scrollbar background, etc. */
1004 1005
1005 update_fade_color (idx); 1006 update_fade_color (idx);
1006 recolour_cursor (); 1007 recolour_cursor ();
1007 scr_recolour (); 1008 scr_recolour ();
1008#endif /* XTERM_COLOR_CHANGE */ 1009#endif /* XTERM_COLOR_CHANGE */
1009} 1010}
1010 1011
1011void 1012void
1012rxvt_term::recolour_cursor () 1013rxvt_term::recolour_cursor ()
1013{ 1014{
… …
1706 XFree (status_attr); 1707 XFree (status_attr);
1707 } 1708 }
1708 1709
1709 XFree (preedit_attr); 1710 XFree (preedit_attr);
1710} 1711}
1711#endif /* USE_XIM */ 1712#endif /* USE_XIM */
1712 1713
1713void 1714void
1714rxvt_term::get_window_origin (int &x, int &y) 1715rxvt_term::get_window_origin (int &x, int &y)
1715{ 1716{
1716 Window cr; 1717 Window cr;
… …
1738 } 1739 }
1739 return None; 1740 return None;
1740} 1741}
1741 1742
1742#ifdef HAVE_BG_PIXMAP 1743#ifdef HAVE_BG_PIXMAP
1744# if TRACE_PIXMAPS
1745# undef update_background
1746int rxvt_term::trace_update_background (const char* file, int line)
1747{
1748 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1749 update_background ();
1750}
1751# endif
1743int 1752int
1744rxvt_term::update_background () 1753rxvt_term::update_background ()
1745{ 1754{
1746 bgPixmap.invalidate (); 1755 bgPixmap.invalidate ();
1747 1756

Diff Legend

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