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.264 by root, Sat Nov 24 11:06:13 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 {
… …
176#endif 181#endif
177#ifdef POINTER_BLANK 182#ifdef POINTER_BLANK
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{
195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 200 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196 201
197 termlist.push_back (this); 202 termlist.push_back (this);
198 203
… …
279 delete [] pix_colors_focused; 284 delete [] pix_colors_focused;
280#if OFF_FOCUS_FADING 285#if OFF_FOCUS_FADING
281 delete [] pix_colors_unfocused; 286 delete [] pix_colors_unfocused;
282#endif 287#endif
283 288
289#ifdef HAVE_BG_PIXMAP
290 bgPixmap.destroy ();
291#endif
284 displays.put (display); 292 displays.put (display);
285 293
286 scr_release (); 294 scr_release ();
287 295
288 /* clear all resources */ 296 /* clear all resources */
… …
301 delete argv; 309 delete argv;
302 310
303#ifdef KEYSYM_RESOURCE 311#ifdef KEYSYM_RESOURCE
304 delete keyboard; 312 delete keyboard;
305#endif 313#endif
314#ifndef NO_RESOURCES
315 XrmDestroyDatabase (option_db);
316#endif
306} 317}
307 318
308// child has exited, usually destroys 319// child has exited, usually destroys
309void 320void
310rxvt_term::child_cb (child_watcher &w, int status) 321rxvt_term::child_cb (ev::child &w, int status)
311{ 322{
312 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 323 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
313 324
314 cmd_pid = 0; 325 cmd_pid = 0;
315 326
… …
343 incr_ev.stop (); 354 incr_ev.stop ();
344 termwin_ev.stop (display); 355 termwin_ev.stop (display);
345 vt_ev.stop (display); 356 vt_ev.stop (display);
346 } 357 }
347 358
348 check_ev.stop (); 359 prepare_ev.stop ();
349 pty_ev.stop (); 360 pty_ev.stop ();
350#ifdef CURSOR_BLINK 361#ifdef CURSOR_BLINK
351 cursor_blink_ev.stop (); 362 cursor_blink_ev.stop ();
352#endif 363#endif
353#ifdef TEXT_BLINK 364#ifdef TEXT_BLINK
… …
361#endif 372#endif
362#ifdef POINTER_BLANK 373#ifdef POINTER_BLANK
363 pointer_ev.stop (); 374 pointer_ev.stop ();
364#endif 375#endif
365 376
366 destroy_ev.start (0); 377 destroy_ev.start ();
367} 378}
368 379
369void 380void
370rxvt_term::destroy_cb (time_watcher &w) 381rxvt_term::destroy_cb (ev::idle &w, int revents)
371{ 382{
372 make_current (); 383 make_current ();
373 384
374 delete this; 385 delete this;
375} 386}
… …
429 else 440 else
430 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 441 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
431 mesg, BUFSIZ); 442 mesg, BUFSIZ);
432 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 443 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
433 } 444 }
434 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 445 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
435 mesg, BUFSIZ); 446 mesg, BUFSIZ);
436 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 447 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
437} 448}
438#endif 449#endif
439 450
… …
513 524
514#ifdef ENABLE_TRANSPARENCY 525#ifdef ENABLE_TRANSPARENCY
515 if (option (Opt_transparent)) 526 if (option (Opt_transparent))
516 { 527 {
517 bgPixmap.set_transparent (); 528 bgPixmap.set_transparent ();
518#ifdef HAVE_AFTERIMAGE 529#ifdef HAVE_AFTERIMAGE
519 if (rs [Rs_blurradius]) 530 if (rs [Rs_blurradius])
520 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 531 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
521#endif 532#endif
522 if (ISSET_PIXCOLOR (Color_tint)) 533 if (ISSET_PIXCOLOR (Color_tint))
523 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 534 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
524 if (rs [Rs_shade]) 535 if (rs [Rs_shade])
525 bgPixmap.set_shade (rs [Rs_shade]); 536 bgPixmap.set_shade (rs [Rs_shade]);
526 537
… …
560 init_command (cmd_argv); 571 init_command (cmd_argv);
561 572
562 free (cmd_argv); 573 free (cmd_argv);
563 574
564 if (pty->pty >= 0) 575 if (pty->pty >= 0)
565 pty_ev.start (pty->pty, EVENT_READ); 576 pty_ev.start (pty->pty, ev::READ);
566 577
567 check_ev.start (); 578 prepare_ev.start ();
568 579
569 HOOK_INVOKE ((this, HOOK_START, DT_END)); 580 HOOK_INVOKE ((this, HOOK_START, DT_END));
570 581
571#if ENABLE_XEMBED 582#if ENABLE_XEMBED
572 if (rs[Rs_embed]) 583 if (rs[Rs_embed])
… …
584 return true; 595 return true;
585} 596}
586 597
587static struct sig_handlers 598static struct sig_handlers
588{ 599{
589 sig_watcher sw_term, sw_int; 600 ev::sig sw_term, sw_int;
590 601
591 /* 602 /*
592 * Catch a fatal signal and tidy up before quitting 603 * Catch a fatal signal and tidy up before quitting
593 */ 604 */
594 void 605 void
595 sig_term (sig_watcher &w) 606 sig_term (ev::sig &w, int revents)
596 { 607 {
597 rxvt_emergency_cleanup (); 608 rxvt_emergency_cleanup ();
598 signal (w.signum, SIG_DFL); 609 w.stop ();
599 kill (getpid (), w.signum); 610 kill (getpid (), w.signum);
600 } 611 }
601 612
602 sig_handlers () 613 sig_handlers ()
603 : sw_term (this, &sig_handlers::sig_term), 614 : sw_term (this, &sig_handlers::sig_term),
… …
611void 622void
612rxvt_init () 623rxvt_init ()
613{ 624{
614 ptytty::init (); 625 ptytty::init ();
615 626
627 if (!ev_default_loop (0))
628 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
629
616 rxvt_environ = environ; 630 rxvt_environ = environ;
617 631
618 signal (SIGHUP, SIG_IGN); 632 signal (SIGHUP, SIG_IGN);
619 signal (SIGPIPE, SIG_IGN); 633 signal (SIGPIPE, SIG_IGN);
620 634
621 sig_handlers.sw_term.start (SIGTERM); 635 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
622 sig_handlers.sw_int.start (SIGINT); 636 sig_handlers.sw_int.start (SIGINT); ev_unref ();
623 637
624 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 638 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
625 /* signal (SIGURG, SIG_DFL); */ 639 /* signal (SIGURG, SIG_DFL); */
626 640
627 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 641 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
897 if (parent[0]) 911 if (parent[0])
898 { 912 {
899 resize_all_windows (0, 0, 0); 913 resize_all_windows (0, 0, 0);
900 scr_remap_chars (); 914 scr_remap_chars ();
901 scr_touch (true); 915 scr_touch (true);
902 } 916 }
903 917
904 return true; 918 return true;
905} 919}
906 920
907void 921void
… …
951rxvt_term::set_window_color (int idx, const char *color) 965rxvt_term::set_window_color (int idx, const char *color)
952{ 966{
953#ifdef XTERM_COLOR_CHANGE 967#ifdef XTERM_COLOR_CHANGE
954 rxvt_color xcol; 968 rxvt_color xcol;
955 int i; 969 int i;
956 970
957 if (color == NULL || *color == '\0') 971 if (color == NULL || *color == '\0')
958 return; 972 return;
959 973
960 color = strdup (color); 974 color = strdup (color);
961 allocated.push_back ((void *)color); 975 allocated.push_back ((void *)color);
… …
995 /*TODO: handle Color_BD, scrollbar background, etc. */ 1009 /*TODO: handle Color_BD, scrollbar background, etc. */
996 1010
997 update_fade_color (idx); 1011 update_fade_color (idx);
998 recolour_cursor (); 1012 recolour_cursor ();
999 scr_recolour (); 1013 scr_recolour ();
1000#endif /* XTERM_COLOR_CHANGE */ 1014#endif /* XTERM_COLOR_CHANGE */
1001} 1015}
1002 1016
1003void 1017void
1004rxvt_term::recolour_cursor () 1018rxvt_term::recolour_cursor ()
1005{ 1019{
… …
1342 if (term->rs[Rs_imLocale]) 1356 if (term->rs[Rs_imLocale])
1343 SET_LOCALE (term->locale); 1357 SET_LOCALE (term->locale);
1344 } 1358 }
1345 else 1359 else
1346 str = (void *)text->string.wide_char; 1360 str = (void *)text->string.wide_char;
1347 1361
1348 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1362 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1349 DT_INT, call_data->caret, 1363 DT_INT, call_data->caret,
1350 DT_INT, call_data->chg_first, 1364 DT_INT, call_data->chg_first,
1351 DT_INT, call_data->chg_length, 1365 DT_INT, call_data->chg_length,
1352 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1366 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1671 1685
1672 if (input_style & XIMPreeditPosition) 1686 if (input_style & XIMPreeditPosition)
1673 { 1687 {
1674 im_set_size (preedit_rect); 1688 im_set_size (preedit_rect);
1675 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1689 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1676 1690
1677 XSetICValues (Input_Context, 1691 XSetICValues (Input_Context,
1678 XNPreeditAttributes, preedit_attr, NULL); 1692 XNPreeditAttributes, preedit_attr, NULL);
1679 } 1693 }
1680 else 1694 else
1681 { 1695 {
… …
1698 XFree (status_attr); 1712 XFree (status_attr);
1699 } 1713 }
1700 1714
1701 XFree (preedit_attr); 1715 XFree (preedit_attr);
1702} 1716}
1703#endif /* USE_XIM */ 1717#endif /* USE_XIM */
1704 1718
1705void 1719void
1706rxvt_term::get_window_origin (int &x, int &y) 1720rxvt_term::get_window_origin (int &x, int &y)
1707{ 1721{
1708 Window cr; 1722 Window cr;
… …
1730 } 1744 }
1731 return None; 1745 return None;
1732} 1746}
1733 1747
1734#ifdef HAVE_BG_PIXMAP 1748#ifdef HAVE_BG_PIXMAP
1749# if TRACE_PIXMAPS
1750# undef update_background
1751int rxvt_term::trace_update_background (const char* file, int line)
1752{
1753 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1754 update_background ();
1755}
1756# endif
1735int 1757int
1736rxvt_term::update_background () 1758rxvt_term::update_background ()
1737{ 1759{
1738 bgPixmap.invalidate (); 1760 bgPixmap.invalidate ();
1739 1761
1740 /* no chance of real time refresh if we are blurring ! */ 1762 /* no chance of real time refresh if we are blurring! */
1741 if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1763 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1742 bgPixmap.render (); 1764 bgPixmap.render ();
1743 else 1765 else
1744 { 1766 {
1745 update_background_ev.stop (); 1767 update_background_ev.stop ();
1768
1746 if (!bgPixmap.need_client_side_rendering()) 1769 if (!bgPixmap.need_client_side_rendering())
1747 update_background_ev.start (NOW + .05); 1770 update_background_ev.start (.05);
1748 else if (bgPixmap.flags & bgPixmap_t::blurNeeded) 1771 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1749 update_background_ev.start (NOW + .2); /* very slow !!! */ 1772 update_background_ev.start (.20); /* very slow !!! */
1750 else 1773 else
1751 update_background_ev.start (NOW + .07); 1774 update_background_ev.start (.07);
1752 } 1775 }
1776
1753 return 0; 1777 return 0;
1754} 1778}
1755 1779
1756void 1780void
1757rxvt_term::update_background_cb (time_watcher &w) 1781rxvt_term::update_background_cb (ev::timer &w, int revents)
1758{ 1782{
1759 bgPixmap.render (); 1783 bgPixmap.render ();
1760} 1784}
1761 1785
1762#endif /* HAVE_BG_PIXMAP */ 1786#endif /* HAVE_BG_PIXMAP */

Diff Legend

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