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

Diff Legend

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