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.240 by sasha, Fri Aug 10 22:10:36 2007 UTC vs.
Revision 1.257 by root, Sun Nov 11 17:10:45 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 {
… …
151rxvt_term::rxvt_term () 156rxvt_term::rxvt_term ()
152 : 157 :
153#if ENABLE_TRANSPARENCY || ENABLE_PERL 158#if ENABLE_TRANSPARENCY || ENABLE_PERL
154 rootwin_ev (this, &rxvt_term::rootwin_cb), 159 rootwin_ev (this, &rxvt_term::rootwin_cb),
155#endif 160#endif
156#if ENABLE_TRANSPARENCY 161#if HAVE_BG_PIXMAP
157 check_our_parents_ev(this, &rxvt_term::check_our_parents_cb), 162 update_background_ev(this, &rxvt_term::update_background_cb),
158#endif 163#endif
159#ifdef HAVE_SCROLLBARS 164#ifdef HAVE_SCROLLBARS
160 scrollbar_ev (this, &rxvt_term::x_cb), 165 scrollbar_ev (this, &rxvt_term::x_cb),
161#endif 166#endif
162#ifdef CURSOR_BLINK 167#ifdef CURSOR_BLINK
… …
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::check &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
… …
506 if (option (Opt_scrollBar)) 512 if (option (Opt_scrollBar))
507 resize_scrollbar (); /* create and map scrollbar */ 513 resize_scrollbar (); /* create and map scrollbar */
508#endif 514#endif
509#ifdef HAVE_BG_PIXMAP 515#ifdef HAVE_BG_PIXMAP
510 { 516 {
511 bool changed = false;
512 bgPixmap.set_target (this); 517 bgPixmap.set_target (this);
513 518
514#ifdef ENABLE_TRANSPARENCY 519#ifdef ENABLE_TRANSPARENCY
515 if (option (Opt_transparent)) 520 if (option (Opt_transparent))
516 { 521 {
517 bgPixmap.set_transparent (); 522 bgPixmap.set_transparent ();
518#ifdef HAVE_AFTERIMAGE 523#ifdef HAVE_AFTERIMAGE
519 if (rs [Rs_blurradius]) 524 if (rs [Rs_blurradius])
520 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 525 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
521#endif 526#endif
522 if (ISSET_PIXCOLOR (Color_tint)) 527 if (ISSET_PIXCOLOR (Color_tint))
523 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 528 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
524 if (rs [Rs_shade]) 529 if (rs [Rs_shade])
525 bgPixmap.set_shade (rs [Rs_shade]); 530 bgPixmap.set_shade (rs [Rs_shade]);
526 changed = true;
527 531
528 bgPixmap.set_root_pixmap (); 532 bgPixmap.set_root_pixmap ();
529 XSelectInput (dpy, display->root, PropertyChangeMask); 533 XSelectInput (dpy, display->root, PropertyChangeMask);
530 rootwin_ev.start (display, display->root); 534 rootwin_ev.start (display, display->root);
531 } 535 }
532#endif 536#endif
533 537
534#ifdef XPM_BACKGROUND 538#ifdef BG_IMAGE_FROM_FILE
535 if (rs[Rs_backgroundPixmap] != NULL) 539 if (rs[Rs_backgroundPixmap] != NULL)
536 { 540 {
537 const char *p = rs[Rs_backgroundPixmap]; 541 const char *p = rs[Rs_backgroundPixmap];
538 542
539 if ((p = strchr (p, ';')) != NULL) 543 if ((p = strchr (p, ';')) != NULL)
… …
542 bgPixmap.set_geometry (p); 546 bgPixmap.set_geometry (p);
543 } 547 }
544 else 548 else
545 bgPixmap.set_defaultGeometry (); 549 bgPixmap.set_defaultGeometry ();
546 550
547 changed = bgPixmap.set_file (rs[Rs_backgroundPixmap]); 551 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
552 if (!bgPixmap.window_position_sensitive ())
553 update_background ();
548 } 554 }
549#endif 555#endif
550 if (changed)
551 {
552 bgPixmap.render_background ();
553 scr_touch (true);
554 }
555 } 556 }
556#endif 557#endif
557 558
558#if ENABLE_PERL 559#if ENABLE_PERL
559 rootwin_ev.start (display, display->root); 560 rootwin_ev.start (display, display->root);
… …
564 init_command (cmd_argv); 565 init_command (cmd_argv);
565 566
566 free (cmd_argv); 567 free (cmd_argv);
567 568
568 if (pty->pty >= 0) 569 if (pty->pty >= 0)
569 pty_ev.start (pty->pty, EVENT_READ); 570 pty_ev.start (pty->pty, ev::READ);
570 571
571 check_ev.start (); 572 prepare_ev.start ();
572 573
573 HOOK_INVOKE ((this, HOOK_START, DT_END)); 574 HOOK_INVOKE ((this, HOOK_START, DT_END));
574 575
575#if ENABLE_XEMBED 576#if ENABLE_XEMBED
576 if (rs[Rs_embed]) 577 if (rs[Rs_embed])
… …
588 return true; 589 return true;
589} 590}
590 591
591static struct sig_handlers 592static struct sig_handlers
592{ 593{
593 sig_watcher sw_term, sw_int; 594 ev::sig sw_term, sw_int;
594 595
595 /* 596 /*
596 * Catch a fatal signal and tidy up before quitting 597 * Catch a fatal signal and tidy up before quitting
597 */ 598 */
598 void 599 void
599 sig_term (sig_watcher &w) 600 sig_term (ev::sig &w, int revents)
600 { 601 {
601 rxvt_emergency_cleanup (); 602 rxvt_emergency_cleanup ();
602 signal (w.signum, SIG_DFL); 603 w.stop ();
603 kill (getpid (), w.signum); 604 kill (getpid (), w.signum);
604 } 605 }
605 606
606 sig_handlers () 607 sig_handlers ()
607 : sw_term (this, &sig_handlers::sig_term), 608 : sw_term (this, &sig_handlers::sig_term),
… …
615void 616void
616rxvt_init () 617rxvt_init ()
617{ 618{
618 ptytty::init (); 619 ptytty::init ();
619 620
621 if (!ev::ev_default_loop (0))
622 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
623
620 rxvt_environ = environ; 624 rxvt_environ = environ;
621 625
622 signal (SIGHUP, SIG_IGN); 626 signal (SIGHUP, SIG_IGN);
623 signal (SIGPIPE, SIG_IGN); 627 signal (SIGPIPE, SIG_IGN);
624 628
625 sig_handlers.sw_term.start (SIGTERM); 629 sig_handlers.sw_term.start (SIGTERM); ev::ev_unref ();
626 sig_handlers.sw_int.start (SIGINT); 630 sig_handlers.sw_int.start (SIGINT); ev::ev_unref ();
627 631
628 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 632 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
629 /* signal (SIGURG, SIG_DFL); */ 633 /* signal (SIGURG, SIG_DFL); */
630 634
631 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 635 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
901 if (parent[0]) 905 if (parent[0])
902 { 906 {
903 resize_all_windows (0, 0, 0); 907 resize_all_windows (0, 0, 0);
904 scr_remap_chars (); 908 scr_remap_chars ();
905 scr_touch (true); 909 scr_touch (true);
906 } 910 }
907 911
908 return true; 912 return true;
909} 913}
910 914
915void
911void rxvt_term::set_string_property (Atom prop, const char *str, int len) 916rxvt_term::set_string_property (Atom prop, const char *str, int len)
912{ 917{
913 XChangeProperty (dpy, parent[0], 918 XChangeProperty (dpy, parent[0],
914 prop, XA_STRING, 8, PropModeReplace, 919 prop, XA_STRING, 8, PropModeReplace,
915 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 920 (const unsigned char *)str, len >= 0 ? len : strlen (str));
916} 921}
917 922
923void
918void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 924rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
919{ 925{
920 wchar_t *ws = rxvt_mbstowcs (str, len); 926 wchar_t *ws = rxvt_mbstowcs (str, len);
921 char *s = rxvt_wcstoutf8 (ws); 927 char *s = rxvt_wcstoutf8 (ws);
922 928
923 XChangeProperty (dpy, parent[0], 929 XChangeProperty (dpy, parent[0],
… …
947#if ENABLE_EWMH 953#if ENABLE_EWMH
948 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 954 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
949#endif 955#endif
950} 956}
951 957
958void
959rxvt_term::set_window_color (int idx, const char *color)
960{
952#ifdef XTERM_COLOR_CHANGE 961#ifdef XTERM_COLOR_CHANGE
953void
954rxvt_term::set_window_color (int idx, const char *color)
955{
956 rxvt_color xcol; 962 rxvt_color xcol;
957 int i; 963 int i;
958 964
959 if (color == NULL || *color == '\0') 965 if (color == NULL || *color == '\0')
960 return; 966 return;
961 967
962 color = strdup (color); 968 color = strdup (color);
963 allocated.push_back ((void *)color); 969 allocated.push_back ((void *)color);
… …
997 /*TODO: handle Color_BD, scrollbar background, etc. */ 1003 /*TODO: handle Color_BD, scrollbar background, etc. */
998 1004
999 update_fade_color (idx); 1005 update_fade_color (idx);
1000 recolour_cursor (); 1006 recolour_cursor ();
1001 scr_recolour (); 1007 scr_recolour ();
1002}
1003
1004#else
1005# define set_window_color (idx,color) ((void)0)
1006#endif /* XTERM_COLOR_CHANGE */ 1008#endif /* XTERM_COLOR_CHANGE */
1009}
1007 1010
1008void 1011void
1009rxvt_term::recolour_cursor () 1012rxvt_term::recolour_cursor ()
1010{ 1013{
1011 XColor fg, bg; 1014 XColor fg, bg;
… …
1043 1046
1044 for (i = Color_Black; i <= Color_White; i++) 1047 for (i = Color_Black; i <= Color_White; i++)
1045 if (pix_colors[Color_bg] == pix_colors[i]) 1048 if (pix_colors[Color_bg] == pix_colors[i])
1046 { 1049 {
1047 sprintf (bstr, "%d", (i - Color_Black)); 1050 sprintf (bstr, "%d", (i - Color_Black));
1048#ifdef XPM_BACKGROUND 1051#ifdef BG_IMAGE_FROM_FILE
1049 xpmb = "default;"; 1052 xpmb = "default;";
1050#endif 1053#endif
1051 break; 1054 break;
1052 } 1055 }
1053 1056
… …
1149 1152
1150 XMoveResizeWindow (dpy, vt, 1153 XMoveResizeWindow (dpy, vt,
1151 window_vt_x, window_vt_y, 1154 window_vt_x, window_vt_y,
1152 width, height); 1155 width, height);
1153 1156
1157#ifdef HAVE_BG_PIXMAP
1158 if (bgPixmap.window_size_sensitive ())
1159 update_background ();
1160#endif
1161
1154 scr_clear (); 1162 scr_clear ();
1155#ifdef XPM_BACKGROUND
1156 /* TODO: should that really be here ? */
1157 bgPixmap.render_background ();
1158#endif
1159 } 1163 }
1160 1164
1161 if (fix_screen || old_height == 0) 1165 if (fix_screen || old_height == 0)
1162 scr_reset (); 1166 scr_reset ();
1163 1167
1164 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version 1168 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1165 //scr_touch (false); 1169 //scr_touch (false);
1166 1170
1167#ifdef HAVE_BG_PIXMAP 1171#ifdef HAVE_BG_PIXMAP
1172// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1168 if (bgPixmap.pixmap) 1173// if (bgPixmap.pixmap)
1169 scr_touch (false); 1174// scr_touch (false);
1170#endif 1175#endif
1171 1176
1172#ifdef USE_XIM 1177#ifdef USE_XIM
1173 IMSetPosition (); 1178 IMSetPosition ();
1174#endif 1179#endif
… …
1345 if (term->rs[Rs_imLocale]) 1350 if (term->rs[Rs_imLocale])
1346 SET_LOCALE (term->locale); 1351 SET_LOCALE (term->locale);
1347 } 1352 }
1348 else 1353 else
1349 str = (void *)text->string.wide_char; 1354 str = (void *)text->string.wide_char;
1350 1355
1351 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1356 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1352 DT_INT, call_data->caret, 1357 DT_INT, call_data->caret,
1353 DT_INT, call_data->chg_first, 1358 DT_INT, call_data->chg_first,
1354 DT_INT, call_data->chg_length, 1359 DT_INT, call_data->chg_length,
1355 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,
… …
1674 1679
1675 if (input_style & XIMPreeditPosition) 1680 if (input_style & XIMPreeditPosition)
1676 { 1681 {
1677 im_set_size (preedit_rect); 1682 im_set_size (preedit_rect);
1678 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1683 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1679 1684
1680 XSetICValues (Input_Context, 1685 XSetICValues (Input_Context,
1681 XNPreeditAttributes, preedit_attr, NULL); 1686 XNPreeditAttributes, preedit_attr, NULL);
1682 } 1687 }
1683 else 1688 else
1684 { 1689 {
… …
1703 1708
1704 XFree (preedit_attr); 1709 XFree (preedit_attr);
1705} 1710}
1706#endif /* USE_XIM */ 1711#endif /* USE_XIM */
1707 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
1743int
1744rxvt_term::update_background ()
1745{
1746 bgPixmap.invalidate ();
1747
1748 /* no chance of real time refresh if we are blurring! */
1749 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1750 bgPixmap.render ();
1751 else
1752 {
1753 update_background_ev.stop ();
1754
1755 if (!bgPixmap.need_client_side_rendering())
1756 update_background_ev.start (.05);
1757 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1758 update_background_ev.start (.20); /* very slow !!! */
1759 else
1760 update_background_ev.start (.07);
1761 }
1762
1763 return 0;
1764}
1765
1766void
1767rxvt_term::update_background_cb (ev::timer &w, int revents)
1768{
1769 bgPixmap.render ();
1770}
1771
1772#endif /* HAVE_BG_PIXMAP */
1773
1708/*----------------------- end-of-file (C source) -----------------------*/ 1774/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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