--- rxvt-unicode/src/init.C	2006/01/13 04:19:41	1.141
+++ rxvt-unicode/src/init.C	2006/01/17 11:02:10	1.144
@@ -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;
 }
 
@@ -672,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);
 }
 
@@ -759,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.
@@ -1073,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
 
@@ -1096,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);
-
-      XDefineCursor (disp, menuBar.win,
-                     XCreateFontCursor (disp, XC_left_ptr));
+  vt_select_input ();
 
-      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
@@ -1161,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];
@@ -1453,7 +1411,6 @@
     return;
 #endif
 
-#ifndef __QNX__
   /* spin off the command interpreter */
   switch (cmd_pid = fork ())
     {
@@ -1510,14 +1467,6 @@
         pty.close_tty ();   /* keep STDERR_FILENO, pty.pty, display->fd () open */
         break;
     }
-#else                           /* __QNX__ uses qnxspawn () */
-  fchmod (pty.tty, 0622);
-  fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
-  fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
-
-  if (run_child (argv) == -1)
-    exit (EXIT_FAILURE);
-#endif
 }
 
 /* ------------------------------------------------------------------------- *
@@ -1571,7 +1520,6 @@
   sigemptyset (&ss);
   sigprocmask (SIG_SETMASK, &ss, 0);
 
-#ifndef __QNX__
   /* command interpreter path */
   if (argv != NULL)
     {
@@ -1607,62 +1555,6 @@
       /* no error message: STDERR is closed! */
     }
 
-#else                           /* __QNX__ uses qnxspawn () */
-
-  char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
-  char *command = NULL, fullcommand[_MAX_PATH];
-  char **arg_v, *arg_a[2] = { NULL, NULL };
-
-  if (argv != NULL)
-    {
-      if (access (argv[0], X_OK) == -1)
-        {
-          if (strchr (argv[0], '/') == NULL)
-            {
-              searchenv (argv[0], "PATH", fullcommand);
-
-              if (fullcommand[0] != '\0')
-                command = fullcommand;
-            }
-
-          if (access (command, X_OK) == -1)
-            return -1;
-        }
-      else
-        command = argv[0];
-
-      arg_v = argv;
-    }
-  else
-    {
-      if ((command = getenv ("SHELL")) == NULL || *command == '\0')
-        command = "/bin/sh";
-
-      arg_a[0] = my_basename (command);
-
-      if (OPTION (Opt_loginShell))
-        {
-          login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
-
-          login[0] = '-';
-          strcpy (&login[1], arg_a[0]);
-          arg_a[0] = login;
-        }
-
-      arg_v = arg_a;
-    }
-
-  iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
-  cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
-                       _SPAWN_SETSID | _SPAWN_TCSETPGRP,
-                       command, arg_v, environ, iov_a, 0);
-  if (login)
-    free (login);
-
-  pty.close_tty ();
-  return pty.pty;
-#endif
-
   return -1;
 }