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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.302 by sf-exg, Fri Dec 2 09:03:43 2011 UTC vs.
Revision 1.317 by sf-exg, Mon Jan 9 21:12:08 2012 UTC

 /*----------------------------------------------------------------------*/
 const char **
 rxvt_term::init_resources (int argc, const char *const *argv)
 {
-  int i, r_argc;
+  int i;
-  const char **cmd_argv, **r_argv;
+  const char **cmd_argv;
-  /*
-   * Look for -e option. Find => split and make cmd_argv[] of command args
-   */
-  for (r_argc = 0; r_argc < argc; r_argc++)
-    if (!strcmp (argv[r_argc], "-e"))
-      break;
-  if (r_argc == argc)
-    cmd_argv = NULL;
-  else if (!argv[r_argc + 1])
-    rxvt_fatal ("option '-e' requires an argument, aborting.\n");
-  else
-    {
-      cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
-      for (i = 0; i < argc - r_argc - 1; i++)
-        cmd_argv[i] = (const char *)argv[i + r_argc + 1];
-      cmd_argv[i] = NULL;
-    }
-  r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
-  for (i = 0; i < r_argc; i++)
-    r_argv[i] = (const char *)argv[i];
-  r_argv[i] = NULL;
   rs[Rs_name] = rxvt_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);
+  cmd_argv = get_options (argc, argv);
   if (!(display = displays.get (rs[Rs_display_name])))
-    {
-      free (r_argv);
-      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]);
-    }
   // using a local pointer decreases code size a lot
   xa = display->xa;
   set (display);
 #if XFT
   if (rs[Rs_depth])
     select_visual (strtol (rs[Rs_depth], 0, 0));
 #endif
-  free (r_argv);
   for (int i = NUM_RESOURCES; i--; )
     if (rs [i] == resval_undef)
       rs [i] = 0;
   return cmd_argv;
 }
 /*----------------------------------------------------------------------*/
 void
-rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
+rxvt_term::init (stringvec *argv, stringvec *envv)
 {
+  argv->push_back (0);
+  envv->push_back (0);
+  this->argv = argv;
   this->envv = envv;
+  init2 (argv->size () - 1, argv->begin ());
+}
+void
+rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
+{
+#if ENABLE_PERL
+  // perl might want to access the stringvecs later, so we need to copy them
+  stringvec *args = new stringvec;
+  for (int i = 0; i < argc; i++)
+    args->push_back (strdup (argv [i]));
+  stringvec *envs = new stringvec;
+  for (const char *const *var = envv; *var; var++)
+    envs->push_back (strdup (*var));
+  init (args, envs);
+#else
+  init2 (argc, argv);
+#endif
+}
+void
+rxvt_term::init2 (int argc, const char *const *argv)
+{
   SET_R (this);
   set_locale ("");
   set_environ (envv); // a few things in X do not call setlocale :(
   init_vars ();
       }
 #endif
 #ifdef BG_IMAGE_FROM_FILE
     if (rs[Rs_backgroundPixmap])
-      {
-        if (bg_set_file (rs[Rs_backgroundPixmap]))
+      if (bg_set_file (rs[Rs_backgroundPixmap]))
-          if (!bg_window_position_sensitive ())
+        if (!bg_window_position_sensitive ())
-            update_background ();
+          update_background ();
-      }
 #endif
   }
 #endif
 #if ENABLE_PERL
   rootwin_ev.start (display, display->root);
 #endif
-  set_colorfgbg ();
+  init_done = 1;
   init_command (cmd_argv);
