--- rxvt-unicode/src/init.C	2006/01/11 02:24:12	1.138
+++ rxvt-unicode/src/init.C	2006/01/16 15:00:20	1.143
@@ -258,13 +258,6 @@
 
   last_bot = last_state = -1;
 
-#ifdef MENUBAR
-  menu_readonly = 1;
-# if ! (MENUBAR_MAX > 1)
-  CurrentBar = &BarList;
-# endif                         /* (MENUBAR_MAX > 1) */
-#endif
-
   return true;
 }
 
@@ -341,19 +334,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 +573,7 @@
 void
 rxvt_term::set_locale (const char *locale)
 {
-  TEMP_ENV;
+  set_environ (envv);
 
 #if HAVE_XSETLOCALE || HAVE_SETLOCALE
   free (this->locale);
@@ -623,7 +614,7 @@
 void
 rxvt_term::init_xlocale ()
 {
-  TEMP_ENV;
+  set_environ (envv);
 
 #ifdef USE_XIM
   if (!locale)
@@ -674,18 +665,12 @@
 #endif
 
   /* add value for scrollBar */
-  if (scrollbar_visible ())
+  if (scrollBar.state)
     {
       priv_modes |= PrivMode_scrollBar;
       SavedModes |= PrivMode_scrollBar;
     }
 
-  if (menubar_visible ())
-    {
-      priv_modes |= PrivMode_menuBar;
-      SavedModes |= PrivMode_menuBar;
-    }
-
   run_command (argv);
 }
 
@@ -761,7 +746,7 @@
     }
 
   /*
-   * get scrollBar/menuBar shadow colors
+   * get scrollBar shadow colors
    *
    * The calculations of topShadow/bottomShadow values are adapted
    * from the fvwm window manager.
@@ -926,7 +911,6 @@
   MWMHints mwmhints;
 #endif
   XGCValues gcvalue;
-  long vt_emask;
   XSetWindowAttributes attributes;
   XWindowAttributes gattr;
   Window top, parent;
@@ -1076,8 +1060,8 @@
   /* vt cursor: Black-on-White is standard, but this is more popular */
   TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
 
-#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
-  /* cursor (menuBar/scrollBar): Black-on-White */
+#ifdef HAVE_SCROLLBARS
+  /* cursor scrollBar: Black-on-White */
   leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
 #endif
 
@@ -1099,43 +1083,14 @@
 
   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_ev.start (display, vt);
-
-#if defined(MENUBAR) && (MENUBAR_MAX > 1)
-  if (menuBar_height ())
-    {
-      menuBar.win = XCreateSimpleWindow (disp, top,
-                                         window_vt_x, 0,
-                                         width,
-                                         menuBar_TotalHeight (),
-                                         0,
-                                         pix_colors_focused[Color_fg],
-                                         pix_colors_focused[Color_scroll]);
-
-#ifdef DEBUG_X
-      XStoreName (disp, menuBar.win, "menubar");
-#endif
-
-      menuBar.drawable = new rxvt_drawable (display, menuBar.win);
+  vt_select_input ();
 
-      XDefineCursor (disp, menuBar.win,
-                     XCreateFontCursor (disp, XC_left_ptr));
-
-      XSelectInput (disp, menuBar.win,
-                    (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
-      menubar_ev.start (display, menuBar.win);
-    }
-#endif
+  vt_ev.start (display, vt);
 
 #ifdef XPM_BACKGROUND
   if (rs[Rs_backgroundPixmap] != NULL
@@ -1164,7 +1119,7 @@
 
   drawable = new rxvt_drawable (display, vt);
 
-#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
+#ifdef RXVT_SCROLLBAR
   gcvalue.foreground = pix_colors[Color_topShadow];
   topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
   gcvalue.foreground = pix_colors[Color_bottomShadow];
@@ -1414,8 +1369,6 @@
 void
 rxvt_term::run_command (const char *const *argv)
 {
-  TEMP_ENV; // not very temporary...
-
 #if ENABLE_FRILLS
   if (rs[Rs_pty_fd])
     {