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.251 by sasha, Tue Sep 18 22:01:36 2007 UTC vs.
Revision 1.262 by ayin, Wed Nov 21 09:15:33 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
201#endif 206#endif
202} 207}
203 208
204// clean up the most important stuff, do *not* call x or free mem etc. 209// clean up the most important stuff, do *not* call x or free mem etc.
205// for use before an emergency exit 210// for use before an emergency exit
211void
206void rxvt_term::emergency_cleanup () 212rxvt_term::emergency_cleanup ()
207{ 213{
208 if (cmd_pid) 214 if (cmd_pid)
209 kill (-cmd_pid, SIGHUP); 215 kill (-cmd_pid, SIGHUP);
210 216
211 pty_ev.stop (); 217 pty_ev.stop ();
278 delete [] pix_colors_focused; 284 delete [] pix_colors_focused;
279#if OFF_FOCUS_FADING 285#if OFF_FOCUS_FADING
280 delete [] pix_colors_unfocused; 286 delete [] pix_colors_unfocused;
281#endif 287#endif
282 288
289#ifdef HAVE_BG_PIXMAP
290 bgPixmap.destroy ();
291#endif
283 displays.put (display); 292 displays.put (display);
284 293
285 scr_release (); 294 scr_release ();
286 295
287 /* clear all resources */ 296 /* clear all resources */
304#endif 313#endif
305} 314}
306 315
307// child has exited, usually destroys 316// child has exited, usually destroys
308void 317void
309rxvt_term::child_cb (child_watcher &w, int status) 318rxvt_term::child_cb (ev::child &w, int status)
310{ 319{
311 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 320 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
312 321
313 cmd_pid = 0; 322 cmd_pid = 0;
314 323
342 incr_ev.stop (); 351 incr_ev.stop ();
343 termwin_ev.stop (display); 352 termwin_ev.stop (display);
344 vt_ev.stop (display); 353 vt_ev.stop (display);
345 } 354 }
346 355
347 check_ev.stop (); 356 prepare_ev.stop ();
348 pty_ev.stop (); 357 pty_ev.stop ();
349#ifdef CURSOR_BLINK 358#ifdef CURSOR_BLINK
350 cursor_blink_ev.stop (); 359 cursor_blink_ev.stop ();
351#endif 360#endif
352#ifdef TEXT_BLINK 361#ifdef TEXT_BLINK
360#endif 369#endif
361#ifdef POINTER_BLANK 370#ifdef POINTER_BLANK
362 pointer_ev.stop (); 371 pointer_ev.stop ();
363#endif 372#endif
364 373
365 destroy_ev.start (0); 374 destroy_ev.start ();
366} 375}
367 376
368void 377void
369rxvt_term::destroy_cb (time_watcher &w) 378rxvt_term::destroy_cb (ev::idle &w, int revents)
370{ 379{
371 make_current (); 380 make_current ();
372 381
373 delete this; 382 delete this;
374} 383}
428 else 437 else
429 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 438 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
430 mesg, BUFSIZ); 439 mesg, BUFSIZ);
431 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 440 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
432 } 441 }
433 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 442 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
434 mesg, BUFSIZ); 443 mesg, BUFSIZ);
435 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 444 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
436} 445}
437#endif 446#endif
438 447
512 521
513#ifdef ENABLE_TRANSPARENCY 522#ifdef ENABLE_TRANSPARENCY
514 if (option (Opt_transparent)) 523 if (option (Opt_transparent))
515 { 524 {
516 bgPixmap.set_transparent (); 525 bgPixmap.set_transparent ();
517#ifdef HAVE_AFTERIMAGE 526#ifdef HAVE_AFTERIMAGE
518 if (rs [Rs_blurradius]) 527 if (rs [Rs_blurradius])
519 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 528 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
520#endif 529#endif
521 if (ISSET_PIXCOLOR (Color_tint)) 530 if (ISSET_PIXCOLOR (Color_tint))
522 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 531 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
523 if (rs [Rs_shade]) 532 if (rs [Rs_shade])
524 bgPixmap.set_shade (rs [Rs_shade]); 533 bgPixmap.set_shade (rs [Rs_shade]);
525 534
559 init_command (cmd_argv); 568 init_command (cmd_argv);
560 569
561 free (cmd_argv); 570 free (cmd_argv);
562 571
563 if (pty->pty >= 0) 572 if (pty->pty >= 0)
564 pty_ev.start (pty->pty, EVENT_READ); 573 pty_ev.start (pty->pty, ev::READ);
565 574
566 check_ev.start (); 575 prepare_ev.start ();
567 576
568 HOOK_INVOKE ((this, HOOK_START, DT_END)); 577 HOOK_INVOKE ((this, HOOK_START, DT_END));
569 578
570#if ENABLE_XEMBED 579#if ENABLE_XEMBED
571 if (rs[Rs_embed]) 580 if (rs[Rs_embed])
583 return true; 592 return true;
584} 593}
585 594
586static struct sig_handlers 595static struct sig_handlers
587{ 596{
588 sig_watcher sw_term, sw_int; 597 ev::sig sw_term, sw_int;
589 598
590 /* 599 /*
591 * Catch a fatal signal and tidy up before quitting 600 * Catch a fatal signal and tidy up before quitting
592 */ 601 */
593 void 602 void
594 sig_term (sig_watcher &w) 603 sig_term (ev::sig &w, int revents)
595 { 604 {
596 rxvt_emergency_cleanup (); 605 rxvt_emergency_cleanup ();
597 signal (w.signum, SIG_DFL); 606 w.stop ();
598 kill (getpid (), w.signum); 607 kill (getpid (), w.signum);
599 } 608 }
600 609
601 sig_handlers () 610 sig_handlers ()
602 : sw_term (this, &sig_handlers::sig_term), 611 : sw_term (this, &sig_handlers::sig_term),
610void 619void
611rxvt_init () 620rxvt_init ()
612{ 621{
613 ptytty::init (); 622 ptytty::init ();
614 623
624 if (!ev::ev_default_loop (0))
625 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
626
615 rxvt_environ = environ; 627 rxvt_environ = environ;
616 628
617 signal (SIGHUP, SIG_IGN); 629 signal (SIGHUP, SIG_IGN);
618 signal (SIGPIPE, SIG_IGN); 630 signal (SIGPIPE, SIG_IGN);
619 631
620 sig_handlers.sw_term.start (SIGTERM); 632 sig_handlers.sw_term.start (SIGTERM); ev::ev_unref ();
621 sig_handlers.sw_int.start (SIGINT); 633 sig_handlers.sw_int.start (SIGINT); ev::ev_unref ();
622 634
623 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 635 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
624 /* signal (SIGURG, SIG_DFL); */ 636 /* signal (SIGURG, SIG_DFL); */
625 637
626 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 638 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
896 if (parent[0]) 908 if (parent[0])
897 { 909 {
898 resize_all_windows (0, 0, 0); 910 resize_all_windows (0, 0, 0);
899 scr_remap_chars (); 911 scr_remap_chars ();
900 scr_touch (true); 912 scr_touch (true);
901 } 913 }
902 914
903 return true; 915 return true;
904} 916}
905 917
918void
906void rxvt_term::set_string_property (Atom prop, const char *str, int len) 919rxvt_term::set_string_property (Atom prop, const char *str, int len)
907{ 920{
908 XChangeProperty (dpy, parent[0], 921 XChangeProperty (dpy, parent[0],
909 prop, XA_STRING, 8, PropModeReplace, 922 prop, XA_STRING, 8, PropModeReplace,
910 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 923 (const unsigned char *)str, len >= 0 ? len : strlen (str));
911} 924}
912 925
926void
913void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 927rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
914{ 928{
915 wchar_t *ws = rxvt_mbstowcs (str, len); 929 wchar_t *ws = rxvt_mbstowcs (str, len);
916 char *s = rxvt_wcstoutf8 (ws); 930 char *s = rxvt_wcstoutf8 (ws);
917 931
918 XChangeProperty (dpy, parent[0], 932 XChangeProperty (dpy, parent[0],
942#if ENABLE_EWMH 956#if ENABLE_EWMH
943 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 957 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
944#endif 958#endif
945} 959}
946 960
961void
962rxvt_term::set_window_color (int idx, const char *color)
963{
947#ifdef XTERM_COLOR_CHANGE 964#ifdef XTERM_COLOR_CHANGE
948void
949rxvt_term::set_window_color (int idx, const char *color)
950{
951 rxvt_color xcol; 965 rxvt_color xcol;
952 int i; 966 int i;
953 967
954 if (color == NULL || *color == '\0') 968 if (color == NULL || *color == '\0')
955 return; 969 return;
956 970
957 color = strdup (color); 971 color = strdup (color);
958 allocated.push_back ((void *)color); 972 allocated.push_back ((void *)color);
992 /*TODO: handle Color_BD, scrollbar background, etc. */ 1006 /*TODO: handle Color_BD, scrollbar background, etc. */
993 1007
994 update_fade_color (idx); 1008 update_fade_color (idx);
995 recolour_cursor (); 1009 recolour_cursor ();
996 scr_recolour (); 1010 scr_recolour ();
1011#endif /* XTERM_COLOR_CHANGE */
997} 1012}
998
999#else
1000# define set_window_color (idx,color) ((void)0)
1001#endif /* XTERM_COLOR_CHANGE */
1002 1013
1003void 1014void
1004rxvt_term::recolour_cursor () 1015rxvt_term::recolour_cursor ()
1005{ 1016{
1006 XColor fg, bg; 1017 XColor fg, bg;
1342 if (term->rs[Rs_imLocale]) 1353 if (term->rs[Rs_imLocale])
1343 SET_LOCALE (term->locale); 1354 SET_LOCALE (term->locale);
1344 } 1355 }
1345 else 1356 else
1346 str = (void *)text->string.wide_char; 1357 str = (void *)text->string.wide_char;
1347 1358
1348 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1359 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1349 DT_INT, call_data->caret, 1360 DT_INT, call_data->caret,
1350 DT_INT, call_data->chg_first, 1361 DT_INT, call_data->chg_first,
1351 DT_INT, call_data->chg_length, 1362 DT_INT, call_data->chg_length,
1352 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1363 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1671 1682
1672 if (input_style & XIMPreeditPosition) 1683 if (input_style & XIMPreeditPosition)
1673 { 1684 {
1674 im_set_size (preedit_rect); 1685 im_set_size (preedit_rect);
1675 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1686 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1676 1687
1677 XSetICValues (Input_Context, 1688 XSetICValues (Input_Context,
1678 XNPreeditAttributes, preedit_attr, NULL); 1689 XNPreeditAttributes, preedit_attr, NULL);
1679 } 1690 }
1680 else 1691 else
1681 { 1692 {
1698 XFree (status_attr); 1709 XFree (status_attr);
1699 } 1710 }
1700 1711
1701 XFree (preedit_attr); 1712 XFree (preedit_attr);
1702} 1713}
1703#endif /* USE_XIM */ 1714#endif /* USE_XIM */
1704 1715
1705void 1716void
1706rxvt_term::get_window_origin (int &x, int &y) 1717rxvt_term::get_window_origin (int &x, int &y)
1707{ 1718{
1708 Window cr; 1719 Window cr;
1730 } 1741 }
1731 return None; 1742 return None;
1732} 1743}
1733 1744
1734#ifdef HAVE_BG_PIXMAP 1745#ifdef HAVE_BG_PIXMAP
1746# if TRACE_PIXMAPS
1747# undef update_background
1748int rxvt_term::trace_update_background (const char* file, int line)
1749{
1750 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1751 update_background ();
1752}
1753# endif
1735int 1754int
1736rxvt_term::update_background () 1755rxvt_term::update_background ()
1737{ 1756{
1738 bgPixmap.invalidate (); 1757 bgPixmap.invalidate ();
1739 1758
1740 /* no chance of real time refresh if we are blurring ! */ 1759 /* no chance of real time refresh if we are blurring! */
1741 if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1760 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1742 bgPixmap.render (); 1761 bgPixmap.render ();
1743 else 1762 else
1744 { 1763 {
1745 update_background_ev.stop (); 1764 update_background_ev.stop ();
1765
1746 if (!bgPixmap.need_client_side_rendering()) 1766 if (!bgPixmap.need_client_side_rendering())
1747 update_background_ev.start (NOW + .05); 1767 update_background_ev.start (.05);
1748 else if (bgPixmap.flags & bgPixmap_t::blurNeeded) 1768 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1749 update_background_ev.start (NOW + .2); /* very slow !!! */ 1769 update_background_ev.start (.20); /* very slow !!! */
1750 else 1770 else
1751 update_background_ev.start (NOW + .07); 1771 update_background_ev.start (.07);
1752 } 1772 }
1773
1753 return 0; 1774 return 0;
1754} 1775}
1755 1776
1756void 1777void
1757rxvt_term::update_background_cb (time_watcher &w) 1778rxvt_term::update_background_cb (ev::timer &w, int revents)
1758{ 1779{
1759 bgPixmap.render (); 1780 bgPixmap.render ();
1760} 1781}
1761 1782
1762#endif /* HAVE_BG_PIXMAP */ 1783#endif /* HAVE_BG_PIXMAP */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines