[ViewVC] Diff of: cvs/rxvt-unicode/src/main.C

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.192 by root, Fri Jan 20 12:16:28 2006 UTC vs.
Revision 1.195 by root, Sun Jan 22 00:48:13 2006 UTC

     pointer_ev (this, &rxvt_term::pointer_cb),
 #endif
 #ifdef USE_XIM
     im_ev (this, &rxvt_term::im_cb),
 #endif
+#ifndef NO_BELL
+    bell_ev (this, &rxvt_term::bell_cb),
+#endif
     termwin_ev (this, &rxvt_term::x_cb),
     vt_ev (this, &rxvt_term::x_cb),
     child_ev (this, &rxvt_term::child_cb),
     check_ev (this, &rxvt_term::check_cb),
     flush_ev (this, &rxvt_term::flush_cb),
   _exit (EXIT_FAILURE);
 }
 /*----------------------------------------------------------------------*/
 bool
-rxvt_term::init (int argc, const char *const *argv)
+rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
 {
+  this->envv = envv;
   SET_R (this);
   set_locale ("");
   set_environ (envv); // few things in X do not call setlocale :(
   if (!init_vars ())
 #ifdef HAVE_SCROLLBARS
   if (OPTION (Opt_scrollBar))
     scrollBar.setIdle ();    /* set existence for size calculations */
 #endif
-  pty = rxvt_new_ptytty ();
+  pty = ptytty_new ();
   create_windows (argc, argv);
   dDisp;
   // start the helper process and drop privileges
   if (uid != geteuid ()
       || gid != getegid ())
     {
 #if PTYTTY_HELPER
-      rxvt_ptytty_server ();
+      ptytty_server ();
 #else
       rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
 #endif
       // drop privileges

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