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.255 by ayin, Wed Oct 31 09:55:23 2007 UTC vs.
Revision 1.260 by root, Sun Nov 18 02:45:26 2007 UTC

… …
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 check_ev (this, &rxvt_term::check_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{
… …
310#endif 310#endif
311} 311}
312 312
313// child has exited, usually destroys 313// child has exited, usually destroys
314void 314void
315rxvt_term::child_cb (child_watcher &w, int status) 315rxvt_term::child_cb (ev::child &w, int status)
316{ 316{
317 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 317 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
318 318
319 cmd_pid = 0; 319 cmd_pid = 0;
320 320
… …
348 incr_ev.stop (); 348 incr_ev.stop ();
349 termwin_ev.stop (display); 349 termwin_ev.stop (display);
350 vt_ev.stop (display); 350 vt_ev.stop (display);
351 } 351 }
352 352
353 check_ev.stop (); 353 prepare_ev.stop ();
354 pty_ev.stop (); 354 pty_ev.stop ();
355#ifdef CURSOR_BLINK 355#ifdef CURSOR_BLINK
356 cursor_blink_ev.stop (); 356 cursor_blink_ev.stop ();
357#endif 357#endif
358#ifdef TEXT_BLINK 358#ifdef TEXT_BLINK
… …
366#endif 366#endif
367#ifdef POINTER_BLANK 367#ifdef POINTER_BLANK
368 pointer_ev.stop (); 368 pointer_ev.stop ();
369#endif 369#endif
370 370
371 destroy_ev.start (0); 371 destroy_ev.start ();
372} 372}
373 373
374void 374void
375rxvt_term::destroy_cb (time_watcher &w) 375rxvt_term::destroy_cb (ev::idle &w, int revents)
376{ 376{
377 make_current (); 377 make_current ();
378 378
379 delete this; 379 delete this;
380} 380}
… …
565 init_command (cmd_argv); 565 init_command (cmd_argv);
566 566
567 free (cmd_argv); 567 free (cmd_argv);
568 568
569 if (pty->pty >= 0) 569 if (pty->pty >= 0)
570 pty_ev.start (pty->pty, EVENT_READ); 570 pty_ev.start (pty->pty, ev::READ);
571 571
572 check_ev.start (); 572 prepare_ev.start ();
573 573
574 HOOK_INVOKE ((this, HOOK_START, DT_END)); 574 HOOK_INVOKE ((this, HOOK_START, DT_END));
575 575
576#if ENABLE_XEMBED 576#if ENABLE_XEMBED
577 if (rs[Rs_embed]) 577 if (rs[Rs_embed])
… …
589 return true; 589 return true;
590} 590}
591 591
592static struct sig_handlers 592static struct sig_handlers
593{ 593{
594 sig_watcher sw_term, sw_int; 594 ev::sig sw_term, sw_int;
595 595
596 /* 596 /*
597 * Catch a fatal signal and tidy up before quitting 597 * Catch a fatal signal and tidy up before quitting
598 */ 598 */
599 void 599 void
600 sig_term (sig_watcher &w) 600 sig_term (ev::sig &w, int revents)
601 { 601 {
602 rxvt_emergency_cleanup (); 602 rxvt_emergency_cleanup ();
603 signal (w.signum, SIG_DFL); 603 w.stop ();
604 kill (getpid (), w.signum); 604 kill (getpid (), w.signum);
605 } 605 }
606 606
607 sig_handlers () 607 sig_handlers ()
608 : sw_term (this, &sig_handlers::sig_term), 608 : sw_term (this, &sig_handlers::sig_term),
… …
616void 616void
617rxvt_init () 617rxvt_init ()
618{ 618{
619 ptytty::init (); 619 ptytty::init ();
620 620
621 if (!ev::ev_default_loop (0))
622 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
623
621 rxvt_environ = environ; 624 rxvt_environ = environ;
622 625
623 signal (SIGHUP, SIG_IGN); 626 signal (SIGHUP, SIG_IGN);
624 signal (SIGPIPE, SIG_IGN); 627 signal (SIGPIPE, SIG_IGN);
625 628
626 sig_handlers.sw_term.start (SIGTERM); 629 sig_handlers.sw_term.start (SIGTERM); ev::ev_unref ();
627 sig_handlers.sw_int.start (SIGINT); 630 sig_handlers.sw_int.start (SIGINT); ev::ev_unref ();
628 631
629 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 632 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
630 /* signal (SIGURG, SIG_DFL); */ 633 /* signal (SIGURG, SIG_DFL); */
631 634
632 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 635 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
1000 /*TODO: handle Color_BD, scrollbar background, etc. */ 1003 /*TODO: handle Color_BD, scrollbar background, etc. */
1001 1004
1002 update_fade_color (idx); 1005 update_fade_color (idx);
1003 recolour_cursor (); 1006 recolour_cursor ();
1004 scr_recolour (); 1007 scr_recolour ();
1005#endif /* XTERM_COLOR_CHANGE */ 1008#endif /* XTERM_COLOR_CHANGE */
1006} 1009}
1007 1010
1008void 1011void
1009rxvt_term::recolour_cursor () 1012rxvt_term::recolour_cursor ()
1010{ 1013{
… …
1703 XFree (status_attr); 1706 XFree (status_attr);
1704 } 1707 }
1705 1708
1706 XFree (preedit_attr); 1709 XFree (preedit_attr);
1707} 1710}
1708#endif /* USE_XIM */ 1711#endif /* USE_XIM */
1709 1712
1710void 1713void
1711rxvt_term::get_window_origin (int &x, int &y) 1714rxvt_term::get_window_origin (int &x, int &y)
1712{ 1715{
1713 Window cr; 1716 Window cr;
… …
1735 } 1738 }
1736 return None; 1739 return None;
1737} 1740}
1738 1741
1739#ifdef HAVE_BG_PIXMAP 1742#ifdef HAVE_BG_PIXMAP
1743# if TRACE_PIXMAPS
1744# undef update_background
1745int rxvt_term::trace_update_background (const char* file, int line)
1746{
1747 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1748 update_background ();
1749}
1750# endif
1740int 1751int
1741rxvt_term::update_background () 1752rxvt_term::update_background ()
1742{ 1753{
1743 bgPixmap.invalidate (); 1754 bgPixmap.invalidate ();
1744 1755
1745 /* no chance of real time refresh if we are blurring ! */ 1756 /* no chance of real time refresh if we are blurring! */
1746 if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1757 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1747 bgPixmap.render (); 1758 bgPixmap.render ();
1748 else 1759 else
1749 { 1760 {
1750 update_background_ev.stop (); 1761 update_background_ev.stop ();
1762
1751 if (!bgPixmap.need_client_side_rendering()) 1763 if (!bgPixmap.need_client_side_rendering())
1752 update_background_ev.start (NOW + .05); 1764 update_background_ev.start (.05);
1753 else if (bgPixmap.flags & bgPixmap_t::blurNeeded) 1765 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1754 update_background_ev.start (NOW + .2); /* very slow !!! */ 1766 update_background_ev.start (.20); /* very slow !!! */
1755 else 1767 else
1756 update_background_ev.start (NOW + .07); 1768 update_background_ev.start (.07);
1757 } 1769 }
1770
1758 return 0; 1771 return 0;
1759} 1772}
1760 1773
1761void 1774void
1762rxvt_term::update_background_cb (time_watcher &w) 1775rxvt_term::update_background_cb (ev::timer &w, int revents)
1763{ 1776{
1764 bgPixmap.render (); 1777 bgPixmap.render ();
1765} 1778}
1766 1779
1767#endif /* HAVE_BG_PIXMAP */ 1780#endif /* HAVE_BG_PIXMAP */

Diff Legend

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