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.187 by root, Tue Jan 17 16:22:41 2006 UTC vs.
Revision 1.194 by root, Sun Jan 22 00:36:59 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
… …
167 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
168#endif 171#endif
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
175#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb),
177#endif
172 termwin_ev (this, &rxvt_term::x_cb), 178 termwin_ev (this, &rxvt_term::x_cb),
173 vt_ev (this, &rxvt_term::x_cb), 179 vt_ev (this, &rxvt_term::x_cb),
180 child_ev (this, &rxvt_term::child_cb),
174 check_ev (this, &rxvt_term::check_cb), 181 check_ev (this, &rxvt_term::check_cb),
175 flush_ev (this, &rxvt_term::flush_cb), 182 flush_ev (this, &rxvt_term::flush_cb),
176 destroy_ev (this, &rxvt_term::destroy_cb), 183 destroy_ev (this, &rxvt_term::destroy_cb),
177 pty_ev (this, &rxvt_term::pty_cb), 184 pty_ev (this, &rxvt_term::pty_cb),
178 incr_ev (this, &rxvt_term::incr_cb) 185 incr_ev (this, &rxvt_term::incr_cb)
… …
181 188
182 termlist.push_back (this); 189 termlist.push_back (this);
183 190
184#ifdef KEYSYM_RESOURCE 191#ifdef KEYSYM_RESOURCE
185 keyboard = new keyboard_manager; 192 keyboard = new keyboard_manager;
186
187 if (!keyboard)
188 rxvt_fatal ("out of memory, aborting.\n");
189#endif 193#endif
190} 194}
191 195
192// clean up the most important stuff, do *not* call x or free mem etc. 196// clean up the most important stuff, do *not* call x or free mem etc.
193// for use before an emergency exit 197// for use before an emergency exit
… …
199 delete pty; pty = 0; 203 delete pty; pty = 0;
200} 204}
201 205
202rxvt_term::~rxvt_term () 206rxvt_term::~rxvt_term ()
203{ 207{
204 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
205
206 termlist.erase (find (termlist.begin (), termlist.end(), this)); 208 termlist.erase (find (termlist.begin (), termlist.end(), this));
207 209
208 emergency_cleanup (); 210 emergency_cleanup ();
209 211
210#if ENABLE_STYLES 212#if ENABLE_STYLES
… …
285#ifdef KEYSYM_RESOURCE 287#ifdef KEYSYM_RESOURCE
286 delete keyboard; 288 delete keyboard;
287#endif 289#endif
288} 290}
289 291
292// child has exited, usually destroys
290void 293void
291rxvt_term::child_exit () 294rxvt_term::child_cb (child_watcher &w, int status)
292{ 295{
296 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
297
293 cmd_pid = 0; 298 cmd_pid = 0;
294 299
295 if (!OPTION (Opt_hold)) 300 if (!OPTION (Opt_hold))
296 destroy (); 301 destroy ();
297} 302}
298 303
299void 304void
300rxvt_term::destroy () 305rxvt_term::destroy ()
301{ 306{
302 if (destroy_ev.active) 307 if (destroy_ev.active)
308 return;
309
310 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)))
303 return; 311 return;
304 312
305#if ENABLE_OVERLAY 313#if ENABLE_OVERLAY
306 scr_overlay_off (); 314 scr_overlay_off ();
307#endif 315#endif
… …
442 _exit (EXIT_FAILURE); 450 _exit (EXIT_FAILURE);
443} 451}
444 452
445/*----------------------------------------------------------------------*/ 453/*----------------------------------------------------------------------*/
446bool 454bool
447rxvt_term::init (int argc, const char *const *argv) 455rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
448{ 456{
457 this->envv = envv;
458
449 SET_R (this); 459 SET_R (this);
450 set_locale (""); 460 set_locale ("");
451 set_environ (envv); // few things in X do not call setlocale :( 461 set_environ (envv); // few things in X do not call setlocale :(
452 462
453 if (!init_vars ()) 463 if (!init_vars ())
… …
464#ifdef HAVE_SCROLLBARS 474#ifdef HAVE_SCROLLBARS
465 if (OPTION (Opt_scrollBar)) 475 if (OPTION (Opt_scrollBar))
466 scrollBar.setIdle (); /* set existence for size calculations */ 476 scrollBar.setIdle (); /* set existence for size calculations */
467#endif 477#endif
468 478
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 (); 479 pty = rxvt_new_ptytty ();
483 480
484 create_windows (argc, argv); 481 create_windows (argc, argv);
485 482
486 dDisp; 483 dDisp;
… …
504 check_our_parents (); 501 check_our_parents ();
505 rootwin_ev.start (display, display->root); 502 rootwin_ev.start (display, display->root);
506 } 503 }
507#endif 504#endif
508 505
506 set_colorfgbg ();
507
508 init_command (cmd_argv);
509
510 free (cmd_argv);
511
512 if (pty->pty >= 0)
513 pty_ev.start (pty->pty, EVENT_READ);
514
515 check_ev.start ();
516
517 HOOK_INVOKE ((this, HOOK_START, DT_END));
518
509 XMapWindow (disp, vt); 519 XMapWindow (disp, vt);
510 XMapWindow (disp, parent[0]); 520 XMapWindow (disp, parent[0]);
511 521
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; 522 return true;
526} 523}
527 524
528static struct sig_handlers 525static struct sig_handlers
529{ 526{
530 sig_watcher sw_chld, sw_term, sw_int; 527 sig_watcher sw_term, sw_int;
531 528
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 /* 529 /*
547 * Catch a fatal signal and tidy up before quitting 530 * Catch a fatal signal and tidy up before quitting
548 */ 531 */
549 void 532 void
550 sig_term (sig_watcher &w) 533 sig_term (sig_watcher &w)
… …
556 signal (w.signum, SIG_DFL); 539 signal (w.signum, SIG_DFL);
557 kill (getpid (), w.signum); 540 kill (getpid (), w.signum);
558 } 541 }
559 542
560 sig_handlers () 543 sig_handlers ()
561 : sw_chld (this, &sig_handlers::sig_chld),
562 sw_term (this, &sig_handlers::sig_term), 544 : sw_term (this, &sig_handlers::sig_term),
563 sw_int (this, &sig_handlers::sig_term) 545 sw_int (this, &sig_handlers::sig_term)
564 { 546 {
565 } 547 }
566} sig_handlers; 548} sig_handlers;
567 549
… …
574 gid_t gid = getgid (); 556 gid_t gid = getgid ();
575 557
576 // before doing anything else, check for setuid/setgid operation, 558 // before doing anything else, check for setuid/setgid operation,
577 // start the helper process and drop privileges 559 // start the helper process and drop privileges
578 if (uid != geteuid () 560 if (uid != geteuid ()
579 || 1 //D
580 || gid != getegid ()) 561 || gid != getegid ())
581 { 562 {
582#if PTYTTY_HELPER 563#if PTYTTY_HELPER
583 rxvt_ptytty_server (); 564 rxvt_ptytty_server ();
584#else 565#else
… …
605 rxvt_environ = environ; 586 rxvt_environ = environ;
606 587
607 signal (SIGHUP, SIG_IGN); 588 signal (SIGHUP, SIG_IGN);
608 signal (SIGPIPE, SIG_IGN); 589 signal (SIGPIPE, SIG_IGN);
609 590
610 sig_handlers.sw_chld.start (SIGCHLD);
611 sig_handlers.sw_term.start (SIGTERM); 591 sig_handlers.sw_term.start (SIGTERM);
612 sig_handlers.sw_int.start (SIGINT); 592 sig_handlers.sw_int.start (SIGINT);
613 593
614 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 594 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
615 /* signal (SIGURG, SIG_DFL); */ 595 /* signal (SIGURG, SIG_DFL); */
… …
644 rxvt_fatal ("memory allocation failure. aborting.\n"); 624 rxvt_fatal ("memory allocation failure. aborting.\n");
645 625
646 return p; 626 return p;
647} 627}
648 628
649void * 629void *
650rxvt_realloc (void *ptr, size_t size) 630rxvt_realloc (void *ptr, size_t size)
651{ 631{
652 void *p = realloc (ptr, size); 632 void *p = realloc (ptr, size);
653 633
654 if (!p) 634 if (!p)
… …
1602 XFree (preedit_attr); 1582 XFree (preedit_attr);
1603 XFree (status_attr); 1583 XFree (status_attr);
1604} 1584}
1605#endif /* USE_XIM */ 1585#endif /* USE_XIM */
1606 1586
1607/*----------------------------------------------------------------------*/
1608rxvt_t rxvt_current_term;
1609
1610/*----------------------- end-of-file (C source) -----------------------*/ 1587/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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