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.269 by root, Tue Dec 4 14:50:42 2007 UTC vs.
Revision 1.281 by root, Fri Dec 14 02:10: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 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{
158#if HAVE_BG_PIXMAP 156#if HAVE_BG_PIXMAP
159 update_background_ev(this, &rxvt_term::update_background_cb), 157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
160#endif 158#endif
161#ifdef CURSOR_BLINK 159#ifdef CURSOR_BLINK
162 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
163#endif 161#endif
164#ifdef TEXT_BLINK 162#ifdef TEXT_BLINK
165 text_blink_ev (this, &rxvt_term::text_blink_cb), 163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
166#endif 164#endif
167#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
168 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb), 166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
169#endif 167#endif
170#ifdef SELECTION_SCROLLING 168#ifdef SELECTION_SCROLLING
171 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb), 169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
172#endif 170#endif
173#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
174 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb), 172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
176#endif
177#ifdef HAVE_SCROLLBARS
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#endif
180#ifdef USE_XIM
181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
175#endif 182#endif
176#ifdef POINTER_BLANK 183#ifdef POINTER_BLANK
177 pointer_ev (this, &rxvt_term::pointer_cb), 184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
178#endif 185#endif
179#ifndef NO_BELL 186#ifndef NO_BELL
180 bell_ev (this, &rxvt_term::bell_cb), 187 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
181#endif 188#endif
182 child_ev (this, &rxvt_term::child_cb), 189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
183 prepare_ev (this, &rxvt_term::prepare_cb), 190 prepare_ev.set <rxvt_term, &rxvt_term::prepare_cb> (this);
184 flush_ev (this, &rxvt_term::flush_cb), 191 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
185 destroy_ev (this, &rxvt_term::destroy_cb), 192 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
186 pty_ev (this, &rxvt_term::pty_cb), 193 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
187 incr_ev (this, &rxvt_term::incr_cb) 194 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
188{ 195 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
189#if ENABLE_TRANSPARENCY || ENABLE_PERL 196 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
190 callback_set (rootwin_ev , this, rxvt_term, rootwin_cb);
191#endif
192#ifdef HAVE_SCROLLBARS
193 callback_set (scrollbar_ev, this, rxvt_term, x_cb);
194#endif
195#ifdef USE_XIM
196 callback_set (im_ev , this, rxvt_term, im_cb);
197#endif
198 callback_set (termwin_ev , this, rxvt_term, x_cb);
199 callback_set (vt_ev , this, rxvt_term, x_cb);
200 197
201 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 198 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
202 199
203 termlist.push_back (this); 200 termlist.push_back (this);
204 201
… …
330} 327}
331 328
332void 329void
333rxvt_term::destroy () 330rxvt_term::destroy ()
334{ 331{
335 if (destroy_ev.active) 332 if (destroy_ev.is_active ())
336 return; 333 return;
337 334
338 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 335 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
339 336
340#if ENABLE_OVERLAY 337#if ENABLE_OVERLAY
… …
476 rxvt_emergency_cleanup (); 473 rxvt_emergency_cleanup ();
477 _exit (EXIT_FAILURE); 474 _exit (EXIT_FAILURE);
478} 475}
479 476
480/*----------------------------------------------------------------------*/ 477/*----------------------------------------------------------------------*/
481bool 478void
482rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 479rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
483{ 480{
484 this->envv = envv; 481 this->envv = envv;
485 482
486 SET_R (this); 483 SET_R (this);
487 set_locale (""); 484 set_locale ("");
488 set_environ (envv); // few things in X do not call setlocale :( 485 set_environ (envv); // few things in X do not call setlocale :(
489 486
490 if (!init_vars ()) 487 init_vars ();
491 return false;
492 488
493 init_secondary (); 489 init_secondary ();
494 490
495 const char **cmd_argv = init_resources (argc, argv); 491 const char **cmd_argv = init_resources (argc, argv);
496 492
… …
590 } 586 }
591#endif 587#endif
592 588
593 XMapWindow (dpy, vt); 589 XMapWindow (dpy, vt);
594 XMapWindow (dpy, parent[0]); 590 XMapWindow (dpy, parent[0]);
595
596 return true;
597} 591}
598 592
599static struct sig_handlers 593static struct sig_handlers
600{ 594{
601 ev::sig sw_term, sw_int; 595 ev::sig sw_term, sw_int;
602 596
603 /* 597 /*
604 * Catch a fatal signal and tidy up before quitting 598 * Catch a fatal signal and tidy up before quitting
605 */ 599 */
606 void
607 sig_term (ev::sig &w, int revents) 600 void sig_term (ev::sig &w, int revents);
601
602 sig_handlers ()
608 { 603 {
609 rxvt_emergency_cleanup (); 604 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
610 w.stop ();
611 kill (getpid (), w.signum);
612 }
613
614 sig_handlers ()
615 : sw_term (this, &sig_handlers::sig_term),
616 sw_int (this, &sig_handlers::sig_term) 605 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
617 {
618 } 606 }
619} sig_handlers; 607} sig_handlers;
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}
620 616
621char **rxvt_environ; // startup environment 617char **rxvt_environ; // startup environment
622 618
623void 619void
624rxvt_init () 620rxvt_init ()
… …
828 ws.ws_xpixel = width; 824 ws.ws_xpixel = width;
829 ws.ws_ypixel = height; 825 ws.ws_ypixel = height;
830 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 826 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
831 827
832#if 0 828#if 0
833 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 829 // TIOCSWINSZ is supposed to do this automatically and correctly
834 if (cmd_pid) /* force through to the command */ 830 if (cmd_pid) /* force through to the command */
835 kill (-cmd_pid, SIGWINCH); 831 kill (-cmd_pid, SIGWINCH);
836#endif 832#endif
837} 833}
838 834

Diff Legend

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