--- rxvt-unicode/src/init.C	2006/01/11 02:24:12	1.138
+++ rxvt-unicode/src/init.C	2006/01/13 04:59:04	1.142
@@ -341,19 +341,17 @@
   /*
    * Open display, get options/resources and create the window
    */
-  {
-    TEMP_ENV;
 
-    if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
-      rs[Rs_display_name] = ":0";
+  if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
+    rs[Rs_display_name] = ":0";
 
-    get_options (r_argc, r_argv);
+  get_options (r_argc, r_argv);
 
-    if (!(display = displays.get (rs[Rs_display_name])))
-      rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
-  }
+  if (!(display = displays.get (rs[Rs_display_name])))
+    rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
 
   extract_resources ();
+
   free (r_argv);
 
   /*
@@ -582,7 +580,7 @@
 void
 rxvt_term::set_locale (const char *locale)
 {
-  TEMP_ENV;
+  set_environ (envv);
 
 #if HAVE_XSETLOCALE || HAVE_SETLOCALE
   free (this->locale);
@@ -623,7 +621,7 @@
 void
 rxvt_term::init_xlocale ()
 {
-  TEMP_ENV;
+  set_environ (envv);
 
 #ifdef USE_XIM
   if (!locale)
@@ -926,7 +924,6 @@
   MWMHints mwmhints;
 #endif
   XGCValues gcvalue;
-  long vt_emask;
   XSetWindowAttributes attributes;
   XWindowAttributes gattr;
   Window top, parent;
@@ -1099,16 +1096,13 @@
 
   vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
 
-  if (OPTION (Opt_pointerBlank)
-#ifdef ENABLE_PERL
-      || perl.self
-#endif
-      )
+  if (OPTION (Opt_pointerBlank))
     vt_emask |= PointerMotionMask;
   else
     vt_emask |= Button1MotionMask | Button3MotionMask;
 
-  XSelectInput (disp, vt, vt_emask);
+  vt_select_input ();
+
   vt_ev.start (display, vt);
 
 #if defined(MENUBAR) && (MENUBAR_MAX > 1)
@@ -1414,8 +1408,6 @@
 void
 rxvt_term::run_command (const char *const *argv)
 {
-  TEMP_ENV; // not very temporary...
-
 #if ENABLE_FRILLS
   if (rs[Rs_pty_fd])
     {