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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.138 by root, Wed Jan 11 02:24:12 2006 UTC vs.
Revision 1.148 by root, Wed Jan 18 19:43:51 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
    */
-  {
-    TEMP_ENV;
-    if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
+  if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
-      rs[Rs_display_name] = ":0";
+    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])))
+  if (!(display = displays.get (rs[Rs_display_name])))
-      rxvt_fatal ("can't open display %s, aborting.\n", 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
    */
  * This should support all European type languages.
  */
 void
 rxvt_term::set_locale (const char *locale)
 {
-  TEMP_ENV;
+  set_environ (envv);
 #if HAVE_XSETLOCALE || HAVE_SETLOCALE
   free (this->locale);
   this->locale = setlocale (LC_CTYPE, locale);
 }
 void
 rxvt_term::init_xlocale ()
 {
-  TEMP_ENV;
+  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;
     {
       XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
       display->depth = gattr.depth; // doh //TODO, per-term not per-display?
     }
+  /* grab colors before netscape does */
+  Get_Colours ();
+  if (!set_fonts ())
+    rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
+  parent = DefaultRootWindow (disp);
+  attributes.override_redirect = !!OPTION (Opt_override_redirect);
 #if ENABLE_FRILLS
   if (OPTION (Opt_borderLess))
     {
-      prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
+      prop = XInternAtom (disp, "_MOTIF_WM_INFO", True);
       if (prop == None)
         {
           /*     print_warning("Window Manager does not support MWM hints.  Bypassing window manager control for borderless window.\n");*/
-#ifdef PREFER_24BIT
           attributes.override_redirect = TRUE;
-#endif
           mwmhints.flags = 0;
         }
       else
         {
           mwmhints.flags = MWM_HINTS_DECORATIONS;
     }
   else
     mwmhints.flags = 0;
 #endif
-  /* grab colors before netscape does */
-  Get_Colours ();
-  if (!set_fonts ())
-    rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
-  parent = DefaultRootWindow (disp);
 #if ENABLE_XEMBED
   if (rs[Rs_embed])
     {
       XWindowAttributes wattr;
 #endif
   window_calc (0, 0);
   /* sub-window placement & size in rxvt_resize_subwindows () */
-#ifdef PREFER_24BIT
   attributes.background_pixel = pix_colors_focused[Color_border];
   attributes.border_pixel = pix_colors_focused[Color_border];
   attributes.colormap = display->cmap;
   top = XCreateWindow (disp, parent,
                        szHint.x, szHint.y,
                        szHint.width, szHint.height,
                        ext_bwidth,
                        display->depth, InputOutput,
                        display->visual,
-                       CWColormap | CWBackPixel | CWBorderPixel, &attributes);
+                       CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
-#else
+                       &attributes);
-  top = XCreateSimpleWindow (disp, parent,
-                             szHint.x, szHint.y,
-                             szHint.width, szHint.height,
-                             ext_bwidth,
-                             pix_colors_focused[Color_border],
-                             pix_colors_focused[Color_border]);
-#endif
   this->parent[0] = top;
   old_width = szHint.width;
   old_height = szHint.height;
 #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
-      || 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)];
  * the slave.
  */
 void
 rxvt_term::run_command (const char *const *argv)
 {
-  TEMP_ENV; // not very temporary...
 #if ENABLE_FRILLS
   if (rs[Rs_pty_fd])
     {
-      pty.pty = atoi (rs[Rs_pty_fd]);
+      pty->pty = atoi (rs[Rs_pty_fd]);
-      if (pty.pty >= 0)
+      if (pty->pty >= 0)
         {
           if (getfd_hook)
-            pty.pty = (*getfd_hook) (pty.pty);
+            pty->pty = (*getfd_hook) (pty->pty);
-          if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK))
+          if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
             rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
         }
     }
   else
 #endif
-    if (!pty.get ())
+    if (!pty->get ())
       rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
-  pty.set_utf8_mode (enc_utf8);
+  pty->set_utf8_mode (enc_utf8);
   /* set initial window size */
   tt_winch ();
   int er;
 #if ENABLE_FRILLS
   if (rs[Rs_pty_fd])
     return;
 #endif
-#ifndef __QNX__
   /* spin off the command interpreter */
   switch (cmd_pid = fork ())
     {
       case -1:
         {
           rxvt_fatal ("can't fork, aborting.\n");
         }
       case 0:
         init_env ();
-        if (!pty.make_controlling_tty ())
+        if (!pty->make_controlling_tty ())
           fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
         else
           {
             /* Reopen stdin, stdout and stderr over the tty file descriptor */
-            dup2 (pty.tty, STDIN_FILENO);
+            dup2 (pty->tty, STDIN_FILENO);
-            dup2 (pty.tty, STDOUT_FILENO);
+            dup2 (pty->tty, STDOUT_FILENO);
-            dup2 (pty.tty, STDERR_FILENO);
+            dup2 (pty->tty, STDERR_FILENO);
             // close all our file handles that we do no longer need
             for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
               {
-                if ((*t)->pty.pty > 2) close ((*t)->pty.pty);
+                if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
-                if ((*t)->pty.tty > 2) close ((*t)->pty.tty);
+                if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
               }
             run_child (argv);
             fprintf (stderr, "%s: unable to exec child.", RESNAME);
           }
         _exit (EXIT_FAILURE);
       default:
-        {
-#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
-          int fdstdin;
-          fdstdin = dup (STDIN_FILENO);
-          dup2 (pty.tty, STDIN_FILENO);
-#endif
-#ifdef UTMP_SUPPORT
+#if UTMP_SUPPORT
-          privileged_utmp (SAVE);
+        if (!OPTION (Opt_utmpInhibit))
+          pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
 #endif
-#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
+        pty->close_tty ();
-          dup2 (fdstdin, STDIN_FILENO);
-          close (fdstdin);
-#endif
-        }
-        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;
       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.138 by root, Wed Jan 11 02:24:12 2006 UTC vs. Revision 1.148 by root, Wed Jan 18 19:43:51 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.138 by root, Wed Jan 11 02:24:12 2006 UTC vs.
Revision 1.148 by root, Wed Jan 18 19:43:51 2006 UTC