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.254 by ayin, Thu Oct 18 09:11:42 2007 UTC vs.
Revision 1.258 by ayin, Thu Nov 15 11:36:15 2007 UTC

… …
93class rxvt_composite_vec rxvt_composite; 93class rxvt_composite_vec rxvt_composite;
94 94
95text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 95text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
96{ 96{
97 compose_char *cc; 97 compose_char *cc;
98 98
99 // break compose chains, as stupid readline really likes to duplicate 99 // break compose chains, as stupid readline really likes to duplicate
100 // composing characters for some reason near the end of a line. 100 // composing characters for some reason near the end of a line.
101 cc = (*this)[c1]; 101 cc = (*this)[c1];
102 while (cc) 102 while (cc)
103 { 103 {
… …
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{
… …
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::check &w, int revents)
376{ 376{
377 make_current (); 377 make_current ();
378 378
379 delete this; 379 delete this;
380} 380}
… …
434 else 434 else
435 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 435 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
436 mesg, BUFSIZ); 436 mesg, BUFSIZ);
437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
438 } 438 }
439 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 439 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
440 mesg, BUFSIZ); 440 mesg, BUFSIZ);
441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
442} 442}
443#endif 443#endif
444 444
… …
518 518
519#ifdef ENABLE_TRANSPARENCY 519#ifdef ENABLE_TRANSPARENCY
520 if (option (Opt_transparent)) 520 if (option (Opt_transparent))
521 { 521 {
522 bgPixmap.set_transparent (); 522 bgPixmap.set_transparent ();
523#ifdef HAVE_AFTERIMAGE 523#ifdef HAVE_AFTERIMAGE
524 if (rs [Rs_blurradius]) 524 if (rs [Rs_blurradius])
525 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 525 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
526#endif 526#endif
527 if (ISSET_PIXCOLOR (Color_tint)) 527 if (ISSET_PIXCOLOR (Color_tint))
528 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 528 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
529 if (rs [Rs_shade]) 529 if (rs [Rs_shade])
530 bgPixmap.set_shade (rs [Rs_shade]); 530 bgPixmap.set_shade (rs [Rs_shade]);
531 531
… …
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);
… …
902 if (parent[0]) 905 if (parent[0])
903 { 906 {
904 resize_all_windows (0, 0, 0); 907 resize_all_windows (0, 0, 0);
905 scr_remap_chars (); 908 scr_remap_chars ();
906 scr_touch (true); 909 scr_touch (true);
907 } 910 }
908 911
909 return true; 912 return true;
910} 913}
911 914
912void 915void
… …
956rxvt_term::set_window_color (int idx, const char *color) 959rxvt_term::set_window_color (int idx, const char *color)
957{ 960{
958#ifdef XTERM_COLOR_CHANGE 961#ifdef XTERM_COLOR_CHANGE
959 rxvt_color xcol; 962 rxvt_color xcol;
960 int i; 963 int i;
961 964
962 if (color == NULL || *color == '\0') 965 if (color == NULL || *color == '\0')
963 return; 966 return;
964 967
965 color = strdup (color); 968 color = strdup (color);
966 allocated.push_back ((void *)color); 969 allocated.push_back ((void *)color);
… …
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{
… …
1347 if (term->rs[Rs_imLocale]) 1350 if (term->rs[Rs_imLocale])
1348 SET_LOCALE (term->locale); 1351 SET_LOCALE (term->locale);
1349 } 1352 }
1350 else 1353 else
1351 str = (void *)text->string.wide_char; 1354 str = (void *)text->string.wide_char;
1352 1355
1353 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1356 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1354 DT_INT, call_data->caret, 1357 DT_INT, call_data->caret,
1355 DT_INT, call_data->chg_first, 1358 DT_INT, call_data->chg_first,
1356 DT_INT, call_data->chg_length, 1359 DT_INT, call_data->chg_length,
1357 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,
… …
1676 1679
1677 if (input_style & XIMPreeditPosition) 1680 if (input_style & XIMPreeditPosition)
1678 { 1681 {
1679 im_set_size (preedit_rect); 1682 im_set_size (preedit_rect);
1680 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1683 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1681 1684
1682 XSetICValues (Input_Context, 1685 XSetICValues (Input_Context,
1683 XNPreeditAttributes, preedit_attr, NULL); 1686 XNPreeditAttributes, preedit_attr, NULL);
1684 } 1687 }
1685 else 1688 else
1686 { 1689 {
… …
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;
… …
1740int 1743int
1741rxvt_term::update_background () 1744rxvt_term::update_background ()
1742{ 1745{
1743 bgPixmap.invalidate (); 1746 bgPixmap.invalidate ();
1744 1747
1745 /* no chance of real time refresh if we are blurring ! */ 1748 /* no chance of real time refresh if we are blurring! */
1746 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))
1747 bgPixmap.render (); 1750 bgPixmap.render ();
1748 else 1751 else
1749 { 1752 {
1750 update_background_ev.stop (); 1753 update_background_ev.stop ();
1754
1751 if (!bgPixmap.need_client_side_rendering()) 1755 if (!bgPixmap.need_client_side_rendering())
1752 update_background_ev.start (NOW + .05); 1756 update_background_ev.start (.05);
1753 else if (bgPixmap.flags & bgPixmap_t::blurNeeded) 1757 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1754 update_background_ev.start (NOW + .2); /* very slow !!! */ 1758 update_background_ev.start (.20); /* very slow !!! */
1755 else 1759 else
1756 update_background_ev.start (NOW + .07); 1760 update_background_ev.start (.07);
1757 } 1761 }
1762
1758 return 0; 1763 return 0;
1759} 1764}
1760 1765
1761void 1766void
1762rxvt_term::update_background_cb (time_watcher &w) 1767rxvt_term::update_background_cb (ev::timer &w, int revents)
1763{ 1768{
1764 bgPixmap.render (); 1769 bgPixmap.render ();
1765} 1770}
1766 1771
1767#endif /* HAVE_BG_PIXMAP */ 1772#endif /* HAVE_BG_PIXMAP */

Diff Legend

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