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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.134 by root, Fri Jan 6 05:37:59 2006 UTC vs.
Revision 1.144 by root, Tue Jan 17 11:02:10 2006 UTC

   bgPixmap.pixmap = None;
 #endif
   last_bot = last_state = -1;
-#ifdef MENUBAR
-  menu_readonly = 1;
-# if ! (MENUBAR_MAX > 1)
-  CurrentBar = &BarList;
-# endif                         /* (MENUBAR_MAX > 1) */
-#endif
   return true;
 }
 void
 rxvt_term::init_secondary ()
   rs[Rs_name] = rxvt_r_basename (argv[0]);
   /*
    * Open display, get options/resources and create the window
    */
   if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
     rs[Rs_display_name] = ":0";
   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]);
   extract_resources ();
   free (r_argv);
   /*
    * set any defaults not already set
    */
     pointerBlankDelay = 2;
 #endif
   /* no point having a scrollbar without having any scrollback! */
   if (!saveLines)
-    CLR_OPTION (Opt_scrollBar);
+    set_option (Opt_scrollBar, 0);
 #ifdef PRINTPIPE
   if (!rs[Rs_print_pipe])
     rs[Rs_print_pipe] = PRINTPIPE;
 #endif
  * This should support all European type languages.
  */
 void
 rxvt_term::set_locale (const char *locale)
 {
+  set_environ (envv);
 #if HAVE_XSETLOCALE || HAVE_SETLOCALE
   free (this->locale);
   this->locale = setlocale (LC_CTYPE, locale);
   if (!this->locale)
     {
       if (*locale)
         {
-          rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale);
+          rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
-          setlocale (LC_CTYPE, "");
+          setlocale (LC_CTYPE, "C");
         }
       else
         rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
-      this->locale = "";
+      this->locale = "C";
     }
   this->locale = rxvt_strdup (this->locale);
   SET_LOCALE (this->locale);
 }
 void
 rxvt_term::init_xlocale ()
 {
+  set_environ (envv);
 #ifdef USE_XIM
   if (!locale)
     rxvt_warn ("setting locale failed, working without locale support.\n");
   else
     {
   if (strcmp (key_backspace, "DEC") == 0)
     priv_modes |= PrivMode_HaveBackSpace;
 #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);
 }
       if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
       if (!rs[Rs_color + Color_border]    ) pix_colors[Color_border]     = pix_colors[Color_fg];
     }
   /*
-   * get scrollBar/menuBar shadow colors
+   * get scrollBar shadow colors
    *
    * The calculations of topShadow/bottomShadow values are adapted
    * from the fvwm window manager.
    */
 #ifdef KEEP_SCROLLCOLOR
 #if ENABLE_FRILLS
   Atom prop = None;
   MWMHints mwmhints;
 #endif
   XGCValues gcvalue;
-  long vt_emask;
   XSetWindowAttributes attributes;
   XWindowAttributes gattr;
   Window top, parent;
   dDisp;
 #endif
   /* vt cursor: Black-on-White is standard, but this is more popular */
   TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
-#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
+#ifdef HAVE_SCROLLBARS
-  /* cursor (menuBar/scrollBar): Black-on-White */
+  /* cursor scrollBar: Black-on-White */
   leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
 #endif
   /* the vt window */
   vt = XCreateSimpleWindow (disp, top,
   attributes.bit_gravity = NorthWestGravity;
   XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
   vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
-  if (OPTION (Opt_pointerBlank)
+  if (OPTION (Opt_pointerBlank))
-#ifdef ENABLE_PERL
-      || self
-#endif
-      )
     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)
-  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));
-      XSelectInput (disp, menuBar.win,
-                    (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
-      menubar_ev.start (display, menuBar.win);
-    }
-#endif
 #ifdef XPM_BACKGROUND
   if (rs[Rs_backgroundPixmap] != NULL
       && ! OPTION (Opt_transparent))
     {
                           GCForeground | GCBackground | GCGraphicsExposures,
                           &gcvalue);
   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];
   botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
   gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
 #if ENABLE_FRILLS
   if (rs[Rs_pty_fd])
     return;
 #endif
-#ifndef __QNX__
   /* spin off the command interpreter */
   switch (cmd_pid = fork ())
     {
       case -1:
         {
         }
         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
 }
 /* ------------------------------------------------------------------------- *
  *                          CHILD PROCESS OPERATIONS                         *
  * ------------------------------------------------------------------------- */
   // unblock signals (signals are blocked by iom.C
   sigset_t ss;
   sigemptyset (&ss);
   sigprocmask (SIG_SETMASK, &ss, 0);
-#ifndef __QNX__
   /* command interpreter path */
   if (argv != NULL)
     {
 # ifdef DEBUG_CMD
       int             i;
       execvp (argv[0], (char *const *)argv);
       /* no error message: STDERR is closed! */
     }
   else
     {
-      const char     *argv0, *shell;
+      const char *argv0, *shell;
       if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
         shell = "/bin/sh";
       argv0 = (const char *)rxvt_r_basename (shell);
           login[0] = '-';
           strcpy (&login[1], argv0);
           argv0 = login;
         }
       execlp (shell, argv0, NULL);
       /* 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;
 }
 /*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.134 by root, Fri Jan 6 05:37:59 2006 UTC vs. Revision 1.144 by root, Tue Jan 17 11:02:10 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.134 by root, Fri Jan 6 05:37:59 2006 UTC vs.
Revision 1.144 by root, Tue Jan 17 11:02:10 2006 UTC