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.245 by sasha, Fri Aug 17 22:02:14 2007 UTC vs.
Revision 1.265 by ayin, Mon Nov 26 10:08:36 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 */
… …
300 delete argv; 309 delete argv;
301 310
302#ifdef KEYSYM_RESOURCE 311#ifdef KEYSYM_RESOURCE
303 delete keyboard; 312 delete keyboard;
304#endif 313#endif
314#ifndef NO_RESOURCES
315 XrmDestroyDatabase (option_db);
316#endif
305} 317}
306 318
307// child has exited, usually destroys 319// child has exited, usually destroys
308void 320void
309rxvt_term::child_cb (child_watcher &w, int status) 321rxvt_term::child_cb (ev::child &w, int status)
310{ 322{
311 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 323 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
312 324
313 cmd_pid = 0; 325 cmd_pid = 0;
314 326
… …
342 incr_ev.stop (); 354 incr_ev.stop ();
343 termwin_ev.stop (display); 355 termwin_ev.stop (display);
344 vt_ev.stop (display); 356 vt_ev.stop (display);
345 } 357 }
346 358
347 check_ev.stop (); 359 prepare_ev.stop ();
348 pty_ev.stop (); 360 pty_ev.stop ();
349#ifdef CURSOR_BLINK 361#ifdef CURSOR_BLINK
350 cursor_blink_ev.stop (); 362 cursor_blink_ev.stop ();
351#endif 363#endif
352#ifdef TEXT_BLINK 364#ifdef TEXT_BLINK
… …
360#endif 372#endif
361#ifdef POINTER_BLANK 373#ifdef POINTER_BLANK
362 pointer_ev.stop (); 374 pointer_ev.stop ();
363#endif 375#endif
364 376
365 destroy_ev.start (0); 377 destroy_ev.start ();
366} 378}
367 379
368void 380void
369rxvt_term::destroy_cb (time_watcher &w) 381rxvt_term::destroy_cb (ev::idle &w, int revents)
370{ 382{
371 make_current (); 383 make_current ();
372 384
373 delete this; 385 delete this;
374} 386}
… …
428 else 440 else
429 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 441 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
430 mesg, BUFSIZ); 442 mesg, BUFSIZ);
431 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 443 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
432 } 444 }
433 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 445 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
434 mesg, BUFSIZ); 446 mesg, BUFSIZ);
435 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 447 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
436} 448}
437#endif 449#endif
438 450
… …
512 524
513#ifdef ENABLE_TRANSPARENCY 525#ifdef ENABLE_TRANSPARENCY
514 if (option (Opt_transparent)) 526 if (option (Opt_transparent))
515 { 527 {
516 bgPixmap.set_transparent (); 528 bgPixmap.set_transparent ();
517#ifdef HAVE_AFTERIMAGE 529#ifdef HAVE_AFTERIMAGE
518 if (rs [Rs_blurradius]) 530 if (rs [Rs_blurradius])
519 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 531 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
520#endif 532#endif
521 if (ISSET_PIXCOLOR (Color_tint)) 533 if (ISSET_PIXCOLOR (Color_tint))
522 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 534 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
523 if (rs [Rs_shade]) 535 if (rs [Rs_shade])
524 bgPixmap.set_shade (rs [Rs_shade]); 536 bgPixmap.set_shade (rs [Rs_shade]);
525 537
… …
527 XSelectInput (dpy, display->root, PropertyChangeMask); 539 XSelectInput (dpy, display->root, PropertyChangeMask);
528 rootwin_ev.start (display, display->root); 540 rootwin_ev.start (display, display->root);
529 } 541 }
530#endif 542#endif
531 543
532#ifdef XPM_BACKGROUND 544#ifdef BG_IMAGE_FROM_FILE
533 if (rs[Rs_backgroundPixmap] != NULL) 545 if (rs[Rs_backgroundPixmap] != NULL)
534 { 546 {
535 const char *p = rs[Rs_backgroundPixmap]; 547 const char *p = rs[Rs_backgroundPixmap];
536 548
537 if ((p = strchr (p, ';')) != NULL) 549 if ((p = strchr (p, ';')) != NULL)
… …
540 bgPixmap.set_geometry (p); 552 bgPixmap.set_geometry (p);
541 } 553 }
542 else 554 else
543 bgPixmap.set_defaultGeometry (); 555 bgPixmap.set_defaultGeometry ();
544 556
545 bgPixmap.set_file (rs[Rs_backgroundPixmap]); 557 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
558 if (!bgPixmap.window_position_sensitive ())
559 update_background ();
546 } 560 }
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 561#endif
554 } 562 }
555#endif 563#endif
556 564
557#if ENABLE_PERL 565#if ENABLE_PERL
… …
563 init_command (cmd_argv); 571 init_command (cmd_argv);
564 572
565 free (cmd_argv); 573 free (cmd_argv);
566 574
567 if (pty->pty >= 0) 575 if (pty->pty >= 0)
568 pty_ev.start (pty->pty, EVENT_READ); 576 pty_ev.start (pty->pty, ev::READ);
569 577
570 check_ev.start (); 578 prepare_ev.start ();
571 579
572 HOOK_INVOKE ((this, HOOK_START, DT_END)); 580 HOOK_INVOKE ((this, HOOK_START, DT_END));
573 581
574#if ENABLE_XEMBED 582#if ENABLE_XEMBED
575 if (rs[Rs_embed]) 583 if (rs[Rs_embed])
… …
587 return true; 595 return true;
588} 596}
589 597
590static struct sig_handlers 598static struct sig_handlers
591{ 599{
592 sig_watcher sw_term, sw_int; 600 ev::sig sw_term, sw_int;
593 601
594 /* 602 /*
595 * Catch a fatal signal and tidy up before quitting 603 * Catch a fatal signal and tidy up before quitting
596 */ 604 */
597 void 605 void
598 sig_term (sig_watcher &w) 606 sig_term (ev::sig &w, int revents)
599 { 607 {
600 rxvt_emergency_cleanup (); 608 rxvt_emergency_cleanup ();
601 signal (w.signum, SIG_DFL); 609 w.stop ();
602 kill (getpid (), w.signum); 610 kill (getpid (), w.signum);
603 } 611 }
604 612
605 sig_handlers () 613 sig_handlers ()
606 : sw_term (this, &sig_handlers::sig_term), 614 : sw_term (this, &sig_handlers::sig_term),
… …
614void 622void
615rxvt_init () 623rxvt_init ()
616{ 624{
617 ptytty::init (); 625 ptytty::init ();
618 626
627 if (!ev_default_loop (0))
628 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
629
619 rxvt_environ = environ; 630 rxvt_environ = environ;
620 631
621 signal (SIGHUP, SIG_IGN); 632 signal (SIGHUP, SIG_IGN);
622 signal (SIGPIPE, SIG_IGN); 633 signal (SIGPIPE, SIG_IGN);
623 634
624 sig_handlers.sw_term.start (SIGTERM); 635 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
625 sig_handlers.sw_int.start (SIGINT); 636 sig_handlers.sw_int.start (SIGINT); ev_unref ();
626 637
627 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 638 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
628 /* signal (SIGURG, SIG_DFL); */ 639 /* signal (SIGURG, SIG_DFL); */
629 640
630 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 641 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
900 if (parent[0]) 911 if (parent[0])
901 { 912 {
902 resize_all_windows (0, 0, 0); 913 resize_all_windows (0, 0, 0);
903 scr_remap_chars (); 914 scr_remap_chars ();
904 scr_touch (true); 915 scr_touch (true);
905 } 916 }
906 917
907 return true; 918 return true;
908} 919}
909 920
921void
910void rxvt_term::set_string_property (Atom prop, const char *str, int len) 922rxvt_term::set_string_property (Atom prop, const char *str, int len)
911{ 923{
912 XChangeProperty (dpy, parent[0], 924 XChangeProperty (dpy, parent[0],
913 prop, XA_STRING, 8, PropModeReplace, 925 prop, XA_STRING, 8, PropModeReplace,
914 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 926 (const unsigned char *)str, len >= 0 ? len : strlen (str));
915} 927}
916 928
929void
917void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 930rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
918{ 931{
919 wchar_t *ws = rxvt_mbstowcs (str, len); 932 wchar_t *ws = rxvt_mbstowcs (str, len);
920 char *s = rxvt_wcstoutf8 (ws); 933 char *s = rxvt_wcstoutf8 (ws);
921 934
922 XChangeProperty (dpy, parent[0], 935 XChangeProperty (dpy, parent[0],
… …
946#if ENABLE_EWMH 959#if ENABLE_EWMH
947 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 960 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
948#endif 961#endif
949} 962}
950 963
964void
965rxvt_term::set_window_color (int idx, const char *color)
966{
951#ifdef XTERM_COLOR_CHANGE 967#ifdef XTERM_COLOR_CHANGE
952void
953rxvt_term::set_window_color (int idx, const char *color)
954{
955 rxvt_color xcol; 968 rxvt_color xcol;
956 int i; 969 int i;
957 970
958 if (color == NULL || *color == '\0') 971 if (color == NULL || *color == '\0')
959 return; 972 return;
960 973
961 color = strdup (color); 974 color = strdup (color);
962 allocated.push_back ((void *)color); 975 allocated.push_back ((void *)color);
… …
966 if (isdigit (*color)) 979 if (isdigit (*color))
967 { 980 {
968 i = atoi (color); 981 i = atoi (color);
969 982
970 if (i >= 8 && i <= 15) 983 if (i >= 8 && i <= 15)
984 {
971 { /* bright colors */ 985 /* bright colors */
972 i -= 8; 986 i -= 8;
973 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 987 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
974 goto done; 988 goto done;
975 } 989 }
976 990
977 if (i >= 0 && i <= 7) 991 if (i >= 0 && i <= 7)
992 {
978 { /* normal colors */ 993 /* normal colors */
979 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 994 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
980 goto done; 995 goto done;
981 } 996 }
982 } 997 }
983 998
… …
988 * so just keep gobbling up the colormap 1003 * so just keep gobbling up the colormap
989 */ 1004 */
990 1005
991 pix_colors_focused[idx] = xcol; 1006 pix_colors_focused[idx] = xcol;
992 1007
993 /* XSetWindowAttributes attr; */
994 /* Cursor cursor; */
995done: 1008done:
996 /*TODO: handle Color_BD, scrollbar background, etc. */ 1009 /*TODO: handle Color_BD, scrollbar background, etc. */
997 1010
998 update_fade_color (idx); 1011 update_fade_color (idx);
999 recolour_cursor (); 1012 recolour_cursor ();
1000 scr_recolour (); 1013 scr_recolour ();
1014#endif /* XTERM_COLOR_CHANGE */
1001} 1015}
1002
1003#else
1004# define set_window_color (idx,color) ((void)0)
1005#endif /* XTERM_COLOR_CHANGE */
1006 1016
1007void 1017void
1008rxvt_term::recolour_cursor () 1018rxvt_term::recolour_cursor ()
1009{ 1019{
1010 XColor fg, bg; 1020 XColor fg, bg;
… …
1042 1052
1043 for (i = Color_Black; i <= Color_White; i++) 1053 for (i = Color_Black; i <= Color_White; i++)
1044 if (pix_colors[Color_bg] == pix_colors[i]) 1054 if (pix_colors[Color_bg] == pix_colors[i])
1045 { 1055 {
1046 sprintf (bstr, "%d", (i - Color_Black)); 1056 sprintf (bstr, "%d", (i - Color_Black));
1047#ifdef XPM_BACKGROUND 1057#ifdef BG_IMAGE_FROM_FILE
1048 xpmb = "default;"; 1058 xpmb = "default;";
1049#endif 1059#endif
1050 break; 1060 break;
1051 } 1061 }
1052 1062
… …
1148 1158
1149 XMoveResizeWindow (dpy, vt, 1159 XMoveResizeWindow (dpy, vt,
1150 window_vt_x, window_vt_y, 1160 window_vt_x, window_vt_y,
1151 width, height); 1161 width, height);
1152 1162
1153#ifdef XPM_BACKGROUND 1163#ifdef HAVE_BG_PIXMAP
1154 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1155 if (bgPixmap.window_size_sensitive ()) 1164 if (bgPixmap.window_size_sensitive ())
1156 update_background (); 1165 update_background ();
1157#endif 1166#endif
1158 1167
1159 scr_clear (); 1168 scr_clear ();
1160 } 1169 }
1161 1170
… …
1347 if (term->rs[Rs_imLocale]) 1356 if (term->rs[Rs_imLocale])
1348 SET_LOCALE (term->locale); 1357 SET_LOCALE (term->locale);
1349 } 1358 }
1350 else 1359 else
1351 str = (void *)text->string.wide_char; 1360 str = (void *)text->string.wide_char;
1352 1361
1353 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1362 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1354 DT_INT, call_data->caret, 1363 DT_INT, call_data->caret,
1355 DT_INT, call_data->chg_first, 1364 DT_INT, call_data->chg_first,
1356 DT_INT, call_data->chg_length, 1365 DT_INT, call_data->chg_length,
1357 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1366 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1676 1685
1677 if (input_style & XIMPreeditPosition) 1686 if (input_style & XIMPreeditPosition)
1678 { 1687 {
1679 im_set_size (preedit_rect); 1688 im_set_size (preedit_rect);
1680 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1689 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1681 1690
1682 XSetICValues (Input_Context, 1691 XSetICValues (Input_Context,
1683 XNPreeditAttributes, preedit_attr, NULL); 1692 XNPreeditAttributes, preedit_attr, NULL);
1684 } 1693 }
1685 else 1694 else
1686 { 1695 {
… …
1703 XFree (status_attr); 1712 XFree (status_attr);
1704 } 1713 }
1705 1714
1706 XFree (preedit_attr); 1715 XFree (preedit_attr);
1707} 1716}
1708#endif /* USE_XIM */ 1717#endif /* USE_XIM */
1718
1719void
1720rxvt_term::get_window_origin (int &x, int &y)
1721{
1722 Window cr;
1723 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1724/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1725}
1726
1727Pixmap
1728rxvt_term::get_pixmap_property (int prop_id)
1729{
1730 if (prop_id > 0 && prop_id < NUM_XA)
1731 if (xa[prop_id])
1732 {
1733 int aformat;
1734 unsigned long nitems, bytes_after;
1735 Atom atype;
1736 unsigned char *prop = NULL;
1737 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1738 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1739 &nitems, &bytes_after, &prop);
1740 if (result == Success && prop && atype == XA_PIXMAP)
1741 {
1742 return *(Pixmap *)prop;
1743 }
1744 }
1745 return None;
1746}
1747
1748#ifdef HAVE_BG_PIXMAP
1749# if TRACE_PIXMAPS
1750# undef update_background
1751int rxvt_term::trace_update_background (const char* file, int line)
1752{
1753 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1754 update_background ();
1755}
1756# endif
1757int
1758rxvt_term::update_background ()
1759{
1760 bgPixmap.invalidate ();
1761
1762 /* no chance of real time refresh if we are blurring! */
1763 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1764 bgPixmap.render ();
1765 else
1766 {
1767 update_background_ev.stop ();
1768
1769 if (!bgPixmap.need_client_side_rendering())
1770 update_background_ev.start (.05);
1771 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1772 update_background_ev.start (.20); /* very slow !!! */
1773 else
1774 update_background_ev.start (.07);
1775 }
1776
1777 return 0;
1778}
1779
1780void
1781rxvt_term::update_background_cb (ev::timer &w, int revents)
1782{
1783 bgPixmap.render ();
1784}
1785
1786#endif /* HAVE_BG_PIXMAP */
1709 1787
1710/*----------------------- end-of-file (C source) -----------------------*/ 1788/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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