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.254 by ayin, Thu Oct 18 09:11:42 2007 UTC vs.
Revision 1.270 by root, Tue Dec 4 16:24:00 2007 UTC

… …
93class rxvt_composite_vec rxvt_composite; 93class rxvt_composite_vec rxvt_composite;
94 94
95text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 95text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
96{ 96{
97 compose_char *cc; 97 compose_char *cc;
98 98
99 // break compose chains, as stupid readline really likes to duplicate 99 // break compose chains, as stupid readline really likes to duplicate
100 // composing characters for some reason near the end of a line. 100 // composing characters for some reason near the end of a line.
101 cc = (*this)[c1]; 101 cc = (*this)[c1];
102 while (cc) 102 while (cc)
103 { 103 {
… …
152 152
153} 153}
154#endif 154#endif
155 155
156rxvt_term::rxvt_term () 156rxvt_term::rxvt_term ()
157 : 157{
158#if HAVE_BG_PIXMAP
159 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
160#endif
161#ifdef CURSOR_BLINK
162 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this);
163#endif
164#ifdef TEXT_BLINK
165 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this);
166#endif
167#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
168 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
169#endif
170#ifdef SELECTION_SCROLLING
171 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
172#endif
173#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
174 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
175#endif
158#if ENABLE_TRANSPARENCY || ENABLE_PERL 176#if ENABLE_TRANSPARENCY || ENABLE_PERL
159 rootwin_ev (this, &rxvt_term::rootwin_cb), 177 rootwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
160#endif
161#if HAVE_BG_PIXMAP
162 update_background_ev(this, &rxvt_term::update_background_cb),
163#endif 178#endif
164#ifdef HAVE_SCROLLBARS 179#ifdef HAVE_SCROLLBARS
165 scrollbar_ev (this, &rxvt_term::x_cb), 180 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
166#endif 181#endif
167#ifdef CURSOR_BLINK 182#ifdef USE_XIM
168 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 183 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
169#endif
170#ifdef TEXT_BLINK
171 text_blink_ev (this, &rxvt_term::text_blink_cb),
172#endif
173#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
174 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
175#endif
176#ifdef SELECTION_SCROLLING
177 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
178#endif
179#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
180 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
181#endif 184#endif
182#ifdef POINTER_BLANK 185#ifdef POINTER_BLANK
183 pointer_ev (this, &rxvt_term::pointer_cb), 186 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184#endif 187#endif
185#ifdef USE_XIM
186 im_ev (this, &rxvt_term::im_cb),
187#endif
188#ifndef NO_BELL 188#ifndef NO_BELL
189 bell_ev (this, &rxvt_term::bell_cb), 189 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
190#endif 190#endif
191 termwin_ev (this, &rxvt_term::x_cb), 191 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
192 vt_ev (this, &rxvt_term::x_cb), 192 prepare_ev.set <rxvt_term, &rxvt_term::prepare_cb> (this);
193 child_ev (this, &rxvt_term::child_cb), 193 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
194 check_ev (this, &rxvt_term::check_cb), 194 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
195 flush_ev (this, &rxvt_term::flush_cb), 195 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
196 destroy_ev (this, &rxvt_term::destroy_cb), 196 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
197 pty_ev (this, &rxvt_term::pty_cb), 197 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
198 incr_ev (this, &rxvt_term::incr_cb) 198 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
199{ 199
200 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 200 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
201 201
202 termlist.push_back (this); 202 termlist.push_back (this);
203 203
204#ifdef KEYSYM_RESOURCE 204#ifdef KEYSYM_RESOURCE
… …
284 delete [] pix_colors_focused; 284 delete [] pix_colors_focused;
285#if OFF_FOCUS_FADING 285#if OFF_FOCUS_FADING
286 delete [] pix_colors_unfocused; 286 delete [] pix_colors_unfocused;
287#endif 287#endif
288 288
289#ifdef HAVE_BG_PIXMAP
290 bgPixmap.destroy ();
291#endif
289 displays.put (display); 292 displays.put (display);
290 293
291 scr_release (); 294 scr_release ();
292 295
293 /* clear all resources */ 296 /* clear all resources */
… …
306 delete argv; 309 delete argv;
307 310
308#ifdef KEYSYM_RESOURCE 311#ifdef KEYSYM_RESOURCE
309 delete keyboard; 312 delete keyboard;
310#endif 313#endif
314#ifndef NO_RESOURCES
315 XrmDestroyDatabase (option_db);
316#endif
311} 317}
312 318
313// child has exited, usually destroys 319// child has exited, usually destroys
314void 320void
315rxvt_term::child_cb (child_watcher &w, int status) 321rxvt_term::child_cb (ev::child &w, int status)
316{ 322{
317 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 323 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
318 324
319 cmd_pid = 0; 325 cmd_pid = 0;
320 326
… …
348 incr_ev.stop (); 354 incr_ev.stop ();
349 termwin_ev.stop (display); 355 termwin_ev.stop (display);
350 vt_ev.stop (display); 356 vt_ev.stop (display);
351 } 357 }
352 358
353 check_ev.stop (); 359 prepare_ev.stop ();
354 pty_ev.stop (); 360 pty_ev.stop ();
355#ifdef CURSOR_BLINK 361#ifdef CURSOR_BLINK
356 cursor_blink_ev.stop (); 362 cursor_blink_ev.stop ();
357#endif 363#endif
358#ifdef TEXT_BLINK 364#ifdef TEXT_BLINK
… …
366#endif 372#endif
367#ifdef POINTER_BLANK 373#ifdef POINTER_BLANK
368 pointer_ev.stop (); 374 pointer_ev.stop ();
369#endif 375#endif
370 376
371 destroy_ev.start (0); 377 destroy_ev.start ();
372} 378}
373 379
374void 380void
375rxvt_term::destroy_cb (time_watcher &w) 381rxvt_term::destroy_cb (ev::idle &w, int revents)
376{ 382{
377 make_current (); 383 make_current ();
378 384
379 delete this; 385 delete this;
380} 386}
… …
434 else 440 else
435 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 441 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
436 mesg, BUFSIZ); 442 mesg, BUFSIZ);
437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 443 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
438 } 444 }
439 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 445 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
440 mesg, BUFSIZ); 446 mesg, BUFSIZ);
441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 447 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
442} 448}
443#endif 449#endif
444 450
… …
518 524
519#ifdef ENABLE_TRANSPARENCY 525#ifdef ENABLE_TRANSPARENCY
520 if (option (Opt_transparent)) 526 if (option (Opt_transparent))
521 { 527 {
522 bgPixmap.set_transparent (); 528 bgPixmap.set_transparent ();
523#ifdef HAVE_AFTERIMAGE 529#ifdef HAVE_AFTERIMAGE
524 if (rs [Rs_blurradius]) 530 if (rs [Rs_blurradius])
525 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 531 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
526#endif 532#endif
527 if (ISSET_PIXCOLOR (Color_tint)) 533 if (ISSET_PIXCOLOR (Color_tint))
528 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 534 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
529 if (rs [Rs_shade]) 535 if (rs [Rs_shade])
530 bgPixmap.set_shade (rs [Rs_shade]); 536 bgPixmap.set_shade (rs [Rs_shade]);
531 537
… …
565 init_command (cmd_argv); 571 init_command (cmd_argv);
566 572
567 free (cmd_argv); 573 free (cmd_argv);
568 574
569 if (pty->pty >= 0) 575 if (pty->pty >= 0)
570 pty_ev.start (pty->pty, EVENT_READ); 576 pty_ev.start (pty->pty, ev::READ);
571 577
572 check_ev.start (); 578 prepare_ev.start ();
573 579
574 HOOK_INVOKE ((this, HOOK_START, DT_END)); 580 HOOK_INVOKE ((this, HOOK_START, DT_END));
575 581
576#if ENABLE_XEMBED 582#if ENABLE_XEMBED
577 if (rs[Rs_embed]) 583 if (rs[Rs_embed])
… …
589 return true; 595 return true;
590} 596}
591 597
592static struct sig_handlers 598static struct sig_handlers
593{ 599{
594 sig_watcher sw_term, sw_int; 600 ev::sig sw_term, sw_int;
595 601
596 /* 602 /*
597 * Catch a fatal signal and tidy up before quitting 603 * Catch a fatal signal and tidy up before quitting
598 */ 604 */
599 void 605 void
600 sig_term (sig_watcher &w) 606 sig_term (ev::sig &w, int revents)
601 { 607 {
602 rxvt_emergency_cleanup (); 608 rxvt_emergency_cleanup ();
603 signal (w.signum, SIG_DFL); 609 w.stop ();
604 kill (getpid (), w.signum); 610 kill (getpid (), w.signum);
605 } 611 }
606 612
607 sig_handlers () 613 sig_handlers ()
608 : sw_term (this, &sig_handlers::sig_term),
609 sw_int (this, &sig_handlers::sig_term)
610 { 614 {
615 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
616 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
611 } 617 }
612} sig_handlers; 618} sig_handlers;
613 619
614char **rxvt_environ; // startup environment 620char **rxvt_environ; // startup environment
615 621
616void 622void
617rxvt_init () 623rxvt_init ()
618{ 624{
619 ptytty::init (); 625 ptytty::init ();
620 626
627 if (!ev_default_loop (0))
628 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
629
621 rxvt_environ = environ; 630 rxvt_environ = environ;
622 631
623 signal (SIGHUP, SIG_IGN); 632 signal (SIGHUP, SIG_IGN);
624 signal (SIGPIPE, SIG_IGN); 633 signal (SIGPIPE, SIG_IGN);
625 634
626 sig_handlers.sw_term.start (SIGTERM); 635 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
627 sig_handlers.sw_int.start (SIGINT); 636 sig_handlers.sw_int.start (SIGINT); ev_unref ();
628 637
629 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 638 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
630 /* signal (SIGURG, SIG_DFL); */ 639 /* signal (SIGURG, SIG_DFL); */
631 640
632 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 641 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
902 if (parent[0]) 911 if (parent[0])
903 { 912 {
904 resize_all_windows (0, 0, 0); 913 resize_all_windows (0, 0, 0);
905 scr_remap_chars (); 914 scr_remap_chars ();
906 scr_touch (true); 915 scr_touch (true);
907 } 916 }
908 917
909 return true; 918 return true;
910} 919}
911 920
912void 921void
… …
956rxvt_term::set_window_color (int idx, const char *color) 965rxvt_term::set_window_color (int idx, const char *color)
957{ 966{
958#ifdef XTERM_COLOR_CHANGE 967#ifdef XTERM_COLOR_CHANGE
959 rxvt_color xcol; 968 rxvt_color xcol;
960 int i; 969 int i;
961 970
962 if (color == NULL || *color == '\0') 971 if (color == NULL || *color == '\0')
963 return; 972 return;
964 973
965 color = strdup (color); 974 color = strdup (color);
966 allocated.push_back ((void *)color); 975 allocated.push_back ((void *)color);
… …
970 if (isdigit (*color)) 979 if (isdigit (*color))
971 { 980 {
972 i = atoi (color); 981 i = atoi (color);
973 982
974 if (i >= 8 && i <= 15) 983 if (i >= 8 && i <= 15)
984 {
975 { /* bright colors */ 985 /* bright colors */
976 i -= 8;
977 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 986 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
978 goto done; 987 goto done;
979 } 988 }
980 989
981 if (i >= 0 && i <= 7) 990 if (i >= 0 && i <= 7)
991 {
982 { /* normal colors */ 992 /* normal colors */
983 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 993 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
984 goto done; 994 goto done;
985 } 995 }
986 } 996 }
987 997
… …
992 * so just keep gobbling up the colormap 1002 * so just keep gobbling up the colormap
993 */ 1003 */
994 1004
995 pix_colors_focused[idx] = xcol; 1005 pix_colors_focused[idx] = xcol;
996 1006
997 /* XSetWindowAttributes attr; */
998 /* Cursor cursor; */
999done: 1007done:
1000 /*TODO: handle Color_BD, scrollbar background, etc. */ 1008 /*TODO: handle Color_BD, scrollbar background, etc. */
1001 1009
1002 update_fade_color (idx); 1010 update_fade_color (idx);
1003 recolour_cursor (); 1011 recolour_cursor ();
1004 scr_recolour (); 1012 scr_recolour ();
1005#endif /* XTERM_COLOR_CHANGE */ 1013#endif /* XTERM_COLOR_CHANGE */
1006} 1014}
1007 1015
1008void 1016void
1009rxvt_term::recolour_cursor () 1017rxvt_term::recolour_cursor ()
1010{ 1018{
… …
1027 */ 1035 */
1028void 1036void
1029rxvt_term::set_colorfgbg () 1037rxvt_term::set_colorfgbg ()
1030{ 1038{
1031 unsigned int i; 1039 unsigned int i;
1032 const char *xpmb = "\0"; 1040 const char *xpmb = "";
1033 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1041 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1034 1042
1035 strcpy (fstr, "default"); 1043 strcpy (fstr, "default");
1036 strcpy (bstr, "default"); 1044 strcpy (bstr, "default");
1037 for (i = Color_Black; i <= Color_White; i++) 1045 for (i = Color_Black; i <= Color_White; i++)
… …
1347 if (term->rs[Rs_imLocale]) 1355 if (term->rs[Rs_imLocale])
1348 SET_LOCALE (term->locale); 1356 SET_LOCALE (term->locale);
1349 } 1357 }
1350 else 1358 else
1351 str = (void *)text->string.wide_char; 1359 str = (void *)text->string.wide_char;
1352 1360
1353 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1361 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1354 DT_INT, call_data->caret, 1362 DT_INT, call_data->caret,
1355 DT_INT, call_data->chg_first, 1363 DT_INT, call_data->chg_first,
1356 DT_INT, call_data->chg_length, 1364 DT_INT, call_data->chg_length,
1357 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1365 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1676 1684
1677 if (input_style & XIMPreeditPosition) 1685 if (input_style & XIMPreeditPosition)
1678 { 1686 {
1679 im_set_size (preedit_rect); 1687 im_set_size (preedit_rect);
1680 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1688 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1681 1689
1682 XSetICValues (Input_Context, 1690 XSetICValues (Input_Context,
1683 XNPreeditAttributes, preedit_attr, NULL); 1691 XNPreeditAttributes, preedit_attr, NULL);
1684 } 1692 }
1685 else 1693 else
1686 { 1694 {
… …
1703 XFree (status_attr); 1711 XFree (status_attr);
1704 } 1712 }
1705 1713
1706 XFree (preedit_attr); 1714 XFree (preedit_attr);
1707} 1715}
1708#endif /* USE_XIM */ 1716#endif /* USE_XIM */
1709 1717
1710void 1718void
1711rxvt_term::get_window_origin (int &x, int &y) 1719rxvt_term::get_window_origin (int &x, int &y)
1712{ 1720{
1713 Window cr; 1721 Window cr;
… …
1735 } 1743 }
1736 return None; 1744 return None;
1737} 1745}
1738 1746
1739#ifdef HAVE_BG_PIXMAP 1747#ifdef HAVE_BG_PIXMAP
1748# if TRACE_PIXMAPS
1749# undef update_background
1750int rxvt_term::trace_update_background (const char *file, int line)
1751{
1752 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1753 update_background ();
1754}
1755# endif
1756
1740int 1757int
1741rxvt_term::update_background () 1758rxvt_term::update_background ()
1742{ 1759{
1743 bgPixmap.invalidate (); 1760 bgPixmap.invalidate ();
1744 1761
1745 /* no chance of real time refresh if we are blurring ! */ 1762 /* no chance of real time refresh if we are blurring! */
1746 if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1763 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1747 bgPixmap.render (); 1764 bgPixmap.render ();
1748 else 1765 else
1749 { 1766 {
1750 update_background_ev.stop (); 1767 update_background_ev.stop ();
1768
1751 if (!bgPixmap.need_client_side_rendering()) 1769 if (!bgPixmap.need_client_side_rendering())
1752 update_background_ev.start (NOW + .05); 1770 update_background_ev.start (.05);
1753 else if (bgPixmap.flags & bgPixmap_t::blurNeeded) 1771 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1754 update_background_ev.start (NOW + .2); /* very slow !!! */ 1772 update_background_ev.start (.20); /* very slow !!! */
1755 else 1773 else
1756 update_background_ev.start (NOW + .07); 1774 update_background_ev.start (.07);
1757 } 1775 }
1776
1758 return 0; 1777 return 0;
1759} 1778}
1760 1779
1761void 1780void
1762rxvt_term::update_background_cb (time_watcher &w) 1781rxvt_term::update_background_cb (ev::timer &w, int revents)
1763{ 1782{
1764 bgPixmap.render (); 1783 bgPixmap.render ();
1765} 1784}
1766 1785
1767#endif /* HAVE_BG_PIXMAP */ 1786#endif /* HAVE_BG_PIXMAP */

Diff Legend

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