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.272 by root, Tue Dec 11 03:30:49 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 {
… …
147 152
148} 153}
149#endif 154#endif
150 155
151rxvt_term::rxvt_term () 156rxvt_term::rxvt_term ()
152 : 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
153#if ENABLE_TRANSPARENCY || ENABLE_PERL 176#if ENABLE_TRANSPARENCY || ENABLE_PERL
154 rootwin_ev (this, &rxvt_term::rootwin_cb), 177 rootwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
155#endif
156#if HAVE_BG_PIXMAP
157 update_background_ev(this, &rxvt_term::update_background_cb),
158#endif 178#endif
159#ifdef HAVE_SCROLLBARS 179#ifdef HAVE_SCROLLBARS
160 scrollbar_ev (this, &rxvt_term::x_cb), 180 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
161#endif 181#endif
162#ifdef CURSOR_BLINK 182#ifdef USE_XIM
163 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 183 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
164#endif
165#ifdef TEXT_BLINK
166 text_blink_ev (this, &rxvt_term::text_blink_cb),
167#endif
168#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
169 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
170#endif
171#ifdef SELECTION_SCROLLING
172 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
173#endif
174#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
175 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
176#endif 184#endif
177#ifdef POINTER_BLANK 185#ifdef POINTER_BLANK
178 pointer_ev (this, &rxvt_term::pointer_cb), 186 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
179#endif 187#endif
180#ifdef USE_XIM
181 im_ev (this, &rxvt_term::im_cb),
182#endif
183#ifndef NO_BELL 188#ifndef NO_BELL
184 bell_ev (this, &rxvt_term::bell_cb), 189 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
185#endif 190#endif
186 termwin_ev (this, &rxvt_term::x_cb), 191 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
187 vt_ev (this, &rxvt_term::x_cb), 192 prepare_ev.set <rxvt_term, &rxvt_term::prepare_cb> (this);
188 child_ev (this, &rxvt_term::child_cb), 193 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
189 check_ev (this, &rxvt_term::check_cb), 194 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
190 flush_ev (this, &rxvt_term::flush_cb), 195 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
191 destroy_ev (this, &rxvt_term::destroy_cb), 196 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
192 pty_ev (this, &rxvt_term::pty_cb), 197 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
193 incr_ev (this, &rxvt_term::incr_cb) 198 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
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
199#ifdef KEYSYM_RESOURCE 204#ifdef KEYSYM_RESOURCE
… …
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
… …
318} 329}
319 330
320void 331void
321rxvt_term::destroy () 332rxvt_term::destroy ()
322{ 333{
323 if (destroy_ev.active) 334 if (ev_is_active (&destroy_ev))
324 return; 335 return;
325 336
326 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 337 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
327 338
328#if ENABLE_OVERLAY 339#if ENABLE_OVERLAY
… …
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 sig_term (ev::sig &w, int revents);
595 sig_term (sig_watcher &w) 606
607 sig_handlers ()
596 { 608 {
597 rxvt_emergency_cleanup (); 609 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
598 signal (w.signum, SIG_DFL);
599 kill (getpid (), w.signum);
600 }
601
602 sig_handlers ()
603 : sw_term (this, &sig_handlers::sig_term),
604 sw_int (this, &sig_handlers::sig_term) 610 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
605 {
606 } 611 }
607} sig_handlers; 612} sig_handlers;
608 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
609char **rxvt_environ; // startup environment 622char **rxvt_environ; // startup environment
610 623
611void 624void
612rxvt_init () 625rxvt_init ()
613{ 626{
614 ptytty::init (); 627 ptytty::init ();
628
629 if (!ev_default_loop (0))
630 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
615 631
616 rxvt_environ = environ; 632 rxvt_environ = environ;
617 633
618 signal (SIGHUP, SIG_IGN); 634 signal (SIGHUP, SIG_IGN);
619 signal (SIGPIPE, SIG_IGN); 635 signal (SIGPIPE, SIG_IGN);
620 636
621 sig_handlers.sw_term.start (SIGTERM); 637 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
622 sig_handlers.sw_int.start (SIGINT); 638 sig_handlers.sw_int.start (SIGINT); ev_unref ();
623 639
624 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 640 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
625 /* signal (SIGURG, SIG_DFL); */ 641 /* signal (SIGURG, SIG_DFL); */
626 642
627 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 643 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
897 if (parent[0]) 913 if (parent[0])
898 { 914 {
899 resize_all_windows (0, 0, 0); 915 resize_all_windows (0, 0, 0);
900 scr_remap_chars (); 916 scr_remap_chars ();
901 scr_touch (true); 917 scr_touch (true);
902 } 918 }
903 919
904 return true; 920 return true;
905} 921}
906 922
907void 923void
… …
951rxvt_term::set_window_color (int idx, const char *color) 967rxvt_term::set_window_color (int idx, const char *color)
952{ 968{
953#ifdef XTERM_COLOR_CHANGE 969#ifdef XTERM_COLOR_CHANGE
954 rxvt_color xcol; 970 rxvt_color xcol;
955 int i; 971 int i;
956 972
957 if (color == NULL || *color == '\0') 973 if (color == NULL || *color == '\0')
958 return; 974 return;
959 975
960 color = strdup (color); 976 color = strdup (color);
961 allocated.push_back ((void *)color); 977 allocated.push_back ((void *)color);
… …
965 if (isdigit (*color)) 981 if (isdigit (*color))
966 { 982 {
967 i = atoi (color); 983 i = atoi (color);
968 984
969 if (i >= 8 && i <= 15) 985 if (i >= 8 && i <= 15)
986 {
970 { /* bright colors */ 987 /* bright colors */
971 i -= 8;
972 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 988 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
973 goto done; 989 goto done;
974 } 990 }
975 991
976 if (i >= 0 && i <= 7) 992 if (i >= 0 && i <= 7)
993 {
977 { /* normal colors */ 994 /* normal colors */
978 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 995 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
979 goto done; 996 goto done;
980 } 997 }
981 } 998 }
982 999
… …
987 * so just keep gobbling up the colormap 1004 * so just keep gobbling up the colormap
988 */ 1005 */
989 1006
990 pix_colors_focused[idx] = xcol; 1007 pix_colors_focused[idx] = xcol;
991 1008
992 /* XSetWindowAttributes attr; */
993 /* Cursor cursor; */
994done: 1009done:
995 /*TODO: handle Color_BD, scrollbar background, etc. */ 1010 /*TODO: handle Color_BD, scrollbar background, etc. */
996 1011
997 update_fade_color (idx); 1012 update_fade_color (idx);
998 recolour_cursor (); 1013 recolour_cursor ();
999 scr_recolour (); 1014 scr_recolour ();
1000#endif /* XTERM_COLOR_CHANGE */ 1015#endif /* XTERM_COLOR_CHANGE */
1001} 1016}
1002 1017
1003void 1018void
1004rxvt_term::recolour_cursor () 1019rxvt_term::recolour_cursor ()
1005{ 1020{
… …
1022 */ 1037 */
1023void 1038void
1024rxvt_term::set_colorfgbg () 1039rxvt_term::set_colorfgbg ()
1025{ 1040{
1026 unsigned int i; 1041 unsigned int i;
1027 const char *xpmb = "\0"; 1042 const char *xpmb = "";
1028 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1043 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1029 1044
1030 strcpy (fstr, "default"); 1045 strcpy (fstr, "default");
1031 strcpy (bstr, "default"); 1046 strcpy (bstr, "default");
1032 for (i = Color_Black; i <= Color_White; i++) 1047 for (i = Color_Black; i <= Color_White; i++)
… …
1342 if (term->rs[Rs_imLocale]) 1357 if (term->rs[Rs_imLocale])
1343 SET_LOCALE (term->locale); 1358 SET_LOCALE (term->locale);
1344 } 1359 }
1345 else 1360 else
1346 str = (void *)text->string.wide_char; 1361 str = (void *)text->string.wide_char;
1347 1362
1348 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1363 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1349 DT_INT, call_data->caret, 1364 DT_INT, call_data->caret,
1350 DT_INT, call_data->chg_first, 1365 DT_INT, call_data->chg_first,
1351 DT_INT, call_data->chg_length, 1366 DT_INT, call_data->chg_length,
1352 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1367 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1671 1686
1672 if (input_style & XIMPreeditPosition) 1687 if (input_style & XIMPreeditPosition)
1673 { 1688 {
1674 im_set_size (preedit_rect); 1689 im_set_size (preedit_rect);
1675 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1690 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1676 1691
1677 XSetICValues (Input_Context, 1692 XSetICValues (Input_Context,
1678 XNPreeditAttributes, preedit_attr, NULL); 1693 XNPreeditAttributes, preedit_attr, NULL);
1679 } 1694 }
1680 else 1695 else
1681 { 1696 {
… …
1698 XFree (status_attr); 1713 XFree (status_attr);
1699 } 1714 }
1700 1715
1701 XFree (preedit_attr); 1716 XFree (preedit_attr);
1702} 1717}
1703#endif /* USE_XIM */ 1718#endif /* USE_XIM */
1704 1719
1705void 1720void
1706rxvt_term::get_window_origin (int &x, int &y) 1721rxvt_term::get_window_origin (int &x, int &y)
1707{ 1722{
1708 Window cr; 1723 Window cr;
… …
1730 } 1745 }
1731 return None; 1746 return None;
1732} 1747}
1733 1748
1734#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
1735int 1759int
1736rxvt_term::update_background () 1760rxvt_term::update_background ()
1737{ 1761{
1738 bgPixmap.invalidate (); 1762 bgPixmap.invalidate ();
1739 1763
1740 /* no chance of real time refresh if we are blurring ! */ 1764 /* no chance of real time refresh if we are blurring! */
1741 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))
1742 bgPixmap.render (); 1766 bgPixmap.render ();
1743 else 1767 else
1744 { 1768 {
1745 update_background_ev.stop (); 1769 update_background_ev.stop ();
1770
1746 if (!bgPixmap.need_client_side_rendering()) 1771 if (!bgPixmap.need_client_side_rendering())
1747 update_background_ev.start (NOW + .05); 1772 update_background_ev.start (.05);
1748 else if (bgPixmap.flags & bgPixmap_t::blurNeeded) 1773 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1749 update_background_ev.start (NOW + .2); /* very slow !!! */ 1774 update_background_ev.start (.20); /* very slow !!! */
1750 else 1775 else
1751 update_background_ev.start (NOW + .07); 1776 update_background_ev.start (.07);
1752 } 1777 }
1778
1753 return 0; 1779 return 0;
1754} 1780}
1755 1781
1756void 1782void
1757rxvt_term::update_background_cb (time_watcher &w) 1783rxvt_term::update_background_cb (ev::timer &w, int revents)
1758{ 1784{
1759 bgPixmap.render (); 1785 bgPixmap.render ();
1760} 1786}
1761 1787
1762#endif /* HAVE_BG_PIXMAP */ 1788#endif /* HAVE_BG_PIXMAP */

Diff Legend

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