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.242 by sasha, Wed Aug 15 22:41:52 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 {
… …
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
… …
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
… …
506 if (option (Opt_scrollBar)) 515 if (option (Opt_scrollBar))
507 resize_scrollbar (); /* create and map scrollbar */ 516 resize_scrollbar (); /* create and map scrollbar */
508#endif 517#endif
509#ifdef HAVE_BG_PIXMAP 518#ifdef HAVE_BG_PIXMAP
510 { 519 {
511 bool changed = false;
512 bgPixmap.set_target (this); 520 bgPixmap.set_target (this);
513 521
514#ifdef ENABLE_TRANSPARENCY 522#ifdef ENABLE_TRANSPARENCY
515 if (option (Opt_transparent)) 523 if (option (Opt_transparent))
516 { 524 {
517 bgPixmap.set_transparent (); 525 bgPixmap.set_transparent ();
518#ifdef HAVE_AFTERIMAGE 526#ifdef HAVE_AFTERIMAGE
519 if (rs [Rs_blurradius]) 527 if (rs [Rs_blurradius])
520 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 528 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
521#endif 529#endif
522 if (ISSET_PIXCOLOR (Color_tint)) 530 if (ISSET_PIXCOLOR (Color_tint))
523 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 531 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
524 if (rs [Rs_shade]) 532 if (rs [Rs_shade])
525 bgPixmap.set_shade (rs [Rs_shade]); 533 bgPixmap.set_shade (rs [Rs_shade]);
526 changed = true;
527 534
528 bgPixmap.set_root_pixmap (); 535 bgPixmap.set_root_pixmap ();
529 XSelectInput (dpy, display->root, PropertyChangeMask); 536 XSelectInput (dpy, display->root, PropertyChangeMask);
530 rootwin_ev.start (display, display->root); 537 rootwin_ev.start (display, display->root);
531 } 538 }
532#endif 539#endif
533 540
534#ifdef XPM_BACKGROUND 541#ifdef BG_IMAGE_FROM_FILE
535 if (rs[Rs_backgroundPixmap] != NULL) 542 if (rs[Rs_backgroundPixmap] != NULL)
536 { 543 {
537 const char *p = rs[Rs_backgroundPixmap]; 544 const char *p = rs[Rs_backgroundPixmap];
538 545
539 if ((p = strchr (p, ';')) != NULL) 546 if ((p = strchr (p, ';')) != NULL)
… …
542 bgPixmap.set_geometry (p); 549 bgPixmap.set_geometry (p);
543 } 550 }
544 else 551 else
545 bgPixmap.set_defaultGeometry (); 552 bgPixmap.set_defaultGeometry ();
546 553
547 changed = bgPixmap.set_file (rs[Rs_backgroundPixmap]); 554 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
555 if (!bgPixmap.window_position_sensitive ())
556 update_background ();
548 } 557 }
549#endif 558#endif
550 if (changed)
551 {
552 bgPixmap.render ();
553 scr_touch (true);
554 }
555 } 559 }
556#endif 560#endif
557 561
558#if ENABLE_PERL 562#if ENABLE_PERL
559 rootwin_ev.start (display, display->root); 563 rootwin_ev.start (display, display->root);
… …
564 init_command (cmd_argv); 568 init_command (cmd_argv);
565 569
566 free (cmd_argv); 570 free (cmd_argv);
567 571
568 if (pty->pty >= 0) 572 if (pty->pty >= 0)
569 pty_ev.start (pty->pty, EVENT_READ); 573 pty_ev.start (pty->pty, ev::READ);
570 574
571 check_ev.start (); 575 prepare_ev.start ();
572 576
573 HOOK_INVOKE ((this, HOOK_START, DT_END)); 577 HOOK_INVOKE ((this, HOOK_START, DT_END));
574 578
575#if ENABLE_XEMBED 579#if ENABLE_XEMBED
576 if (rs[Rs_embed]) 580 if (rs[Rs_embed])
… …
588 return true; 592 return true;
589} 593}
590 594
591static struct sig_handlers 595static struct sig_handlers
592{ 596{
593 sig_watcher sw_term, sw_int; 597 ev::sig sw_term, sw_int;
594 598
595 /* 599 /*
596 * Catch a fatal signal and tidy up before quitting 600 * Catch a fatal signal and tidy up before quitting
597 */ 601 */
598 void 602 void
599 sig_term (sig_watcher &w) 603 sig_term (ev::sig &w, int revents)
600 { 604 {
601 rxvt_emergency_cleanup (); 605 rxvt_emergency_cleanup ();
602 signal (w.signum, SIG_DFL); 606 w.stop ();
603 kill (getpid (), w.signum); 607 kill (getpid (), w.signum);
604 } 608 }
605 609
606 sig_handlers () 610 sig_handlers ()
607 : sw_term (this, &sig_handlers::sig_term), 611 : sw_term (this, &sig_handlers::sig_term),
… …
615void 619void
616rxvt_init () 620rxvt_init ()
617{ 621{
618 ptytty::init (); 622 ptytty::init ();
619 623
624 if (!ev::ev_default_loop (0))
625 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
626
620 rxvt_environ = environ; 627 rxvt_environ = environ;
621 628
622 signal (SIGHUP, SIG_IGN); 629 signal (SIGHUP, SIG_IGN);
623 signal (SIGPIPE, SIG_IGN); 630 signal (SIGPIPE, SIG_IGN);
624 631
625 sig_handlers.sw_term.start (SIGTERM); 632 sig_handlers.sw_term.start (SIGTERM); ev::ev_unref ();
626 sig_handlers.sw_int.start (SIGINT); 633 sig_handlers.sw_int.start (SIGINT); ev::ev_unref ();
627 634
628 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 635 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
629 /* signal (SIGURG, SIG_DFL); */ 636 /* signal (SIGURG, SIG_DFL); */
630 637
631 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 638 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
901 if (parent[0]) 908 if (parent[0])
902 { 909 {
903 resize_all_windows (0, 0, 0); 910 resize_all_windows (0, 0, 0);
904 scr_remap_chars (); 911 scr_remap_chars ();
905 scr_touch (true); 912 scr_touch (true);
906 } 913 }
907 914
908 return true; 915 return true;
909} 916}
910 917
918void
911void rxvt_term::set_string_property (Atom prop, const char *str, int len) 919rxvt_term::set_string_property (Atom prop, const char *str, int len)
912{ 920{
913 XChangeProperty (dpy, parent[0], 921 XChangeProperty (dpy, parent[0],
914 prop, XA_STRING, 8, PropModeReplace, 922 prop, XA_STRING, 8, PropModeReplace,
915 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 923 (const unsigned char *)str, len >= 0 ? len : strlen (str));
916} 924}
917 925
926void
918void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 927rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
919{ 928{
920 wchar_t *ws = rxvt_mbstowcs (str, len); 929 wchar_t *ws = rxvt_mbstowcs (str, len);
921 char *s = rxvt_wcstoutf8 (ws); 930 char *s = rxvt_wcstoutf8 (ws);
922 931
923 XChangeProperty (dpy, parent[0], 932 XChangeProperty (dpy, parent[0],
… …
947#if ENABLE_EWMH 956#if ENABLE_EWMH
948 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 957 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
949#endif 958#endif
950} 959}
951 960
961void
962rxvt_term::set_window_color (int idx, const char *color)
963{
952#ifdef XTERM_COLOR_CHANGE 964#ifdef XTERM_COLOR_CHANGE
953void
954rxvt_term::set_window_color (int idx, const char *color)
955{
956 rxvt_color xcol; 965 rxvt_color xcol;
957 int i; 966 int i;
958 967
959 if (color == NULL || *color == '\0') 968 if (color == NULL || *color == '\0')
960 return; 969 return;
961 970
962 color = strdup (color); 971 color = strdup (color);
963 allocated.push_back ((void *)color); 972 allocated.push_back ((void *)color);
… …
997 /*TODO: handle Color_BD, scrollbar background, etc. */ 1006 /*TODO: handle Color_BD, scrollbar background, etc. */
998 1007
999 update_fade_color (idx); 1008 update_fade_color (idx);
1000 recolour_cursor (); 1009 recolour_cursor ();
1001 scr_recolour (); 1010 scr_recolour ();
1011#endif /* XTERM_COLOR_CHANGE */
1002} 1012}
1003
1004#else
1005# define set_window_color (idx,color) ((void)0)
1006#endif /* XTERM_COLOR_CHANGE */
1007 1013
1008void 1014void
1009rxvt_term::recolour_cursor () 1015rxvt_term::recolour_cursor ()
1010{ 1016{
1011 XColor fg, bg; 1017 XColor fg, bg;
… …
1043 1049
1044 for (i = Color_Black; i <= Color_White; i++) 1050 for (i = Color_Black; i <= Color_White; i++)
1045 if (pix_colors[Color_bg] == pix_colors[i]) 1051 if (pix_colors[Color_bg] == pix_colors[i])
1046 { 1052 {
1047 sprintf (bstr, "%d", (i - Color_Black)); 1053 sprintf (bstr, "%d", (i - Color_Black));
1048#ifdef XPM_BACKGROUND 1054#ifdef BG_IMAGE_FROM_FILE
1049 xpmb = "default;"; 1055 xpmb = "default;";
1050#endif 1056#endif
1051 break; 1057 break;
1052 } 1058 }
1053 1059
… …
1149 1155
1150 XMoveResizeWindow (dpy, vt, 1156 XMoveResizeWindow (dpy, vt,
1151 window_vt_x, window_vt_y, 1157 window_vt_x, window_vt_y,
1152 width, height); 1158 width, height);
1153 1159
1154#ifdef XPM_BACKGROUND 1160#ifdef HAVE_BG_PIXMAP
1155 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1156 if (bgPixmap.window_size_sensitive ()) 1161 if (bgPixmap.window_size_sensitive ())
1157 bgPixmap.render (); 1162 update_background ();
1158#endif 1163#endif
1159 1164
1160 scr_clear (); 1165 scr_clear ();
1161 } 1166 }
1162 1167
… …
1348 if (term->rs[Rs_imLocale]) 1353 if (term->rs[Rs_imLocale])
1349 SET_LOCALE (term->locale); 1354 SET_LOCALE (term->locale);
1350 } 1355 }
1351 else 1356 else
1352 str = (void *)text->string.wide_char; 1357 str = (void *)text->string.wide_char;
1353 1358
1354 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1359 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1355 DT_INT, call_data->caret, 1360 DT_INT, call_data->caret,
1356 DT_INT, call_data->chg_first, 1361 DT_INT, call_data->chg_first,
1357 DT_INT, call_data->chg_length, 1362 DT_INT, call_data->chg_length,
1358 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,
… …
1677 1682
1678 if (input_style & XIMPreeditPosition) 1683 if (input_style & XIMPreeditPosition)
1679 { 1684 {
1680 im_set_size (preedit_rect); 1685 im_set_size (preedit_rect);
1681 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1686 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1682 1687
1683 XSetICValues (Input_Context, 1688 XSetICValues (Input_Context,
1684 XNPreeditAttributes, preedit_attr, NULL); 1689 XNPreeditAttributes, preedit_attr, NULL);
1685 } 1690 }
1686 else 1691 else
1687 { 1692 {
… …
1704 XFree (status_attr); 1709 XFree (status_attr);
1705 } 1710 }
1706 1711
1707 XFree (preedit_attr); 1712 XFree (preedit_attr);
1708} 1713}
1709#endif /* USE_XIM */ 1714#endif /* USE_XIM */
1715
1716void
1717rxvt_term::get_window_origin (int &x, int &y)
1718{
1719 Window cr;
1720 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1721/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1722}
1723
1724Pixmap
1725rxvt_term::get_pixmap_property (int prop_id)
1726{
1727 if (prop_id > 0 && prop_id < NUM_XA)
1728 if (xa[prop_id])
1729 {
1730 int aformat;
1731 unsigned long nitems, bytes_after;
1732 Atom atype;
1733 unsigned char *prop = NULL;
1734 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1735 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1736 &nitems, &bytes_after, &prop);
1737 if (result == Success && prop && atype == XA_PIXMAP)
1738 {
1739 return *(Pixmap *)prop;
1740 }
1741 }
1742 return None;
1743}
1744
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
1754int
1755rxvt_term::update_background ()
1756{
1757 bgPixmap.invalidate ();
1758
1759 /* no chance of real time refresh if we are blurring! */
1760 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1761 bgPixmap.render ();
1762 else
1763 {
1764 update_background_ev.stop ();
1765
1766 if (!bgPixmap.need_client_side_rendering())
1767 update_background_ev.start (.05);
1768 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1769 update_background_ev.start (.20); /* very slow !!! */
1770 else
1771 update_background_ev.start (.07);
1772 }
1773
1774 return 0;
1775}
1776
1777void
1778rxvt_term::update_background_cb (ev::timer &w, int revents)
1779{
1780 bgPixmap.render ();
1781}
1782
1783#endif /* HAVE_BG_PIXMAP */
1710 1784
1711/*----------------------- end-of-file (C source) -----------------------*/ 1785/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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