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.262 by ayin, Wed Nov 21 09:15:33 2007 UTC vs.
Revision 1.279 by ayin, Wed Dec 12 09:33:48 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
… …
309 delete argv; 307 delete argv;
310 308
311#ifdef KEYSYM_RESOURCE 309#ifdef KEYSYM_RESOURCE
312 delete keyboard; 310 delete keyboard;
313#endif 311#endif
312#ifndef NO_RESOURCES
313 XrmDestroyDatabase (option_db);
314#endif
314} 315}
315 316
316// child has exited, usually destroys 317// child has exited, usually destroys
317void 318void
318rxvt_term::child_cb (ev::child &w, int status) 319rxvt_term::child_cb (ev::child &w, int status)
… …
326} 327}
327 328
328void 329void
329rxvt_term::destroy () 330rxvt_term::destroy ()
330{ 331{
331 if (destroy_ev.active) 332 if (ev_is_active (&destroy_ev))
332 return; 333 return;
333 334
334 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 335 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
335 336
336#if ENABLE_OVERLAY 337#if ENABLE_OVERLAY
… …
481 482
482 SET_R (this); 483 SET_R (this);
483 set_locale (""); 484 set_locale ("");
484 set_environ (envv); // few things in X do not call setlocale :( 485 set_environ (envv); // few things in X do not call setlocale :(
485 486
486 if (!init_vars ()) 487 init_vars ();
487 return false;
488 488
489 init_secondary (); 489 init_secondary ();
490 490
491 const char **cmd_argv = init_resources (argc, argv); 491 const char **cmd_argv = init_resources (argc, argv);
492 492
… …
597 ev::sig sw_term, sw_int; 597 ev::sig sw_term, sw_int;
598 598
599 /* 599 /*
600 * Catch a fatal signal and tidy up before quitting 600 * Catch a fatal signal and tidy up before quitting
601 */ 601 */
602 void
603 sig_term (ev::sig &w, int revents) 602 void sig_term (ev::sig &w, int revents);
603
604 sig_handlers ()
604 { 605 {
605 rxvt_emergency_cleanup (); 606 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
606 w.stop ();
607 kill (getpid (), w.signum);
608 }
609
610 sig_handlers ()
611 : sw_term (this, &sig_handlers::sig_term),
612 sw_int (this, &sig_handlers::sig_term) 607 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
613 {
614 } 608 }
615} sig_handlers; 609} sig_handlers;
616 610
611void
612sig_handlers::sig_term (ev::sig &w, int revents)
613{
614 rxvt_emergency_cleanup ();
615 w.stop ();
616 kill (getpid (), w.signum);
617}
618
617char **rxvt_environ; // startup environment 619char **rxvt_environ; // startup environment
618 620
619void 621void
620rxvt_init () 622rxvt_init ()
621{ 623{
622 ptytty::init (); 624 ptytty::init ();
623 625
624 if (!ev::ev_default_loop (0)) 626 if (!ev_default_loop (0))
625 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 627 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
626 628
627 rxvt_environ = environ; 629 rxvt_environ = environ;
628 630
629 signal (SIGHUP, SIG_IGN); 631 signal (SIGHUP, SIG_IGN);
630 signal (SIGPIPE, SIG_IGN); 632 signal (SIGPIPE, SIG_IGN);
631 633
632 sig_handlers.sw_term.start (SIGTERM); ev::ev_unref (); 634 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
633 sig_handlers.sw_int.start (SIGINT); ev::ev_unref (); 635 sig_handlers.sw_int.start (SIGINT); ev_unref ();
634 636
635 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 637 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
636 /* signal (SIGURG, SIG_DFL); */ 638 /* signal (SIGURG, SIG_DFL); */
637 639
638 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 640 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
824 ws.ws_xpixel = width; 826 ws.ws_xpixel = width;
825 ws.ws_ypixel = height; 827 ws.ws_ypixel = height;
826 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 828 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
827 829
828#if 0 830#if 0
829 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 831 // TIOCSWINSZ is supposed to do this automatically and correctly
830 if (cmd_pid) /* force through to the command */ 832 if (cmd_pid) /* force through to the command */
831 kill (-cmd_pid, SIGWINCH); 833 kill (-cmd_pid, SIGWINCH);
832#endif 834#endif
833} 835}
834 836
… …
976 if (isdigit (*color)) 978 if (isdigit (*color))
977 { 979 {
978 i = atoi (color); 980 i = atoi (color);
979 981
980 if (i >= 8 && i <= 15) 982 if (i >= 8 && i <= 15)
983 {
981 { /* bright colors */ 984 /* bright colors */
982 i -= 8;
983 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 985 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
984 goto done; 986 goto done;
985 } 987 }
986 988
987 if (i >= 0 && i <= 7) 989 if (i >= 0 && i <= 7)
990 {
988 { /* normal colors */ 991 /* normal colors */
989 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 992 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
990 goto done; 993 goto done;
991 } 994 }
992 } 995 }
993 996
… …
998 * so just keep gobbling up the colormap 1001 * so just keep gobbling up the colormap
999 */ 1002 */
1000 1003
1001 pix_colors_focused[idx] = xcol; 1004 pix_colors_focused[idx] = xcol;
1002 1005
1003 /* XSetWindowAttributes attr; */
1004 /* Cursor cursor; */
1005done: 1006done:
1006 /*TODO: handle Color_BD, scrollbar background, etc. */ 1007 /*TODO: handle Color_BD, scrollbar background, etc. */
1007 1008
1008 update_fade_color (idx); 1009 update_fade_color (idx);
1009 recolour_cursor (); 1010 recolour_cursor ();
… …
1033 */ 1034 */
1034void 1035void
1035rxvt_term::set_colorfgbg () 1036rxvt_term::set_colorfgbg ()
1036{ 1037{
1037 unsigned int i; 1038 unsigned int i;
1038 const char *xpmb = "\0"; 1039 const char *xpmb = "";
1039 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1040 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1040 1041
1041 strcpy (fstr, "default"); 1042 strcpy (fstr, "default");
1042 strcpy (bstr, "default"); 1043 strcpy (bstr, "default");
1043 for (i = Color_Black; i <= Color_White; i++) 1044 for (i = Color_Black; i <= Color_White; i++)
… …
1743} 1744}
1744 1745
1745#ifdef HAVE_BG_PIXMAP 1746#ifdef HAVE_BG_PIXMAP
1746# if TRACE_PIXMAPS 1747# if TRACE_PIXMAPS
1747# undef update_background 1748# undef update_background
1748int rxvt_term::trace_update_background (const char* file, int line) 1749int rxvt_term::trace_update_background (const char *file, int line)
1749{ 1750{
1750 fprintf (stderr, "%s:%d:update_background()\n", file, line); 1751 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1751 update_background (); 1752 update_background ();
1752} 1753}
1753# endif 1754# endif
1755
1754int 1756int
1755rxvt_term::update_background () 1757rxvt_term::update_background ()
1756{ 1758{
1757 bgPixmap.invalidate (); 1759 bgPixmap.invalidate ();
1758 1760

Diff Legend

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