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.256 by root, Sun Nov 11 04:08:00 2007 UTC vs.
Revision 1.280 by ayin, Wed Dec 12 11:35:56 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 HAVE_TERMIOS_H
44# include <termios.h> 43#include <termios.h>
45#endif
46 44
47#ifdef HAVE_XSETLOCALE 45#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 46# define X_LOCALE
49# include <X11/Xlocale.h> 47# include <X11/Xlocale.h>
50#else 48#else
… …
152 150
153} 151}
154#endif 152#endif
155 153
156rxvt_term::rxvt_term () 154rxvt_term::rxvt_term ()
157 : 155{
156#if HAVE_BG_PIXMAP
157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
158#endif
159#ifdef CURSOR_BLINK
160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
161#endif
162#ifdef TEXT_BLINK
163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
164#endif
165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
167#endif
168#ifdef SELECTION_SCROLLING
169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
170#endif
171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif
158#if ENABLE_TRANSPARENCY || ENABLE_PERL 174#if ENABLE_TRANSPARENCY || ENABLE_PERL
159 rootwin_ev (this, &rxvt_term::rootwin_cb), 175 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 176#endif
164#ifdef HAVE_SCROLLBARS 177#ifdef HAVE_SCROLLBARS
165 scrollbar_ev (this, &rxvt_term::x_cb), 178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
166#endif 179#endif
167#ifdef CURSOR_BLINK 180#ifdef USE_XIM
168 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 181 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 182#endif
182#ifdef POINTER_BLANK 183#ifdef POINTER_BLANK
183 pointer_ev (this, &rxvt_term::pointer_cb), 184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184#endif
185#ifdef USE_XIM
186 im_ev (this, &rxvt_term::im_cb),
187#endif 185#endif
188#ifndef NO_BELL 186#ifndef NO_BELL
189 bell_ev (this, &rxvt_term::bell_cb), 187 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
190#endif 188#endif
191 termwin_ev (this, &rxvt_term::x_cb), 189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
192 vt_ev (this, &rxvt_term::x_cb), 190 prepare_ev.set <rxvt_term, &rxvt_term::prepare_cb> (this);
193 child_ev (this, &rxvt_term::child_cb), 191 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
194 prepare_ev (this, &rxvt_term::prepare_cb), 192 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
195 flush_ev (this, &rxvt_term::flush_cb), 193 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
196 destroy_ev (this, &rxvt_term::destroy_cb), 194 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
197 pty_ev (this, &rxvt_term::pty_cb), 195 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
198 incr_ev (this, &rxvt_term::incr_cb) 196 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
199{ 197
200 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 198 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
201 199
202 termlist.push_back (this); 200 termlist.push_back (this);
203 201
204#ifdef KEYSYM_RESOURCE 202#ifdef KEYSYM_RESOURCE
… …
284 delete [] pix_colors_focused; 282 delete [] pix_colors_focused;
285#if OFF_FOCUS_FADING 283#if OFF_FOCUS_FADING
286 delete [] pix_colors_unfocused; 284 delete [] pix_colors_unfocused;
287#endif 285#endif
288 286
287#ifdef HAVE_BG_PIXMAP
288 bgPixmap.destroy ();
289#endif
289 displays.put (display); 290 displays.put (display);
290 291
291 scr_release (); 292 scr_release ();
292 293
293 /* clear all resources */ 294 /* clear all resources */
… …
306 delete argv; 307 delete argv;
307 308
308#ifdef KEYSYM_RESOURCE 309#ifdef KEYSYM_RESOURCE
309 delete keyboard; 310 delete keyboard;
310#endif 311#endif
312#ifndef NO_RESOURCES
313 XrmDestroyDatabase (option_db);
314#endif
311} 315}
312 316
313// child has exited, usually destroys 317// child has exited, usually destroys
314void 318void
315rxvt_term::child_cb (ev::child &w, int status) 319rxvt_term::child_cb (ev::child &w, int status)
… …
323} 327}
324 328
325void 329void
326rxvt_term::destroy () 330rxvt_term::destroy ()
327{ 331{
328 if (destroy_ev.active) 332 if (ev_is_active (&destroy_ev))
329 return; 333 return;
330 334
331 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 335 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
332 336
333#if ENABLE_OVERLAY 337#if ENABLE_OVERLAY
… …
370 374
371 destroy_ev.start (); 375 destroy_ev.start ();
372} 376}
373 377
374void 378void
375rxvt_term::destroy_cb (ev::check &w, int revents) 379rxvt_term::destroy_cb (ev::idle &w, int revents)
376{ 380{
377 make_current (); 381 make_current ();
378 382
379 delete this; 383 delete this;
380} 384}
… …
469 rxvt_emergency_cleanup (); 473 rxvt_emergency_cleanup ();
470 _exit (EXIT_FAILURE); 474 _exit (EXIT_FAILURE);
471} 475}
472 476
473/*----------------------------------------------------------------------*/ 477/*----------------------------------------------------------------------*/
474bool 478void
475rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 479rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
476{ 480{
477 this->envv = envv; 481 this->envv = envv;
478 482
479 SET_R (this); 483 SET_R (this);
480 set_locale (""); 484 set_locale ("");
481 set_environ (envv); // few things in X do not call setlocale :( 485 set_environ (envv); // few things in X do not call setlocale :(
482 486
483 if (!init_vars ()) 487 init_vars ();
484 return false;
485 488
486 init_secondary (); 489 init_secondary ();
487 490
488 const char **cmd_argv = init_resources (argc, argv); 491 const char **cmd_argv = init_resources (argc, argv);
489 492
… …
583 } 586 }
584#endif 587#endif
585 588
586 XMapWindow (dpy, vt); 589 XMapWindow (dpy, vt);
587 XMapWindow (dpy, parent[0]); 590 XMapWindow (dpy, parent[0]);
588
589 return true;
590} 591}
591 592
592static struct sig_handlers 593static struct sig_handlers
593{ 594{
594 ev::sig sw_term, sw_int; 595 ev::sig sw_term, sw_int;
595 596
596 /* 597 /*
597 * Catch a fatal signal and tidy up before quitting 598 * Catch a fatal signal and tidy up before quitting
598 */ 599 */
599 void
600 sig_term (ev::sig &w, int revents) 600 void sig_term (ev::sig &w, int revents);
601
602 sig_handlers ()
601 { 603 {
602 rxvt_emergency_cleanup (); 604 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
603 w.stop ();
604 kill (getpid (), w.signum);
605 }
606
607 sig_handlers ()
608 : sw_term (this, &sig_handlers::sig_term),
609 sw_int (this, &sig_handlers::sig_term) 605 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
610 {
611 } 606 }
612} sig_handlers; 607} sig_handlers;
613 608
609void
610sig_handlers::sig_term (ev::sig &w, int revents)
611{
612 rxvt_emergency_cleanup ();
613 w.stop ();
614 kill (getpid (), w.signum);
615}
616
614char **rxvt_environ; // startup environment 617char **rxvt_environ; // startup environment
615 618
616void 619void
617rxvt_init () 620rxvt_init ()
618{ 621{
619 ptytty::init (); 622 ptytty::init ();
623
620 ev::ev_default_loop (0); 624 if (!ev_default_loop (0))
625 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
621 626
622 rxvt_environ = environ; 627 rxvt_environ = environ;
623 628
624 signal (SIGHUP, SIG_IGN); 629 signal (SIGHUP, SIG_IGN);
625 signal (SIGPIPE, SIG_IGN); 630 signal (SIGPIPE, SIG_IGN);
626 631
627 sig_handlers.sw_term.start (SIGTERM); ev::ev_unref (); 632 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
628 sig_handlers.sw_int.start (SIGINT); ev::ev_unref (); 633 sig_handlers.sw_int.start (SIGINT); ev_unref ();
629 634
630 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 635 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
631 /* signal (SIGURG, SIG_DFL); */ 636 /* signal (SIGURG, SIG_DFL); */
632 637
633 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 638 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
819 ws.ws_xpixel = width; 824 ws.ws_xpixel = width;
820 ws.ws_ypixel = height; 825 ws.ws_ypixel = height;
821 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 826 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
822 827
823#if 0 828#if 0
824 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 829 // TIOCSWINSZ is supposed to do this automatically and correctly
825 if (cmd_pid) /* force through to the command */ 830 if (cmd_pid) /* force through to the command */
826 kill (-cmd_pid, SIGWINCH); 831 kill (-cmd_pid, SIGWINCH);
827#endif 832#endif
828} 833}
829 834
… …
971 if (isdigit (*color)) 976 if (isdigit (*color))
972 { 977 {
973 i = atoi (color); 978 i = atoi (color);
974 979
975 if (i >= 8 && i <= 15) 980 if (i >= 8 && i <= 15)
981 {
976 { /* bright colors */ 982 /* bright colors */
977 i -= 8;
978 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 983 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
979 goto done; 984 goto done;
980 } 985 }
981 986
982 if (i >= 0 && i <= 7) 987 if (i >= 0 && i <= 7)
988 {
983 { /* normal colors */ 989 /* normal colors */
984 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 990 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
985 goto done; 991 goto done;
986 } 992 }
987 } 993 }
988 994
… …
993 * so just keep gobbling up the colormap 999 * so just keep gobbling up the colormap
994 */ 1000 */
995 1001
996 pix_colors_focused[idx] = xcol; 1002 pix_colors_focused[idx] = xcol;
997 1003
998 /* XSetWindowAttributes attr; */
999 /* Cursor cursor; */
1000done: 1004done:
1001 /*TODO: handle Color_BD, scrollbar background, etc. */ 1005 /*TODO: handle Color_BD, scrollbar background, etc. */
1002 1006
1003 update_fade_color (idx); 1007 update_fade_color (idx);
1004 recolour_cursor (); 1008 recolour_cursor ();
1005 scr_recolour (); 1009 scr_recolour ();
1006#endif /* XTERM_COLOR_CHANGE */ 1010#endif /* XTERM_COLOR_CHANGE */
1007} 1011}
1008 1012
1009void 1013void
1010rxvt_term::recolour_cursor () 1014rxvt_term::recolour_cursor ()
1011{ 1015{
… …
1028 */ 1032 */
1029void 1033void
1030rxvt_term::set_colorfgbg () 1034rxvt_term::set_colorfgbg ()
1031{ 1035{
1032 unsigned int i; 1036 unsigned int i;
1033 const char *xpmb = "\0"; 1037 const char *xpmb = "";
1034 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1038 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1035 1039
1036 strcpy (fstr, "default"); 1040 strcpy (fstr, "default");
1037 strcpy (bstr, "default"); 1041 strcpy (bstr, "default");
1038 for (i = Color_Black; i <= Color_White; i++) 1042 for (i = Color_Black; i <= Color_White; i++)
… …
1704 XFree (status_attr); 1708 XFree (status_attr);
1705 } 1709 }
1706 1710
1707 XFree (preedit_attr); 1711 XFree (preedit_attr);
1708} 1712}
1709#endif /* USE_XIM */ 1713#endif /* USE_XIM */
1710 1714
1711void 1715void
1712rxvt_term::get_window_origin (int &x, int &y) 1716rxvt_term::get_window_origin (int &x, int &y)
1713{ 1717{
1714 Window cr; 1718 Window cr;
… …
1736 } 1740 }
1737 return None; 1741 return None;
1738} 1742}
1739 1743
1740#ifdef HAVE_BG_PIXMAP 1744#ifdef HAVE_BG_PIXMAP
1745# if TRACE_PIXMAPS
1746# undef update_background
1747int rxvt_term::trace_update_background (const char *file, int line)
1748{
1749 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1750 update_background ();
1751}
1752# endif
1753
1741int 1754int
1742rxvt_term::update_background () 1755rxvt_term::update_background ()
1743{ 1756{
1744 bgPixmap.invalidate (); 1757 bgPixmap.invalidate ();
1745 1758

Diff Legend

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