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.253 by ayin, Mon Oct 15 07:33:48 2007 UTC vs.
Revision 1.258 by ayin, Thu Nov 15 11:36:15 2007 UTC

… …
38#include <limits> 38#include <limits>
39 39
40#include <csignal> 40#include <csignal>
41#include <cstring> 41#include <cstring>
42 42
43#ifdef TTY_GID_SUPPORT
44# include <grp.h>
45#endif
46
47#ifdef HAVE_TERMIOS_H 43#ifdef HAVE_TERMIOS_H
48# include <termios.h> 44# include <termios.h>
45#endif
46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale>
53# endif
49#endif 54#endif
50 55
51vector<rxvt_term *> rxvt_term::termlist; 56vector<rxvt_term *> rxvt_term::termlist;
52 57
53// used to tell global functions which terminal instance is "active" 58// used to tell global functions which terminal instance is "active"
… …
88class rxvt_composite_vec rxvt_composite; 93class rxvt_composite_vec rxvt_composite;
89 94
90text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 95text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
91{ 96{
92 compose_char *cc; 97 compose_char *cc;
93 98
94 // break compose chains, as stupid readline really likes to duplicate 99 // break compose chains, as stupid readline really likes to duplicate
95 // composing characters for some reason near the end of a line. 100 // composing characters for some reason near the end of a line.
96 cc = (*this)[c1]; 101 cc = (*this)[c1];
97 while (cc) 102 while (cc)
98 { 103 {
… …
178 pointer_ev (this, &rxvt_term::pointer_cb), 183 pointer_ev (this, &rxvt_term::pointer_cb),
179#endif 184#endif
180#ifdef USE_XIM 185#ifdef USE_XIM
181 im_ev (this, &rxvt_term::im_cb), 186 im_ev (this, &rxvt_term::im_cb),
182#endif 187#endif
183#ifndef NO_BELL 188#ifndef NO_BELL
184 bell_ev (this, &rxvt_term::bell_cb), 189 bell_ev (this, &rxvt_term::bell_cb),
185#endif 190#endif
186 termwin_ev (this, &rxvt_term::x_cb), 191 termwin_ev (this, &rxvt_term::x_cb),
187 vt_ev (this, &rxvt_term::x_cb), 192 vt_ev (this, &rxvt_term::x_cb),
188 child_ev (this, &rxvt_term::child_cb), 193 child_ev (this, &rxvt_term::child_cb),
189 check_ev (this, &rxvt_term::check_cb), 194 prepare_ev (this, &rxvt_term::prepare_cb),
190 flush_ev (this, &rxvt_term::flush_cb), 195 flush_ev (this, &rxvt_term::flush_cb),
191 destroy_ev (this, &rxvt_term::destroy_cb), 196 destroy_ev (this, &rxvt_term::destroy_cb),
192 pty_ev (this, &rxvt_term::pty_cb), 197 pty_ev (this, &rxvt_term::pty_cb),
193 incr_ev (this, &rxvt_term::incr_cb) 198 incr_ev (this, &rxvt_term::incr_cb)
194{ 199{
… …
305#endif 310#endif
306} 311}
307 312
308// child has exited, usually destroys 313// child has exited, usually destroys
309void 314void
310rxvt_term::child_cb (child_watcher &w, int status) 315rxvt_term::child_cb (ev::child &w, int status)
311{ 316{
312 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 317 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
313 318
314 cmd_pid = 0; 319 cmd_pid = 0;
315 320
… …
343 incr_ev.stop (); 348 incr_ev.stop ();
344 termwin_ev.stop (display); 349 termwin_ev.stop (display);
345 vt_ev.stop (display); 350 vt_ev.stop (display);
346 } 351 }
347 352
348 check_ev.stop (); 353 prepare_ev.stop ();
349 pty_ev.stop (); 354 pty_ev.stop ();
350#ifdef CURSOR_BLINK 355#ifdef CURSOR_BLINK
351 cursor_blink_ev.stop (); 356 cursor_blink_ev.stop ();
352#endif 357#endif
353#ifdef TEXT_BLINK 358#ifdef TEXT_BLINK
… …
361#endif 366#endif
362#ifdef POINTER_BLANK 367#ifdef POINTER_BLANK
363 pointer_ev.stop (); 368 pointer_ev.stop ();
364#endif 369#endif
365 370
366 destroy_ev.start (0); 371 destroy_ev.start ();
367} 372}
368 373
369void 374void
370rxvt_term::destroy_cb (time_watcher &w) 375rxvt_term::destroy_cb (ev::check &w, int revents)
371{ 376{
372 make_current (); 377 make_current ();
373 378
374 delete this; 379 delete this;
375} 380}
… …
429 else 434 else
430 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 435 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
431 mesg, BUFSIZ); 436 mesg, BUFSIZ);
432 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
433 } 438 }
434 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 439 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
435 mesg, BUFSIZ); 440 mesg, BUFSIZ);
436 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
437} 442}
438#endif 443#endif
439 444
… …
513 518
514#ifdef ENABLE_TRANSPARENCY 519#ifdef ENABLE_TRANSPARENCY
515 if (option (Opt_transparent)) 520 if (option (Opt_transparent))
516 { 521 {
517 bgPixmap.set_transparent (); 522 bgPixmap.set_transparent ();
518#ifdef HAVE_AFTERIMAGE 523#ifdef HAVE_AFTERIMAGE
519 if (rs [Rs_blurradius]) 524 if (rs [Rs_blurradius])
520 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 525 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
521#endif 526#endif
522 if (ISSET_PIXCOLOR (Color_tint)) 527 if (ISSET_PIXCOLOR (Color_tint))
523 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 528 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
524 if (rs [Rs_shade]) 529 if (rs [Rs_shade])
525 bgPixmap.set_shade (rs [Rs_shade]); 530 bgPixmap.set_shade (rs [Rs_shade]);
526 531
… …
560 init_command (cmd_argv); 565 init_command (cmd_argv);
561 566
562 free (cmd_argv); 567 free (cmd_argv);
563 568
564 if (pty->pty >= 0) 569 if (pty->pty >= 0)
565 pty_ev.start (pty->pty, EVENT_READ); 570 pty_ev.start (pty->pty, ev::READ);
566 571
567 check_ev.start (); 572 prepare_ev.start ();
568 573
569 HOOK_INVOKE ((this, HOOK_START, DT_END)); 574 HOOK_INVOKE ((this, HOOK_START, DT_END));
570 575
571#if ENABLE_XEMBED 576#if ENABLE_XEMBED
572 if (rs[Rs_embed]) 577 if (rs[Rs_embed])
… …
584 return true; 589 return true;
585} 590}
586 591
587static struct sig_handlers 592static struct sig_handlers
588{ 593{
589 sig_watcher sw_term, sw_int; 594 ev::sig sw_term, sw_int;
590 595
591 /* 596 /*
592 * Catch a fatal signal and tidy up before quitting 597 * Catch a fatal signal and tidy up before quitting
593 */ 598 */
594 void 599 void
595 sig_term (sig_watcher &w) 600 sig_term (ev::sig &w, int revents)
596 { 601 {
597 rxvt_emergency_cleanup (); 602 rxvt_emergency_cleanup ();
598 signal (w.signum, SIG_DFL); 603 w.stop ();
599 kill (getpid (), w.signum); 604 kill (getpid (), w.signum);
600 } 605 }
601 606
602 sig_handlers () 607 sig_handlers ()
603 : sw_term (this, &sig_handlers::sig_term), 608 : sw_term (this, &sig_handlers::sig_term),
… …
611void 616void
612rxvt_init () 617rxvt_init ()
613{ 618{
614 ptytty::init (); 619 ptytty::init ();
615 620
621 if (!ev::ev_default_loop (0))
622 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
623
616 rxvt_environ = environ; 624 rxvt_environ = environ;
617 625
618 signal (SIGHUP, SIG_IGN); 626 signal (SIGHUP, SIG_IGN);
619 signal (SIGPIPE, SIG_IGN); 627 signal (SIGPIPE, SIG_IGN);
620 628
621 sig_handlers.sw_term.start (SIGTERM); 629 sig_handlers.sw_term.start (SIGTERM); ev::ev_unref ();
622 sig_handlers.sw_int.start (SIGINT); 630 sig_handlers.sw_int.start (SIGINT); ev::ev_unref ();
623 631
624 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 632 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
625 /* signal (SIGURG, SIG_DFL); */ 633 /* signal (SIGURG, SIG_DFL); */
626 634
627 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 635 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
897 if (parent[0]) 905 if (parent[0])
898 { 906 {
899 resize_all_windows (0, 0, 0); 907 resize_all_windows (0, 0, 0);
900 scr_remap_chars (); 908 scr_remap_chars ();
901 scr_touch (true); 909 scr_touch (true);
902 } 910 }
903 911
904 return true; 912 return true;
905} 913}
906 914
907void 915void
… …
951rxvt_term::set_window_color (int idx, const char *color) 959rxvt_term::set_window_color (int idx, const char *color)
952{ 960{
953#ifdef XTERM_COLOR_CHANGE 961#ifdef XTERM_COLOR_CHANGE
954 rxvt_color xcol; 962 rxvt_color xcol;
955 int i; 963 int i;
956 964
957 if (color == NULL || *color == '\0') 965 if (color == NULL || *color == '\0')
958 return; 966 return;
959 967
960 color = strdup (color); 968 color = strdup (color);
961 allocated.push_back ((void *)color); 969 allocated.push_back ((void *)color);
… …
995 /*TODO: handle Color_BD, scrollbar background, etc. */ 1003 /*TODO: handle Color_BD, scrollbar background, etc. */
996 1004
997 update_fade_color (idx); 1005 update_fade_color (idx);
998 recolour_cursor (); 1006 recolour_cursor ();
999 scr_recolour (); 1007 scr_recolour ();
1000#endif /* XTERM_COLOR_CHANGE */ 1008#endif /* XTERM_COLOR_CHANGE */
1001} 1009}
1002 1010
1003void 1011void
1004rxvt_term::recolour_cursor () 1012rxvt_term::recolour_cursor ()
1005{ 1013{
… …
1342 if (term->rs[Rs_imLocale]) 1350 if (term->rs[Rs_imLocale])
1343 SET_LOCALE (term->locale); 1351 SET_LOCALE (term->locale);
1344 } 1352 }
1345 else 1353 else
1346 str = (void *)text->string.wide_char; 1354 str = (void *)text->string.wide_char;
1347 1355
1348 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1356 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1349 DT_INT, call_data->caret, 1357 DT_INT, call_data->caret,
1350 DT_INT, call_data->chg_first, 1358 DT_INT, call_data->chg_first,
1351 DT_INT, call_data->chg_length, 1359 DT_INT, call_data->chg_length,
1352 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1360 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1671 1679
1672 if (input_style & XIMPreeditPosition) 1680 if (input_style & XIMPreeditPosition)
1673 { 1681 {
1674 im_set_size (preedit_rect); 1682 im_set_size (preedit_rect);
1675 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1683 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1676 1684
1677 XSetICValues (Input_Context, 1685 XSetICValues (Input_Context,
1678 XNPreeditAttributes, preedit_attr, NULL); 1686 XNPreeditAttributes, preedit_attr, NULL);
1679 } 1687 }
1680 else 1688 else
1681 { 1689 {
… …
1698 XFree (status_attr); 1706 XFree (status_attr);
1699 } 1707 }
1700 1708
1701 XFree (preedit_attr); 1709 XFree (preedit_attr);
1702} 1710}
1703#endif /* USE_XIM */ 1711#endif /* USE_XIM */
1704 1712
1705void 1713void
1706rxvt_term::get_window_origin (int &x, int &y) 1714rxvt_term::get_window_origin (int &x, int &y)
1707{ 1715{
1708 Window cr; 1716 Window cr;
… …
1735int 1743int
1736rxvt_term::update_background () 1744rxvt_term::update_background ()
1737{ 1745{
1738 bgPixmap.invalidate (); 1746 bgPixmap.invalidate ();
1739 1747
1740 /* no chance of real time refresh if we are blurring ! */ 1748 /* no chance of real time refresh if we are blurring! */
1741 if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1749 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1742 bgPixmap.render (); 1750 bgPixmap.render ();
1743 else 1751 else
1744 { 1752 {
1745 update_background_ev.stop (); 1753 update_background_ev.stop ();
1754
1746 if (!bgPixmap.need_client_side_rendering()) 1755 if (!bgPixmap.need_client_side_rendering())
1747 update_background_ev.start (NOW + .05); 1756 update_background_ev.start (.05);
1748 else if (bgPixmap.flags & bgPixmap_t::blurNeeded) 1757 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1749 update_background_ev.start (NOW + .2); /* very slow !!! */ 1758 update_background_ev.start (.20); /* very slow !!! */
1750 else 1759 else
1751 update_background_ev.start (NOW + .07); 1760 update_background_ev.start (.07);
1752 } 1761 }
1762
1753 return 0; 1763 return 0;
1754} 1764}
1755 1765
1756void 1766void
1757rxvt_term::update_background_cb (time_watcher &w) 1767rxvt_term::update_background_cb (ev::timer &w, int revents)
1758{ 1768{
1759 bgPixmap.render (); 1769 bgPixmap.render ();
1760} 1770}
1761 1771
1762#endif /* HAVE_BG_PIXMAP */ 1772#endif /* HAVE_BG_PIXMAP */

Diff Legend

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