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.191 by root, Fri Jan 20 10:27:08 2006 UTC vs.
Revision 1.194 by root, Sun Jan 22 00:36:59 2006 UTC

170 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
171#endif 171#endif
172#ifdef USE_XIM 172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
174#endif 174#endif
175#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb),
177#endif
175 termwin_ev (this, &rxvt_term::x_cb), 178 termwin_ev (this, &rxvt_term::x_cb),
176 vt_ev (this, &rxvt_term::x_cb), 179 vt_ev (this, &rxvt_term::x_cb),
177 child_ev (this, &rxvt_term::child_cb), 180 child_ev (this, &rxvt_term::child_cb),
178 check_ev (this, &rxvt_term::check_cb), 181 check_ev (this, &rxvt_term::check_cb),
179 flush_ev (this, &rxvt_term::flush_cb), 182 flush_ev (this, &rxvt_term::flush_cb),
447 _exit (EXIT_FAILURE); 450 _exit (EXIT_FAILURE);
448} 451}
449 452
450/*----------------------------------------------------------------------*/ 453/*----------------------------------------------------------------------*/
451bool 454bool
452rxvt_term::init (int argc, const char *const *argv) 455rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
453{ 456{
457 this->envv = envv;
458
454 SET_R (this); 459 SET_R (this);
455 set_locale (""); 460 set_locale ("");
456 set_environ (envv); // few things in X do not call setlocale :( 461 set_environ (envv); // few things in X do not call setlocale :(
457 462
458 if (!init_vars ()) 463 if (!init_vars ())
462 467
463 const char **cmd_argv = init_resources (argc, argv); 468 const char **cmd_argv = init_resources (argc, argv);
464 469
465#ifdef KEYSYM_RESOURCE 470#ifdef KEYSYM_RESOURCE
466 keyboard->register_done (); 471 keyboard->register_done ();
467#endif
468
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 472#endif
481 473
482#ifdef HAVE_SCROLLBARS 474#ifdef HAVE_SCROLLBARS
483 if (OPTION (Opt_scrollBar)) 475 if (OPTION (Opt_scrollBar))
484 scrollBar.setIdle (); /* set existence for size calculations */ 476 scrollBar.setIdle (); /* set existence for size calculations */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines