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.244 by sasha, Fri Aug 17 22:01:32 2007 UTC vs.
Revision 1.260 by root, Sun Nov 18 02:45:26 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{
… …
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 ();
… …
304#endif 310#endif
305} 311}
306 312
307// child has exited, usually destroys 313// child has exited, usually destroys
308void 314void
309rxvt_term::child_cb (child_watcher &w, int status) 315rxvt_term::child_cb (ev::child &w, int status)
310{ 316{
311 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 317 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
312 318
313 cmd_pid = 0; 319 cmd_pid = 0;
314 320
… …
342 incr_ev.stop (); 348 incr_ev.stop ();
343 termwin_ev.stop (display); 349 termwin_ev.stop (display);
344 vt_ev.stop (display); 350 vt_ev.stop (display);
345 } 351 }
346 352
347 check_ev.stop (); 353 prepare_ev.stop ();
348 pty_ev.stop (); 354 pty_ev.stop ();
349#ifdef CURSOR_BLINK 355#ifdef CURSOR_BLINK
350 cursor_blink_ev.stop (); 356 cursor_blink_ev.stop ();
351#endif 357#endif
352#ifdef TEXT_BLINK 358#ifdef TEXT_BLINK
… …
360#endif 366#endif
361#ifdef POINTER_BLANK 367#ifdef POINTER_BLANK
362 pointer_ev.stop (); 368 pointer_ev.stop ();
363#endif 369#endif
364 370
365 destroy_ev.start (0); 371 destroy_ev.start ();
366} 372}
367 373
368void 374void
369rxvt_term::destroy_cb (time_watcher &w) 375rxvt_term::destroy_cb (ev::idle &w, int revents)
370{ 376{
371 make_current (); 377 make_current ();
372 378
373 delete this; 379 delete this;
374} 380}
… …
428 else 434 else
429 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 435 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
430 mesg, BUFSIZ); 436 mesg, BUFSIZ);
431 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
432 } 438 }
433 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 439 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
434 mesg, BUFSIZ); 440 mesg, BUFSIZ);
435 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
436} 442}
437#endif 443#endif
438 444
… …
512 518
513#ifdef ENABLE_TRANSPARENCY 519#ifdef ENABLE_TRANSPARENCY
514 if (option (Opt_transparent)) 520 if (option (Opt_transparent))
515 { 521 {
516 bgPixmap.set_transparent (); 522 bgPixmap.set_transparent ();
517#ifdef HAVE_AFTERIMAGE 523#ifdef HAVE_AFTERIMAGE
518 if (rs [Rs_blurradius]) 524 if (rs [Rs_blurradius])
519 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 525 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
520#endif 526#endif
521 if (ISSET_PIXCOLOR (Color_tint)) 527 if (ISSET_PIXCOLOR (Color_tint))
522 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 528 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
523 if (rs [Rs_shade]) 529 if (rs [Rs_shade])
524 bgPixmap.set_shade (rs [Rs_shade]); 530 bgPixmap.set_shade (rs [Rs_shade]);
525 531
… …
527 XSelectInput (dpy, display->root, PropertyChangeMask); 533 XSelectInput (dpy, display->root, PropertyChangeMask);
528 rootwin_ev.start (display, display->root); 534 rootwin_ev.start (display, display->root);
529 } 535 }
530#endif 536#endif
531 537
532#ifdef XPM_BACKGROUND 538#ifdef BG_IMAGE_FROM_FILE
533 if (rs[Rs_backgroundPixmap] != NULL) 539 if (rs[Rs_backgroundPixmap] != NULL)
534 { 540 {
535 const char *p = rs[Rs_backgroundPixmap]; 541 const char *p = rs[Rs_backgroundPixmap];
536 542
537 if ((p = strchr (p, ';')) != NULL) 543 if ((p = strchr (p, ';')) != NULL)
… …
540 bgPixmap.set_geometry (p); 546 bgPixmap.set_geometry (p);
541 } 547 }
542 else 548 else
543 bgPixmap.set_defaultGeometry (); 549 bgPixmap.set_defaultGeometry ();
544 550
545 bgPixmap.set_file (rs[Rs_backgroundPixmap]); 551 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
552 if (!bgPixmap.window_position_sensitive ())
553 update_background ();
546 } 554 }
547 /* do not want to render Pixmap yet if we are size/position dependant -
548 * wait for ConfigureNotify at least
549 * TODO: this does not work for some reason when transparency is disabled !!!!
550 */
551 if (!bgPixmap.window_size_sensitive ())
552 update_background();
553#endif 555#endif
554 } 556 }
555#endif 557#endif
556 558
557#if ENABLE_PERL 559#if ENABLE_PERL
… …
563 init_command (cmd_argv); 565 init_command (cmd_argv);
564 566
565 free (cmd_argv); 567 free (cmd_argv);
566 568
567 if (pty->pty >= 0) 569 if (pty->pty >= 0)
568 pty_ev.start (pty->pty, EVENT_READ); 570 pty_ev.start (pty->pty, ev::READ);
569 571
570 check_ev.start (); 572 prepare_ev.start ();
571 573
572 HOOK_INVOKE ((this, HOOK_START, DT_END)); 574 HOOK_INVOKE ((this, HOOK_START, DT_END));
573 575
574#if ENABLE_XEMBED 576#if ENABLE_XEMBED
575 if (rs[Rs_embed]) 577 if (rs[Rs_embed])
… …
587 return true; 589 return true;
588} 590}
589 591
590static struct sig_handlers 592static struct sig_handlers
591{ 593{
592 sig_watcher sw_term, sw_int; 594 ev::sig sw_term, sw_int;
593 595
594 /* 596 /*
595 * Catch a fatal signal and tidy up before quitting 597 * Catch a fatal signal and tidy up before quitting
596 */ 598 */
597 void 599 void
598 sig_term (sig_watcher &w) 600 sig_term (ev::sig &w, int revents)
599 { 601 {
600 rxvt_emergency_cleanup (); 602 rxvt_emergency_cleanup ();
601 signal (w.signum, SIG_DFL); 603 w.stop ();
602 kill (getpid (), w.signum); 604 kill (getpid (), w.signum);
603 } 605 }
604 606
605 sig_handlers () 607 sig_handlers ()
606 : sw_term (this, &sig_handlers::sig_term), 608 : sw_term (this, &sig_handlers::sig_term),
… …
614void 616void
615rxvt_init () 617rxvt_init ()
616{ 618{
617 ptytty::init (); 619 ptytty::init ();
618 620
621 if (!ev::ev_default_loop (0))
622 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
623
619 rxvt_environ = environ; 624 rxvt_environ = environ;
620 625
621 signal (SIGHUP, SIG_IGN); 626 signal (SIGHUP, SIG_IGN);
622 signal (SIGPIPE, SIG_IGN); 627 signal (SIGPIPE, SIG_IGN);
623 628
624 sig_handlers.sw_term.start (SIGTERM); 629 sig_handlers.sw_term.start (SIGTERM); ev::ev_unref ();
625 sig_handlers.sw_int.start (SIGINT); 630 sig_handlers.sw_int.start (SIGINT); ev::ev_unref ();
626 631
627 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 632 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
628 /* signal (SIGURG, SIG_DFL); */ 633 /* signal (SIGURG, SIG_DFL); */
629 634
630 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 635 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
900 if (parent[0]) 905 if (parent[0])
901 { 906 {
902 resize_all_windows (0, 0, 0); 907 resize_all_windows (0, 0, 0);
903 scr_remap_chars (); 908 scr_remap_chars ();
904 scr_touch (true); 909 scr_touch (true);
905 } 910 }
906 911
907 return true; 912 return true;
908} 913}
909 914
915void
910void rxvt_term::set_string_property (Atom prop, const char *str, int len) 916rxvt_term::set_string_property (Atom prop, const char *str, int len)
911{ 917{
912 XChangeProperty (dpy, parent[0], 918 XChangeProperty (dpy, parent[0],
913 prop, XA_STRING, 8, PropModeReplace, 919 prop, XA_STRING, 8, PropModeReplace,
914 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 920 (const unsigned char *)str, len >= 0 ? len : strlen (str));
915} 921}
916 922
923void
917void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 924rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
918{ 925{
919 wchar_t *ws = rxvt_mbstowcs (str, len); 926 wchar_t *ws = rxvt_mbstowcs (str, len);
920 char *s = rxvt_wcstoutf8 (ws); 927 char *s = rxvt_wcstoutf8 (ws);
921 928
922 XChangeProperty (dpy, parent[0], 929 XChangeProperty (dpy, parent[0],
… …
946#if ENABLE_EWMH 953#if ENABLE_EWMH
947 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 954 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
948#endif 955#endif
949} 956}
950 957
958void
959rxvt_term::set_window_color (int idx, const char *color)
960{
951#ifdef XTERM_COLOR_CHANGE 961#ifdef XTERM_COLOR_CHANGE
952void
953rxvt_term::set_window_color (int idx, const char *color)
954{
955 rxvt_color xcol; 962 rxvt_color xcol;
956 int i; 963 int i;
957 964
958 if (color == NULL || *color == '\0') 965 if (color == NULL || *color == '\0')
959 return; 966 return;
960 967
961 color = strdup (color); 968 color = strdup (color);
962 allocated.push_back ((void *)color); 969 allocated.push_back ((void *)color);
… …
996 /*TODO: handle Color_BD, scrollbar background, etc. */ 1003 /*TODO: handle Color_BD, scrollbar background, etc. */
997 1004
998 update_fade_color (idx); 1005 update_fade_color (idx);
999 recolour_cursor (); 1006 recolour_cursor ();
1000 scr_recolour (); 1007 scr_recolour ();
1008#endif /* XTERM_COLOR_CHANGE */
1001} 1009}
1002
1003#else
1004# define set_window_color (idx,color) ((void)0)
1005#endif /* XTERM_COLOR_CHANGE */
1006 1010
1007void 1011void
1008rxvt_term::recolour_cursor () 1012rxvt_term::recolour_cursor ()
1009{ 1013{
1010 XColor fg, bg; 1014 XColor fg, bg;
… …
1042 1046
1043 for (i = Color_Black; i <= Color_White; i++) 1047 for (i = Color_Black; i <= Color_White; i++)
1044 if (pix_colors[Color_bg] == pix_colors[i]) 1048 if (pix_colors[Color_bg] == pix_colors[i])
1045 { 1049 {
1046 sprintf (bstr, "%d", (i - Color_Black)); 1050 sprintf (bstr, "%d", (i - Color_Black));
1047#ifdef XPM_BACKGROUND 1051#ifdef BG_IMAGE_FROM_FILE
1048 xpmb = "default;"; 1052 xpmb = "default;";
1049#endif 1053#endif
1050 break; 1054 break;
1051 } 1055 }
1052 1056
… …
1148 1152
1149 XMoveResizeWindow (dpy, vt, 1153 XMoveResizeWindow (dpy, vt,
1150 window_vt_x, window_vt_y, 1154 window_vt_x, window_vt_y,
1151 width, height); 1155 width, height);
1152 1156
1153#ifdef XPM_BACKGROUND 1157#ifdef HAVE_BG_PIXMAP
1154 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1155 if (bgPixmap.window_size_sensitive ()) 1158 if (bgPixmap.window_size_sensitive ())
1156 update_background (); 1159 update_background ();
1157#endif 1160#endif
1158 1161
1159 scr_clear (); 1162 scr_clear ();
1160 } 1163 }
1161 1164
… …
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 */
1712
1713void
1714rxvt_term::get_window_origin (int &x, int &y)
1715{
1716 Window cr;
1717 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1718/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1719}
1720
1721Pixmap
1722rxvt_term::get_pixmap_property (int prop_id)
1723{
1724 if (prop_id > 0 && prop_id < NUM_XA)
1725 if (xa[prop_id])
1726 {
1727 int aformat;
1728 unsigned long nitems, bytes_after;
1729 Atom atype;
1730 unsigned char *prop = NULL;
1731 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1732 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1733 &nitems, &bytes_after, &prop);
1734 if (result == Success && prop && atype == XA_PIXMAP)
1735 {
1736 return *(Pixmap *)prop;
1737 }
1738 }
1739 return None;
1740}
1741
1742#ifdef HAVE_BG_PIXMAP
1743# if TRACE_PIXMAPS
1744# undef update_background
1745int rxvt_term::trace_update_background (const char* file, int line)
1746{
1747 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1748 update_background ();
1749}
1750# endif
1751int
1752rxvt_term::update_background ()
1753{
1754 bgPixmap.invalidate ();
1755
1756 /* no chance of real time refresh if we are blurring! */
1757 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1758 bgPixmap.render ();
1759 else
1760 {
1761 update_background_ev.stop ();
1762
1763 if (!bgPixmap.need_client_side_rendering())
1764 update_background_ev.start (.05);
1765 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1766 update_background_ev.start (.20); /* very slow !!! */
1767 else
1768 update_background_ev.start (.07);
1769 }
1770
1771 return 0;
1772}
1773
1774void
1775rxvt_term::update_background_cb (ev::timer &w, int revents)
1776{
1777 bgPixmap.render ();
1778}
1779
1780#endif /* HAVE_BG_PIXMAP */
1709 1781
1710/*----------------------- end-of-file (C source) -----------------------*/ 1782/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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