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.188 by root, Wed Jan 18 08:33:34 2006 UTC vs.
Revision 1.192 by root, Fri Jan 20 12:16:28 2006 UTC

… …
48# include <termios.h> 48# include <termios.h>
49#endif 49#endif
50 50
51vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
52 52
53// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term;
55
53static char curlocale[128], savelocale[128]; 56static char curlocale[128], savelocale[128];
54 57
55bool 58bool
56rxvt_set_locale (const char *locale) 59rxvt_set_locale (const char *locale) NOTHROW
57{ 60{
58 if (!locale || !strncmp (locale, curlocale, 128)) 61 if (!locale || !strncmp (locale, curlocale, 128))
59 return false; 62 return false;
60 63
61 strncpy (curlocale, locale, 128); 64 strncpy (curlocale, locale, 128);
62 setlocale (LC_CTYPE, curlocale); 65 setlocale (LC_CTYPE, curlocale);
63 return true; 66 return true;
64} 67}
65 68
66void 69void
67rxvt_push_locale (const char *locale) 70rxvt_push_locale (const char *locale) NOTHROW
68{ 71{
69 strcpy (savelocale, curlocale); 72 strcpy (savelocale, curlocale);
70 rxvt_set_locale (locale); 73 rxvt_set_locale (locale);
71} 74}
72 75
73void 76void
74rxvt_pop_locale () 77rxvt_pop_locale () NOTHROW
75{ 78{
76 rxvt_set_locale (savelocale); 79 rxvt_set_locale (savelocale);
77} 80}
78 81
79#if ENABLE_COMBINING 82#if ENABLE_COMBINING
… …
169#ifdef USE_XIM 172#ifdef USE_XIM
170 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
171#endif 174#endif
172 termwin_ev (this, &rxvt_term::x_cb), 175 termwin_ev (this, &rxvt_term::x_cb),
173 vt_ev (this, &rxvt_term::x_cb), 176 vt_ev (this, &rxvt_term::x_cb),
177 child_ev (this, &rxvt_term::child_cb),
174 check_ev (this, &rxvt_term::check_cb), 178 check_ev (this, &rxvt_term::check_cb),
175 flush_ev (this, &rxvt_term::flush_cb), 179 flush_ev (this, &rxvt_term::flush_cb),
176 destroy_ev (this, &rxvt_term::destroy_cb), 180 destroy_ev (this, &rxvt_term::destroy_cb),
177 pty_ev (this, &rxvt_term::pty_cb), 181 pty_ev (this, &rxvt_term::pty_cb),
178 incr_ev (this, &rxvt_term::incr_cb) 182 incr_ev (this, &rxvt_term::incr_cb)
… …
181 185
182 termlist.push_back (this); 186 termlist.push_back (this);
183 187
184#ifdef KEYSYM_RESOURCE 188#ifdef KEYSYM_RESOURCE
185 keyboard = new keyboard_manager; 189 keyboard = new keyboard_manager;
186
187 if (!keyboard)
188 rxvt_fatal ("out of memory, aborting.\n");
189#endif 190#endif
190} 191}
191 192
192// clean up the most important stuff, do *not* call x or free mem etc. 193// clean up the most important stuff, do *not* call x or free mem etc.
193// for use before an emergency exit 194// for use before an emergency exit
… …
199 delete pty; pty = 0; 200 delete pty; pty = 0;
200} 201}
201 202
202rxvt_term::~rxvt_term () 203rxvt_term::~rxvt_term ()
203{ 204{
204 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
205
206 termlist.erase (find (termlist.begin (), termlist.end(), this)); 205 termlist.erase (find (termlist.begin (), termlist.end(), this));
207 206
208 emergency_cleanup (); 207 emergency_cleanup ();
209 208
210#if ENABLE_STYLES 209#if ENABLE_STYLES
… …
285#ifdef KEYSYM_RESOURCE 284#ifdef KEYSYM_RESOURCE
286 delete keyboard; 285 delete keyboard;
287#endif 286#endif
288} 287}
289 288
289// child has exited, usually destroys
290void 290void
291rxvt_term::child_exit () 291rxvt_term::child_cb (child_watcher &w, int status)
292{ 292{
293 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
294
293 cmd_pid = 0; 295 cmd_pid = 0;
294 296
295 if (!OPTION (Opt_hold)) 297 if (!OPTION (Opt_hold))
296 destroy (); 298 destroy ();
297} 299}
298 300
299void 301void
300rxvt_term::destroy () 302rxvt_term::destroy ()
301{ 303{
302 if (destroy_ev.active) 304 if (destroy_ev.active)
305 return;
306
307 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)))
303 return; 308 return;
304 309
305#if ENABLE_OVERLAY 310#if ENABLE_OVERLAY
306 scr_overlay_off (); 311 scr_overlay_off ();
307#endif 312#endif
… …
464#ifdef HAVE_SCROLLBARS 469#ifdef HAVE_SCROLLBARS
465 if (OPTION (Opt_scrollBar)) 470 if (OPTION (Opt_scrollBar))
466 scrollBar.setIdle (); /* set existence for size calculations */ 471 scrollBar.setIdle (); /* set existence for size calculations */
467#endif 472#endif
468 473
469#if ENABLE_PERL
470 if (!rs[Rs_perl_ext_1])
471 rs[Rs_perl_ext_1] = "default";
472
473 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
474 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
475 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
476 {
477 rxvt_perl.init (this);
478 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
479 }
480#endif
481
482 pty = rxvt_new_ptytty (); 474 pty = rxvt_new_ptytty ();
483 475
484 create_windows (argc, argv); 476 create_windows (argc, argv);
485 477
486 dDisp; 478 dDisp;
… …
504 check_our_parents (); 496 check_our_parents ();
505 rootwin_ev.start (display, display->root); 497 rootwin_ev.start (display, display->root);
506 } 498 }
507#endif 499#endif
508 500
501 set_colorfgbg ();
502
503 init_command (cmd_argv);
504
505 free (cmd_argv);
506
507 if (pty->pty >= 0)
508 pty_ev.start (pty->pty, EVENT_READ);
509
510 check_ev.start ();
511
512 HOOK_INVOKE ((this, HOOK_START, DT_END));
513
509 XMapWindow (disp, vt); 514 XMapWindow (disp, vt);
510 XMapWindow (disp, parent[0]); 515 XMapWindow (disp, parent[0]);
511 516
512 set_colorfgbg ();
513
514 init_command (cmd_argv);
515
516 free (cmd_argv);
517
518 if (pty->pty >= 0)
519 pty_ev.start (pty->pty, EVENT_READ);
520
521 check_ev.start ();
522
523 HOOK_INVOKE ((this, HOOK_START, DT_END));
524
525 return true; 517 return true;
526} 518}
527 519
528static struct sig_handlers 520static struct sig_handlers
529{ 521{
530 sig_watcher sw_chld, sw_term, sw_int; 522 sig_watcher sw_term, sw_int;
531 523
532 void sig_chld (sig_watcher &w)
533 {
534 // we are being called for every SIGCHLD, find the corresponding term
535 int pid;
536
537 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
538 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
539 if (pid == (*t)->cmd_pid)
540 {
541 (*t)->child_exit ();
542 break;
543 }
544 }
545
546 /* 524 /*
547 * Catch a fatal signal and tidy up before quitting 525 * Catch a fatal signal and tidy up before quitting
548 */ 526 */
549 void 527 void
550 sig_term (sig_watcher &w) 528 sig_term (sig_watcher &w)
… …
556 signal (w.signum, SIG_DFL); 534 signal (w.signum, SIG_DFL);
557 kill (getpid (), w.signum); 535 kill (getpid (), w.signum);
558 } 536 }
559 537
560 sig_handlers () 538 sig_handlers ()
561 : sw_chld (this, &sig_handlers::sig_chld),
562 sw_term (this, &sig_handlers::sig_term), 539 : sw_term (this, &sig_handlers::sig_term),
563 sw_int (this, &sig_handlers::sig_term) 540 sw_int (this, &sig_handlers::sig_term)
564 { 541 {
565 } 542 }
566} sig_handlers; 543} sig_handlers;
567 544
… …
604 rxvt_environ = environ; 581 rxvt_environ = environ;
605 582
606 signal (SIGHUP, SIG_IGN); 583 signal (SIGHUP, SIG_IGN);
607 signal (SIGPIPE, SIG_IGN); 584 signal (SIGPIPE, SIG_IGN);
608 585
609 sig_handlers.sw_chld.start (SIGCHLD);
610 sig_handlers.sw_term.start (SIGTERM); 586 sig_handlers.sw_term.start (SIGTERM);
611 sig_handlers.sw_int.start (SIGINT); 587 sig_handlers.sw_int.start (SIGINT);
612 588
613 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 589 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
614 /* signal (SIGURG, SIG_DFL); */ 590 /* signal (SIGURG, SIG_DFL); */
… …
643 rxvt_fatal ("memory allocation failure. aborting.\n"); 619 rxvt_fatal ("memory allocation failure. aborting.\n");
644 620
645 return p; 621 return p;
646} 622}
647 623
648void * 624void *
649rxvt_realloc (void *ptr, size_t size) 625rxvt_realloc (void *ptr, size_t size)
650{ 626{
651 void *p = realloc (ptr, size); 627 void *p = realloc (ptr, size);
652 628
653 if (!p) 629 if (!p)
… …
1601 XFree (preedit_attr); 1577 XFree (preedit_attr);
1602 XFree (status_attr); 1578 XFree (status_attr);
1603} 1579}
1604#endif /* USE_XIM */ 1580#endif /* USE_XIM */
1605 1581
1606/*----------------------------------------------------------------------*/
1607rxvt_t rxvt_current_term;
1608
1609/*----------------------- end-of-file (C source) -----------------------*/ 1582/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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