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.256 by root, Sun Nov 11 04:08:00 2007 UTC vs.
Revision 1.262 by ayin, Wed Nov 21 09:15:33 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#ifdef HAVE_BG_PIXMAP
290 bgPixmap.destroy ();
291#endif
289 displays.put (display); 292 displays.put (display);
290 293
291 scr_release (); 294 scr_release ();
292 295
293 /* clear all resources */ 296 /* clear all resources */
… …
370 373
371 destroy_ev.start (); 374 destroy_ev.start ();
372} 375}
373 376
374void 377void
375rxvt_term::destroy_cb (ev::check &w, int revents) 378rxvt_term::destroy_cb (ev::idle &w, int revents)
376{ 379{
377 make_current (); 380 make_current ();
378 381
379 delete this; 382 delete this;
380} 383}
… …
615 618
616void 619void
617rxvt_init () 620rxvt_init ()
618{ 621{
619 ptytty::init (); 622 ptytty::init ();
623
620 ev::ev_default_loop (0); 624 if (!ev::ev_default_loop (0))
625 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
621 626
622 rxvt_environ = environ; 627 rxvt_environ = environ;
623 628
624 signal (SIGHUP, SIG_IGN); 629 signal (SIGHUP, SIG_IGN);
625 signal (SIGPIPE, SIG_IGN); 630 signal (SIGPIPE, SIG_IGN);
… …
1001 /*TODO: handle Color_BD, scrollbar background, etc. */ 1006 /*TODO: handle Color_BD, scrollbar background, etc. */
1002 1007
1003 update_fade_color (idx); 1008 update_fade_color (idx);
1004 recolour_cursor (); 1009 recolour_cursor ();
1005 scr_recolour (); 1010 scr_recolour ();
1006#endif /* XTERM_COLOR_CHANGE */ 1011#endif /* XTERM_COLOR_CHANGE */
1007} 1012}
1008 1013
1009void 1014void
1010rxvt_term::recolour_cursor () 1015rxvt_term::recolour_cursor ()
1011{ 1016{
… …
1704 XFree (status_attr); 1709 XFree (status_attr);
1705 } 1710 }
1706 1711
1707 XFree (preedit_attr); 1712 XFree (preedit_attr);
1708} 1713}
1709#endif /* USE_XIM */ 1714#endif /* USE_XIM */
1710 1715
1711void 1716void
1712rxvt_term::get_window_origin (int &x, int &y) 1717rxvt_term::get_window_origin (int &x, int &y)
1713{ 1718{
1714 Window cr; 1719 Window cr;
… …
1736 } 1741 }
1737 return None; 1742 return None;
1738} 1743}
1739 1744
1740#ifdef HAVE_BG_PIXMAP 1745#ifdef HAVE_BG_PIXMAP
1746# if TRACE_PIXMAPS
1747# undef update_background
1748int rxvt_term::trace_update_background (const char* file, int line)
1749{
1750 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1751 update_background ();
1752}
1753# endif
1741int 1754int
1742rxvt_term::update_background () 1755rxvt_term::update_background ()
1743{ 1756{
1744 bgPixmap.invalidate (); 1757 bgPixmap.invalidate ();
1745 1758

Diff Legend

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