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.173 by root, Wed Jan 11 19:55:34 2006 UTC vs.
Revision 1.178 by root, Mon Jan 16 08:29:57 2006 UTC

… …
377} 377}
378 378
379void 379void
380rxvt_term::destroy_cb (time_watcher &w) 380rxvt_term::destroy_cb (time_watcher &w)
381{ 381{
382 SET_R (this); 382 make_current ();
383 383
384 delete this; 384 delete this;
385} 385}
386 386
387/*----------------------------------------------------------------------*/ 387/*----------------------------------------------------------------------*/
… …
478/*----------------------------------------------------------------------*/ 478/*----------------------------------------------------------------------*/
479bool 479bool
480rxvt_term::init (int argc, const char *const *argv) 480rxvt_term::init (int argc, const char *const *argv)
481{ 481{
482 SET_R (this); 482 SET_R (this);
483 TEMP_ENV; // few things in X do not call setlocale :(
484
485 set_locale (""); 483 set_locale ("");
484 set_environ (envv); // few things in X do not call setlocale :(
486 485
487 if (!init_vars ()) 486 if (!init_vars ())
488 return false; 487 return false;
489 488
490 init_secondary (); 489 init_secondary ();
… …
523 rs[Rs_perl_eval] = 0; 522 rs[Rs_perl_eval] = 0;
524 } 523 }
525 } 524 }
526#endif 525#endif
527 rxvt_perl.init (); 526 rxvt_perl.init ();
527 setlocale (LC_CTYPE, curlocale); // perl init destroys current locale
528 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 528 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
529 } 529 }
530#endif 530#endif
531 531
532 create_windows (argc, argv); 532 create_windows (argc, argv);
… …
615 sw_int (this, &sig_handlers::sig_term) 615 sw_int (this, &sig_handlers::sig_term)
616 { 616 {
617 } 617 }
618} sig_handlers; 618} sig_handlers;
619 619
620char **rxvt_environ; // startup environment
621
620void 622void
621rxvt_init () 623rxvt_init ()
622{ 624{
625 rxvt_environ = environ;
626
623 /* 627 /*
624 * Save and then give up any super-user privileges 628 * Save and then give up any super-user privileges
625 * If we need privileges in any area then we must specifically request it. 629 * If we need privileges in any area then we must specifically request it.
626 * We should only need to be root in these cases: 630 * We should only need to be root in these cases:
627 * 1. write utmp entries on some systems 631 * 1. write utmp entries on some systems
… …
1446 unsigned long fg, bg; 1450 unsigned long fg, bg;
1447 const char *p; 1451 const char *p;
1448 char **s; 1452 char **s;
1449 XIMStyles *xim_styles; 1453 XIMStyles *xim_styles;
1450 1454
1451 TEMP_ENV; 1455 set_environ (envv);
1452 1456
1453 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1457 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1454 return false; 1458 return false;
1455 1459
1456 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1460 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1622 int i; 1626 int i;
1623 const char *p; 1627 const char *p;
1624 char **s; 1628 char **s;
1625 char buf[IMBUFSIZ]; 1629 char buf[IMBUFSIZ];
1626 1630
1627 SET_R (this); 1631 make_current ();
1628 1632
1629 im_destroy (); 1633 im_destroy ();
1630 1634
1631 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1635 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1632 if (Input_Context) 1636 if (Input_Context)

Diff Legend

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