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.271 by root, Tue Dec 4 16:33:42 2007 UTC

… …
152 152
153} 153}
154#endif 154#endif
155 155
156rxvt_term::rxvt_term () 156rxvt_term::rxvt_term ()
157 : 157{
158#if HAVE_BG_PIXMAP
159 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
160#endif
161#ifdef CURSOR_BLINK
162 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this);
163#endif
164#ifdef TEXT_BLINK
165 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this);
166#endif
167#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
168 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
169#endif
170#ifdef SELECTION_SCROLLING
171 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
172#endif
173#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
174 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
175#endif
158#if ENABLE_TRANSPARENCY || ENABLE_PERL 176#if ENABLE_TRANSPARENCY || ENABLE_PERL
159 rootwin_ev (this, &rxvt_term::rootwin_cb), 177 rootwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
160#endif
161#if HAVE_BG_PIXMAP
162 update_background_ev(this, &rxvt_term::update_background_cb),
163#endif 178#endif
164#ifdef HAVE_SCROLLBARS 179#ifdef HAVE_SCROLLBARS
165 scrollbar_ev (this, &rxvt_term::x_cb), 180 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
166#endif 181#endif
167#ifdef CURSOR_BLINK 182#ifdef USE_XIM
168 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 183 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
169#endif
170#ifdef TEXT_BLINK
171 text_blink_ev (this, &rxvt_term::text_blink_cb),
172#endif
173#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
174 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
175#endif
176#ifdef SELECTION_SCROLLING
177 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
178#endif
179#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
180 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
181#endif 184#endif
182#ifdef POINTER_BLANK 185#ifdef POINTER_BLANK
183 pointer_ev (this, &rxvt_term::pointer_cb), 186 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184#endif
185#ifdef USE_XIM
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.set <rxvt_term, &rxvt_term::bell_cb> (this);
190#endif 190#endif
191 termwin_ev (this, &rxvt_term::x_cb), 191 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
192 vt_ev (this, &rxvt_term::x_cb), 192 prepare_ev.set <rxvt_term, &rxvt_term::prepare_cb> (this);
193 child_ev (this, &rxvt_term::child_cb), 193 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
194 check_ev (this, &rxvt_term::check_cb), 194 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
195 flush_ev (this, &rxvt_term::flush_cb), 195 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
196 destroy_ev (this, &rxvt_term::destroy_cb), 196 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
197 pty_ev (this, &rxvt_term::pty_cb), 197 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
198 incr_ev (this, &rxvt_term::incr_cb) 198 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
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
204#ifdef KEYSYM_RESOURCE 204#ifdef KEYSYM_RESOURCE
… …
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 */
… …
306 delete argv; 309 delete argv;
307 310
308#ifdef KEYSYM_RESOURCE 311#ifdef KEYSYM_RESOURCE
309 delete keyboard; 312 delete keyboard;
310#endif 313#endif
314#ifndef NO_RESOURCES
315 XrmDestroyDatabase (option_db);
316#endif
311} 317}
312 318
313// child has exited, usually destroys 319// child has exited, usually destroys
314void 320void
315rxvt_term::child_cb (child_watcher &w, int status) 321rxvt_term::child_cb (ev::child &w, int status)
316{ 322{
317 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 323 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
318 324
319 cmd_pid = 0; 325 cmd_pid = 0;
320 326
… …
348 incr_ev.stop (); 354 incr_ev.stop ();
349 termwin_ev.stop (display); 355 termwin_ev.stop (display);
350 vt_ev.stop (display); 356 vt_ev.stop (display);
351 } 357 }
352 358
353 check_ev.stop (); 359 prepare_ev.stop ();
354 pty_ev.stop (); 360 pty_ev.stop ();
355#ifdef CURSOR_BLINK 361#ifdef CURSOR_BLINK
356 cursor_blink_ev.stop (); 362 cursor_blink_ev.stop ();
357#endif 363#endif
358#ifdef TEXT_BLINK 364#ifdef TEXT_BLINK
… …
366#endif 372#endif
367#ifdef POINTER_BLANK 373#ifdef POINTER_BLANK
368 pointer_ev.stop (); 374 pointer_ev.stop ();
369#endif 375#endif
370 376
371 destroy_ev.start (0); 377 destroy_ev.start ();
372} 378}
373 379
374void 380void
375rxvt_term::destroy_cb (time_watcher &w) 381rxvt_term::destroy_cb (ev::idle &w, int revents)
376{ 382{
377 make_current (); 383 make_current ();
378 384
379 delete this; 385 delete this;
380} 386}
… …
565 init_command (cmd_argv); 571 init_command (cmd_argv);
566 572
567 free (cmd_argv); 573 free (cmd_argv);
568 574
569 if (pty->pty >= 0) 575 if (pty->pty >= 0)
570 pty_ev.start (pty->pty, EVENT_READ); 576 pty_ev.start (pty->pty, ev::READ);
571 577
572 check_ev.start (); 578 prepare_ev.start ();
573 579
574 HOOK_INVOKE ((this, HOOK_START, DT_END)); 580 HOOK_INVOKE ((this, HOOK_START, DT_END));
575 581
576#if ENABLE_XEMBED 582#if ENABLE_XEMBED
577 if (rs[Rs_embed]) 583 if (rs[Rs_embed])
… …
589 return true; 595 return true;
590} 596}
591 597
592static struct sig_handlers 598static struct sig_handlers
593{ 599{
594 sig_watcher sw_term, sw_int; 600 ev::sig sw_term, sw_int;
595 601
596 /* 602 /*
597 * Catch a fatal signal and tidy up before quitting 603 * Catch a fatal signal and tidy up before quitting
598 */ 604 */
599 void 605 void sig_term (ev::sig &w, int revents);
600 sig_term (sig_watcher &w) 606
607 sig_handlers ()
601 { 608 {
602 rxvt_emergency_cleanup (); 609 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
603 signal (w.signum, SIG_DFL);
604 kill (getpid (), w.signum);
605 }
606
607 sig_handlers ()
608 : sw_term (this, &sig_handlers::sig_term),
609 sw_int (this, &sig_handlers::sig_term) 610 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
610 {
611 } 611 }
612} sig_handlers; 612} sig_handlers;
613 613
614void
615sig_handlers::sig_term (ev::sig &w, int revents)
616{
617 rxvt_emergency_cleanup ();
618 w.stop ();
619 kill (getpid (), w.signum);
620}
621
614char **rxvt_environ; // startup environment 622char **rxvt_environ; // startup environment
615 623
616void 624void
617rxvt_init () 625rxvt_init ()
618{ 626{
619 ptytty::init (); 627 ptytty::init ();
628
629 if (!ev_default_loop (0))
630 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
620 631
621 rxvt_environ = environ; 632 rxvt_environ = environ;
622 633
623 signal (SIGHUP, SIG_IGN); 634 signal (SIGHUP, SIG_IGN);
624 signal (SIGPIPE, SIG_IGN); 635 signal (SIGPIPE, SIG_IGN);
625 636
626 sig_handlers.sw_term.start (SIGTERM); 637 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
627 sig_handlers.sw_int.start (SIGINT); 638 sig_handlers.sw_int.start (SIGINT); ev_unref ();
628 639
629 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 640 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
630 /* signal (SIGURG, SIG_DFL); */ 641 /* signal (SIGURG, SIG_DFL); */
631 642
632 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 643 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
970 if (isdigit (*color)) 981 if (isdigit (*color))
971 { 982 {
972 i = atoi (color); 983 i = atoi (color);
973 984
974 if (i >= 8 && i <= 15) 985 if (i >= 8 && i <= 15)
986 {
975 { /* bright colors */ 987 /* bright colors */
976 i -= 8;
977 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 988 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
978 goto done; 989 goto done;
979 } 990 }
980 991
981 if (i >= 0 && i <= 7) 992 if (i >= 0 && i <= 7)
993 {
982 { /* normal colors */ 994 /* normal colors */
983 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 995 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
984 goto done; 996 goto done;
985 } 997 }
986 } 998 }
987 999
… …
992 * so just keep gobbling up the colormap 1004 * so just keep gobbling up the colormap
993 */ 1005 */
994 1006
995 pix_colors_focused[idx] = xcol; 1007 pix_colors_focused[idx] = xcol;
996 1008
997 /* XSetWindowAttributes attr; */
998 /* Cursor cursor; */
999done: 1009done:
1000 /*TODO: handle Color_BD, scrollbar background, etc. */ 1010 /*TODO: handle Color_BD, scrollbar background, etc. */
1001 1011
1002 update_fade_color (idx); 1012 update_fade_color (idx);
1003 recolour_cursor (); 1013 recolour_cursor ();
1004 scr_recolour (); 1014 scr_recolour ();
1005#endif /* XTERM_COLOR_CHANGE */ 1015#endif /* XTERM_COLOR_CHANGE */
1006} 1016}
1007 1017
1008void 1018void
1009rxvt_term::recolour_cursor () 1019rxvt_term::recolour_cursor ()
1010{ 1020{
… …
1027 */ 1037 */
1028void 1038void
1029rxvt_term::set_colorfgbg () 1039rxvt_term::set_colorfgbg ()
1030{ 1040{
1031 unsigned int i; 1041 unsigned int i;
1032 const char *xpmb = "\0"; 1042 const char *xpmb = "";
1033 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1043 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1034 1044
1035 strcpy (fstr, "default"); 1045 strcpy (fstr, "default");
1036 strcpy (bstr, "default"); 1046 strcpy (bstr, "default");
1037 for (i = Color_Black; i <= Color_White; i++) 1047 for (i = Color_Black; i <= Color_White; i++)
… …
1703 XFree (status_attr); 1713 XFree (status_attr);
1704 } 1714 }
1705 1715
1706 XFree (preedit_attr); 1716 XFree (preedit_attr);
1707} 1717}
1708#endif /* USE_XIM */ 1718#endif /* USE_XIM */
1709 1719
1710void 1720void
1711rxvt_term::get_window_origin (int &x, int &y) 1721rxvt_term::get_window_origin (int &x, int &y)
1712{ 1722{
1713 Window cr; 1723 Window cr;
… …
1735 } 1745 }
1736 return None; 1746 return None;
1737} 1747}
1738 1748
1739#ifdef HAVE_BG_PIXMAP 1749#ifdef HAVE_BG_PIXMAP
1750# if TRACE_PIXMAPS
1751# undef update_background
1752int rxvt_term::trace_update_background (const char *file, int line)
1753{
1754 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1755 update_background ();
1756}
1757# endif
1758
1740int 1759int
1741rxvt_term::update_background () 1760rxvt_term::update_background ()
1742{ 1761{
1743 bgPixmap.invalidate (); 1762 bgPixmap.invalidate ();
1744 1763
1745 /* no chance of real time refresh if we are blurring ! */ 1764 /* no chance of real time refresh if we are blurring! */
1746 if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1765 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1747 bgPixmap.render (); 1766 bgPixmap.render ();
1748 else 1767 else
1749 { 1768 {
1750 update_background_ev.stop (); 1769 update_background_ev.stop ();
1770
1751 if (!bgPixmap.need_client_side_rendering()) 1771 if (!bgPixmap.need_client_side_rendering())
1752 update_background_ev.start (NOW + .05); 1772 update_background_ev.start (.05);
1753 else if (bgPixmap.flags & bgPixmap_t::blurNeeded) 1773 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1754 update_background_ev.start (NOW + .2); /* very slow !!! */ 1774 update_background_ev.start (.20); /* very slow !!! */
1755 else 1775 else
1756 update_background_ev.start (NOW + .07); 1776 update_background_ev.start (.07);
1757 } 1777 }
1778
1758 return 0; 1779 return 0;
1759} 1780}
1760 1781
1761void 1782void
1762rxvt_term::update_background_cb (time_watcher &w) 1783rxvt_term::update_background_cb (ev::timer &w, int revents)
1763{ 1784{
1764 bgPixmap.render (); 1785 bgPixmap.render ();
1765} 1786}
1766 1787
1767#endif /* HAVE_BG_PIXMAP */ 1788#endif /* HAVE_BG_PIXMAP */

Diff Legend

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