-  free (cmd_argv);
   if (pty->pty >= 0)
     pty_ev.start (pty->pty, ev::READ);
   HOOK_INVOKE ((this, HOOK_START, DT_END));
 /*----------------------------------------------------------------------*/
 void
 rxvt_term::init_env ()
 {
   char *val;
+  char *env_display;
+  char *env_windowid;
+  char *env_colorfgbg;
+  char *env_term;
 #ifdef DISPLAY_IS_IP
   /* Fixup display_name for export over pty to any interested terminal
    * clients via "ESC[7n" (e.g. shells).  Note we use the pure IP number
    * (for the first non-loopback interface) that we get from
   env_display = (char *)rxvt_malloc (strlen (val) + 9);
   sprintf (env_display, "DISPLAY=%s", val);
+  env_windowid = (char *)rxvt_malloc (21);
   sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
   /* add entries to the environment:
    * @ DISPLAY:   in case we started with -display
    * @ WINDOWID:  X window id number of the window
    * @ COLORFGBG: fg;bg color codes
    */
   putenv (env_display);
   putenv (env_windowid);
-  if (env_colorfgbg)
+  env_colorfgbg = get_colorfgbg ();
-    putenv (env_colorfgbg);
+  putenv (env_colorfgbg);
 #ifdef RXVT_TERMINFO
   putenv ("TERMINFO=" RXVT_TERMINFO);
 #endif
   unsetenv ("TERMCAP");        /* terminfo should be okay */
 #endif /* HAVE_UNSETENV */
 }
 /*----------------------------------------------------------------------*/
-/*
- * This is more or less stolen straight from XFree86 xterm.
- * This should support all European type languages.
- */
 void
 rxvt_term::set_locale (const char *locale)
 {
   set_environ (envv);
   SET_LOCALE (this->locale);
   mbstate.reset ();
 #endif
 #if HAVE_NL_LANGINFO
-  char *codeset = strdup (nl_langinfo (CODESET));
+  char *codeset = nl_langinfo (CODESET);
   // /^UTF.?8/i
   enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
           && (codeset[1] == 'T' || codeset[1] == 't')
           && (codeset[2] == 'F' || codeset[2] == 'f')
           && (codeset[3] == '8' || codeset[4] == '8');
-  free (codeset);
 #else
   enc_utf8 = 0;
 #endif
 }
 {
   set_environ (envv);
 #ifdef USE_XIM
   if (!locale)
-    rxvt_warn ("setting locale failed, working without locale support.\n");
+    rxvt_warn ("setting locale failed, continuing without locale support.\n");
   else
     {
       set_string_property (xa[XA_WM_LOCALE_NAME], locale);
       if (!XSupportsLocale ())
         {
-          rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n");
+          rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
           return;
         }
       im_ev.start (display);
                        CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
                        &attributes);
   this->parent = top;
-  old_width = szHint.width;
-  old_height = szHint.height;
   set_title     (rs [Rs_title]);
   set_icon_name (rs [Rs_iconName]);
   classHint.res_name  = (char *)rs[Rs_name];
   classHint.res_class = (char *)RESCLASS;
   TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
   /* the vt window */
   vt = XCreateSimpleWindow (dpy, top,
                             window_vt_x, window_vt_y,
-                            width, height,
+                            vt_width, vt_height,
                             0,
                             pix_colors_focused[Color_fg],
                             pix_colors_focused[Color_bg]);
   attributes.bit_gravity = NorthWestGravity;
       if (pty->pty >= 0)
         {
           if (getfd_hook)
             pty->pty = (*getfd_hook) (pty->pty);
-          if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
+          if (pty->pty < 0)
             rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
         }
     }
   else
 #endif
     if (!pty->get ())
       rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
+  fcntl (pty->pty, F_SETFL, O_NONBLOCK);
   struct termios tio = def_tio;
 #ifndef NO_BACKSPACE_KEY
   if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
         _exit (EXIT_FAILURE);
       default:
         if (!option (Opt_utmpInhibit))
+          {
+#ifdef LOG_ONLY_ON_LOGIN
+            bool login_shell = option (Opt_loginShell);
+#else
+            bool login_shell = true;
+#endif
-          pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
+            pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
+          }
         pty->close_tty ();
         child_ev.start (cmd_pid);
 #elif defined (SRIOCSREDIR)
       int fd;
       fd = open (CONSOLE, O_WRONLY, 0);
       if (fd >= 0)
-        if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
+        {
+          ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
           close (fd);
+        }
 #endif /* SRIOCSREDIR */
     }
   /* reset signals and spin off the command interpreter */
   signal (SIGINT,  SIG_DFL);

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.302 by sf-exg, Fri Dec 2 09:03:43 2011 UTC vs. Revision 1.317 by sf-exg, Mon Jan 9 21:12:08 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.302 by sf-exg, Fri Dec 2 09:03:43 2011 UTC vs.
Revision 1.317 by sf-exg, Mon Jan 9 21:12:08 2012 UTC