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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.249 by ayin, Tue Feb 19 10:47:03 2008 UTC vs.
Revision 1.350 by root, Sat Jul 3 04:04:13 2021 UTC

  * Copyright (c) 1996      Chuck Blake <cblake@BBN.COM>
  * Copyright (c) 1997      mj olesen <olesen@me.queensu.ca>
  * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
  * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
  *                              - extensive modifications
- * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
+ * Copyright (c) 2015      Emanuele Giaquinta <e.giaquinta@glauco.it>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #include "init.h"
 #include "keyboard.h"
 #include <limits>
-#include <csignal>
+#include <signal.h>
 #include <fcntl.h>
+#ifdef HAVE_XMU
+# include <X11/Xmu/CurUtil.h>
+#endif
 #ifdef HAVE_XSETLOCALE
 # define X_LOCALE
 # include <X11/Xlocale.h>
 #else
-# ifdef HAVE_SETLOCALE
-#  include <clocale>
+# include <locale.h>
-# endif
 #endif
 #ifdef HAVE_NL_LANGINFO
 # include <langinfo.h>
+#endif
+#ifdef HAVE_STARTUP_NOTIFICATION
+# define SN_API_NOT_YET_FROZEN
+# include <libsn/sn-launchee.h>
 #endif
 #ifdef DISPLAY_IS_IP
 /* On Solaris link with -lsocket and -lnsl */
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <net/if.h>
 #include <net/if_arp.h>
-static char *
+static char * ecb_cold
 rxvt_network_display (const char *display)
 {
   char            buffer[1024], *rval = NULL;
   struct ifconf   ifc;
   struct ifreq   *ifr;
   return rval;
 }
 #endif
+#define NULL_5   \
+        NULL,    \
+        NULL,    \
+        NULL,    \
+        NULL,    \
+        NULL,
+#define NULL_10  \
+        NULL_5   \
+        NULL_5
+#define NULL_40  \
+        NULL_10  \
+        NULL_10  \
+        NULL_10  \
+        NULL_10
+#define NULL_50  \
+        NULL_40  \
+        NULL_10
+#define NULL_100 \
+        NULL_50  \
+        NULL_50
-const char *const def_colorName[] =
+static const char *const def_colorName[] =
   {
     COLOR_FOREGROUND,
     COLOR_BACKGROUND,
     /* low-intensity colors */
     "rgb:00/00/00",             // 0: black             (Black)
     "rgb:00/00/ff",             // 4/12: bright blue    (Blue)
     "rgb:ff/00/ff",             // 5/13: bright magenta (Magenta)
     "rgb:00/ff/ff",             // 6/14: bright cyan    (Cyan)
     "rgb:ff/ff/ff",             // 7/15: bright white   (White)
+#if !USE_256_COLORS
     // 88 xterm colours
     "rgb:00/00/00",
     "rgb:00/00/8b",
     "rgb:00/00/cd",
     "rgb:00/00/ff",
     "rgb:8b/8b/8b",
     "rgb:a2/a2/a2",
     "rgb:b9/b9/b9",
     "rgb:d0/d0/d0",
     "rgb:e7/e7/e7",
+    NULL_100
+    NULL_40
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+#else
+    // 256 xterm colours
+    "rgb:00/00/00",
+    "rgb:00/00/5f",
+    "rgb:00/00/87",
+    "rgb:00/00/af",
+    "rgb:00/00/d7",
+    "rgb:00/00/ff",
+    "rgb:00/5f/00",
+    "rgb:00/5f/5f",
+    "rgb:00/5f/87",
+    "rgb:00/5f/af",
+    "rgb:00/5f/d7",
+    "rgb:00/5f/ff",
+    "rgb:00/87/00",
+    "rgb:00/87/5f",
+    "rgb:00/87/87",
+    "rgb:00/87/af",
+    "rgb:00/87/d7",
+    "rgb:00/87/ff",
+    "rgb:00/af/00",
+    "rgb:00/af/5f",
+    "rgb:00/af/87",
+    "rgb:00/af/af",
+    "rgb:00/af/d7",
+    "rgb:00/af/ff",
+    "rgb:00/d7/00",
+    "rgb:00/d7/5f",
+    "rgb:00/d7/87",
+    "rgb:00/d7/af",
+    "rgb:00/d7/d7",
+    "rgb:00/d7/ff",
+    "rgb:00/ff/00",
+    "rgb:00/ff/5f",
+    "rgb:00/ff/87",
+    "rgb:00/ff/af",
+    "rgb:00/ff/d7",
+    "rgb:00/ff/ff",
+    "rgb:5f/00/00",
+    "rgb:5f/00/5f",
+    "rgb:5f/00/87",
+    "rgb:5f/00/af",
+    "rgb:5f/00/d7",
+    "rgb:5f/00/ff",
+    "rgb:5f/5f/00",
+    "rgb:5f/5f/5f",
+    "rgb:5f/5f/87",
+    "rgb:5f/5f/af",
+    "rgb:5f/5f/d7",
+    "rgb:5f/5f/ff",
+    "rgb:5f/87/00",
+    "rgb:5f/87/5f",
+    "rgb:5f/87/87",
+    "rgb:5f/87/af",
+    "rgb:5f/87/d7",
+    "rgb:5f/87/ff",
+    "rgb:5f/af/00",
+    "rgb:5f/af/5f",
+    "rgb:5f/af/87",
+    "rgb:5f/af/af",
+    "rgb:5f/af/d7",
+    "rgb:5f/af/ff",
+    "rgb:5f/d7/00",
+    "rgb:5f/d7/5f",
+    "rgb:5f/d7/87",
+    "rgb:5f/d7/af",
+    "rgb:5f/d7/d7",
+    "rgb:5f/d7/ff",
+    "rgb:5f/ff/00",
+    "rgb:5f/ff/5f",
+    "rgb:5f/ff/87",
+    "rgb:5f/ff/af",
+    "rgb:5f/ff/d7",
+    "rgb:5f/ff/ff",
+    "rgb:87/00/00",
+    "rgb:87/00/5f",
+    "rgb:87/00/87",
+    "rgb:87/00/af",
+    "rgb:87/00/d7",
+    "rgb:87/00/ff",
+    "rgb:87/5f/00",
+    "rgb:87/5f/5f",
+    "rgb:87/5f/87",
+    "rgb:87/5f/af",
+    "rgb:87/5f/d7",
+    "rgb:87/5f/ff",
+    "rgb:87/87/00",
+    "rgb:87/87/5f",
+    "rgb:87/87/87",
+    "rgb:87/87/af",
+    "rgb:87/87/d7",
+    "rgb:87/87/ff",
+    "rgb:87/af/00",
+    "rgb:87/af/5f",
+    "rgb:87/af/87",
+    "rgb:87/af/af",
+    "rgb:87/af/d7",
+    "rgb:87/af/ff",
+    "rgb:87/d7/00",
+    "rgb:87/d7/5f",
+    "rgb:87/d7/87",
+    "rgb:87/d7/af",
+    "rgb:87/d7/d7",
+    "rgb:87/d7/ff",
+    "rgb:87/ff/00",
+    "rgb:87/ff/5f",
+    "rgb:87/ff/87",
+    "rgb:87/ff/af",
+    "rgb:87/ff/d7",
+    "rgb:87/ff/ff",
+    "rgb:af/00/00",
+    "rgb:af/00/5f",
+    "rgb:af/00/87",
+    "rgb:af/00/af",
+    "rgb:af/00/d7",
+    "rgb:af/00/ff",
+    "rgb:af/5f/00",
+    "rgb:af/5f/5f",
+    "rgb:af/5f/87",
+    "rgb:af/5f/af",
+    "rgb:af/5f/d7",
+    "rgb:af/5f/ff",
+    "rgb:af/87/00",
+    "rgb:af/87/5f",
+    "rgb:af/87/87",
+    "rgb:af/87/af",
+    "rgb:af/87/d7",
+    "rgb:af/87/ff",
+    "rgb:af/af/00",
+    "rgb:af/af/5f",
+    "rgb:af/af/87",
+    "rgb:af/af/af",
+    "rgb:af/af/d7",
+    "rgb:af/af/ff",
+    "rgb:af/d7/00",
+    "rgb:af/d7/5f",
+    "rgb:af/d7/87",
+    "rgb:af/d7/af",
+    "rgb:af/d7/d7",
+    "rgb:af/d7/ff",
+    "rgb:af/ff/00",
+    "rgb:af/ff/5f",
+    "rgb:af/ff/87",
+    "rgb:af/ff/af",
+    "rgb:af/ff/d7",
+    "rgb:af/ff/ff",
+    "rgb:d7/00/00",
+    "rgb:d7/00/5f",
+    "rgb:d7/00/87",
+    "rgb:d7/00/af",
+    "rgb:d7/00/d7",
+    "rgb:d7/00/ff",
+    "rgb:d7/5f/00",
+    "rgb:d7/5f/5f",
+    "rgb:d7/5f/87",
+    "rgb:d7/5f/af",
+    "rgb:d7/5f/d7",
+    "rgb:d7/5f/ff",
+    "rgb:d7/87/00",
+    "rgb:d7/87/5f",
+    "rgb:d7/87/87",
+    "rgb:d7/87/af",
+    "rgb:d7/87/d7",
+    "rgb:d7/87/ff",
+    "rgb:d7/af/00",
+    "rgb:d7/af/5f",
+    "rgb:d7/af/87",
+    "rgb:d7/af/af",
+    "rgb:d7/af/d7",
+    "rgb:d7/af/ff",
+    "rgb:d7/d7/00",
+    "rgb:d7/d7/5f",
+    "rgb:d7/d7/87",
+    "rgb:d7/d7/af",
+    "rgb:d7/d7/d7",
+    "rgb:d7/d7/ff",
+    "rgb:d7/ff/00",
+    "rgb:d7/ff/5f",
+    "rgb:d7/ff/87",
+    "rgb:d7/ff/af",
+    "rgb:d7/ff/d7",
+    "rgb:d7/ff/ff",
+    "rgb:ff/00/00",
+    "rgb:ff/00/5f",
+    "rgb:ff/00/87",
+    "rgb:ff/00/af",
+    "rgb:ff/00/d7",
+    "rgb:ff/00/ff",
+    "rgb:ff/5f/00",
+    "rgb:ff/5f/5f",
+    "rgb:ff/5f/87",
+    "rgb:ff/5f/af",
+    "rgb:ff/5f/d7",
+    "rgb:ff/5f/ff",
+    "rgb:ff/87/00",
+    "rgb:ff/87/5f",
+    "rgb:ff/87/87",
+    "rgb:ff/87/af",
+    "rgb:ff/87/d7",
+    "rgb:ff/87/ff",
+    "rgb:ff/af/00",
+    "rgb:ff/af/5f",
+    "rgb:ff/af/87",
+    "rgb:ff/af/af",
+    "rgb:ff/af/d7",
+    "rgb:ff/af/ff",
+    "rgb:ff/d7/00",
+    "rgb:ff/d7/5f",
+    "rgb:ff/d7/87",
+    "rgb:ff/d7/af",
+    "rgb:ff/d7/d7",
+    "rgb:ff/d7/ff",
+    "rgb:ff/ff/00",
+    "rgb:ff/ff/5f",
+    "rgb:ff/ff/87",
+    "rgb:ff/ff/af",
+    "rgb:ff/ff/d7",
+    "rgb:ff/ff/ff",
+    "rgb:08/08/08",
+    "rgb:12/12/12",
+    "rgb:1c/1c/1c",
+    "rgb:26/26/26",
+    "rgb:30/30/30",
+    "rgb:3a/3a/3a",
+    "rgb:44/44/44",
+    "rgb:4e/4e/4e",
+    "rgb:58/58/58",
+    "rgb:62/62/62",
+    "rgb:6c/6c/6c",
+    "rgb:76/76/76",
+    "rgb:80/80/80",
+    "rgb:8a/8a/8a",
+    "rgb:94/94/94",
+    "rgb:9e/9e/9e",
+    "rgb:a8/a8/a8",
+    "rgb:b2/b2/b2",
+    "rgb:bc/bc/bc",
+    "rgb:c6/c6/c6",
+    "rgb:d0/d0/d0",
+    "rgb:da/da/da",
+    "rgb:e4/e4/e4",
+    "rgb:ee/ee/ee",
+    NULL_100
+    NULL_100
+    NULL_40
+    NULL_5
+#endif
 #ifndef NO_CURSORCOLOR
     COLOR_CURSOR_BACKGROUND,
     COLOR_CURSOR_FOREGROUND,
 #endif /* ! NO_CURSORCOLOR */
 #if ENABLE_FRILLS
     NULL,			// Color_underline
 #endif
 #ifdef OPTION_HC
     NULL,
+    NULL,
 #endif
     COLOR_SCROLLBAR,
 #ifdef RXVT_SCROLLBAR
     COLOR_SCROLLTROUGH,
-#endif
-#if ENABLE_TRANSPARENCY
-    NULL,
 #endif
 #if OFF_FOCUS_FADING
     "rgb:00/00/00",
 #endif
   };
   ncol = 80;
   nrow = 24;
   int_bwidth = INTERNALBORDERWIDTH;
   ext_bwidth = EXTERNALBORDERWIDTH;
   lineSpace = LINESPACE;
+  letterSpace = LETTERSPACE;
   saveLines = SAVELINES;
   refresh_type = SLOW_REFRESH;
   oldcursor.row = oldcursor.col = -1;
   set_option (Opt_skipScroll);
   set_option (Opt_secondaryScreen);
   set_option (Opt_secondaryScroll);
   set_option (Opt_pastableTabs);
   set_option (Opt_intensityStyles);
+  set_option (Opt_iso14755);
   set_option (Opt_iso14755_52);
   set_option (Opt_buffered);
 }
+#if ENABLE_PERL
 static void
-init_secondary ()
+rxvt_perl_parse_resource (rxvt_term *term, const char *k, const char *v)
 {
-  int i;
+  rxvt_perl.parse_resource (term, k, false, false, 0, v);
-  if ((i = open ("/dev/null", O_RDONLY)) < 0)
-    {
-      dup2 (STDERR_FILENO, STDIN_FILENO);
-    }
-  else if (i != STDIN_FILENO)
-    {
-      dup2 (i, STDIN_FILENO);
-      close (i);
-    }
-  dup2 (STDERR_FILENO, STDOUT_FILENO);
 }
+#endif
 /*----------------------------------------------------------------------*/
 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);
   extract_resources ();
-#if XFT
+#if ENABLE_FRILLS
-  if (rs[Rs_depth])
+  if (rs[Rs_visual])
-    select_visual (strtol (rs[Rs_depth], 0, 0));
+    select_visual (strtol (rs[Rs_visual], 0, 0));
+  else if (rs[Rs_depth])
+    select_depth (strtol (rs[Rs_depth], 0, 0));
 #endif
-#ifdef HAVE_AFTERIMAGE
-  set_application_name ((char*)rs[Rs_name]);
-  set_output_threshold (OUTPUT_LEVEL_WARNING);
-  asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
-#endif
-  free (r_argv);
   for (int i = NUM_RESOURCES; i--; )
     if (rs [i] == resval_undef)
       rs [i] = 0;
   if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
       || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
       || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
     {
       rxvt_perl.init (this);
+      enumerate_resources (rxvt_perl_parse_resource);
       HOOK_INVOKE ((this, HOOK_INIT, DT_END));
     }
 #endif
+  // must be called after initialising the perl interpreter as it
+  // may invoke the `on_register_command' hook
+  extract_keysym_resources ();
   /*
    * set any defaults not already set
    */
   if (cmd_argv && cmd_argv[0])
     {
       if (!rs[Rs_title])
         rs[Rs_title] = rxvt_basename (cmd_argv[0]);
       if (!rs[Rs_iconName])
         rs[Rs_iconName] = rs[Rs_title];
     }
   else
     {
       if (!rs[Rs_title])
         rs[Rs_title] = rs[Rs_name];
       if (!rs[Rs_iconName])
         rs[Rs_iconName] = rs[Rs_name];
     }
   if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
   if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
     ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
   if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
     lineSpace = min (i, std::numeric_limits<int16_t>::max ());
+  if (const char *v = rs[Rs_letterSpace])
+    letterSpace = atoi (v);
+  rewrap_always = rewrap_never = 0;
+  if (const char *v = rs[Rs_rewrapMode])
+    if (!strcmp (v, "never"))
+      rewrap_never = 1;
+    else if (!strcmp (v, "always"))
+      rewrap_always = 1;
+    else if (!strcmp (v, "auto"))
+      /* nop **/;
+    else
+      rxvt_warn ("invalid rewrapMode, must be auto, always or never.\n");
 #endif
 #ifdef POINTER_BLANK
   if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
     pointerBlankDelay = i;
   else
     pointerBlankDelay = 2;
 #endif
+  if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
+    multiClickTime = i;
+  else
+    multiClickTime = 500;
+  cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
   /* no point having a scrollbar without having any scrollback! */
   if (!saveLines)
     set_option (Opt_scrollBar, 0);
-#ifdef PRINTPIPE
-  if (!rs[Rs_print_pipe])
-    rs[Rs_print_pipe] = PRINTPIPE;
-#endif
   if (!rs[Rs_cutchars])
     rs[Rs_cutchars] = CUTCHARS;
 #ifndef NO_BACKSPACE_KEY
   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;
+  env = new char *[this->envv->size ()];
+  for (int i = 0; i < this->envv->size (); i++)
+    env[i] = this->envv->at (i);
+  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); // few things in X do not call setlocale :(
+  set_environ (env); // a few things in X do not call setlocale :(
   init_vars ();
-  init_secondary ();
   const char **cmd_argv = init_resources (argc, argv);
 #ifdef KEYSYM_RESOURCE
   keyboard->register_done ();
 #endif
+  if (const char *path = rs[Rs_chdir])
+    if (*path) // ignored if empty
+      {
+        if (*path != '/')
+          rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
+        if (chdir (path))
+          rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
+      }
   if (option (Opt_scrollBar))
-    scrollBar.state = STATE_IDLE;    /* set existence for size calculations */
+    scrollBar.state = SB_STATE_IDLE;    /* set existence for size calculations */
   pty = ptytty::create ();
   create_windows (argc, argv);
   init_xlocale ();
-  scr_reset (); // initialize screen
+  scr_poweron (); // initialize screen
 #if 0
   XSynchronize (dpy, True);
 #endif
   if (option (Opt_scrollBar))
     scrollBar.resize ();      /* create and map scrollbar */
-#ifdef HAVE_BG_PIXMAP
-  {
-    bgPixmap.set_target (this);
-    bgPixmap.invalidate ();
-#ifdef ENABLE_TRANSPARENCY
-    if (option (Opt_transparent))
-      {
-        bgPixmap.set_transparent ();
-#ifdef HAVE_AFTERIMAGE
-        if (rs [Rs_blurradius])
-          bgPixmap.set_blur_radius (rs [Rs_blurradius]);
-#endif
-        if (ISSET_PIXCOLOR (Color_tint))
-          bgPixmap.set_tint (pix_colors_focused [Color_tint]);
-        if (rs [Rs_shade])
-          bgPixmap.set_shade (rs [Rs_shade]);
-        bgPixmap.set_root_pixmap ();
-        XSelectInput (dpy, display->root, PropertyChangeMask);
-        rootwin_ev.start (display, display->root);
-      }
-#endif
-#ifdef BG_IMAGE_FROM_FILE
-    if (rs[Rs_backgroundPixmap])
-      {
-        const char *p = rs[Rs_backgroundPixmap];
-        if ((p = strchr (p, ';')) != 0)
-          {
-            p++;
-            bgPixmap.set_geometry (p);
-          }
-        else
-          bgPixmap.set_defaultGeometry ();
-        if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
-          if (!bgPixmap.window_position_sensitive ())
-            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));
 #if ENABLE_XEMBED
   if (rs[Rs_embed])
     {
       long info[2] = { 0, XEMBED_MAPPED };
-      XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
+      XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
                        32, PropModeReplace, (unsigned char *)&info, 2);
     }
 #endif
+#if HAVE_STARTUP_NOTIFICATION
+  SnDisplay *snDisplay;
+  SnLauncheeContext *snContext;
+  snDisplay = sn_display_new (dpy, NULL, NULL);
+  snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
+  /* Tell the window manager that this window is part of the startup context */
+  if (snContext)
+    sn_launchee_context_setup_window (snContext, parent);
+#endif
   XMapWindow (dpy, vt);
-  XMapWindow (dpy, parent[0]);
+  XMapWindow (dpy, parent);
+#if HAVE_STARTUP_NOTIFICATION
+  if (snContext)
+    {
+      /* Mark the startup process as complete */
+      sn_launchee_context_complete (snContext);
+      sn_launchee_context_unref (snContext);
+    }
+  sn_display_unref (snDisplay);
+#endif
   refresh_check ();
 }
 /*----------------------------------------------------------------------*/
 void
 rxvt_term::init_env ()
 {
-  int i;
   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
     val = XDisplayString (dpy);
   if (rs[Rs_display_name] == NULL)
     rs[Rs_display_name] = val;   /* use broken `:0' value */
-  i = strlen (val);
-  env_display = (char *)rxvt_malloc (i + 9);
+  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[0]);
+  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
    * @ COLORTERM: terminal sub-name and also indicates its color
    * @ 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
   if (depth <= 2)
-    putenv ("COLORTERM=" COLORTERMENV "-mono");
+    putenv ((char *)"COLORTERM=" COLORTERMENV "-mono");
   else
-    putenv ("COLORTERM=" COLORTERMENVFULL);
+    putenv ((char *)"COLORTERM=" COLORTERMENVFULL);
   if (rs[Rs_term_name] != NULL)
     {
       env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
       sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
       putenv (env_term);
     }
   else
-    putenv ("TERM=" TERMENV);
+    putenv ((char *)"TERM=" TERMENV);
 #ifdef HAVE_UNSETENV
   /* avoid passing old settings and confusing term size */
   unsetenv ("LINES");
   unsetenv ("COLUMNS");
   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_environ (env);
-#if HAVE_XSETLOCALE || HAVE_SETLOCALE
   free (this->locale);
   this->locale = setlocale (LC_CTYPE, locale);
   if (!this->locale)
     {
           setlocale (LC_CTYPE, "C");
         }
       else
         rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
-      this->locale = "C";
+      this->locale = (char *)"C"; /* strdup'ed below */
     }
   this->locale = strdup (this->locale);
   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
 }
 void
 rxvt_term::init_xlocale ()
 {
-  set_environ (envv);
+  set_environ (env);
-#ifdef USE_XIM
+#if 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);
   run_command (argv);
 }
 /*----------------------------------------------------------------------*/
 void
-rxvt_term::Get_Colours ()
+rxvt_term::get_colors ()
 {
   int i;
 #ifdef OFF_FOCUS_FADING
   pix_colors = pix_colors_focused;
 #endif
-  for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
+  for (i = 0; i < NRS_COLORS; i++)
-    {
-      const char *name = rs[Rs_color + i];
+    if (const char *name = rs[Rs_color + i])
-      if (!name)
-        continue;
-      rxvt_color xcol;
-      if (!set_color (xcol, name))
+      set_color (pix_colors [i], name);
-        {
-#ifndef XTERM_REVERSE_VIDEO
-          if (i < 2 && option (Opt_reverseVideo))
-            name = def_colorName [1 - i];
-          else
-#endif
-            name = def_colorName [i];
-          if (!name)
-            continue;
-          if (!set_color (xcol, name))
-            {
-              switch (i)
-                {
-                  case Color_fg:
-                  case Color_bg:
-                    rxvt_warn ("unable to get foreground/background colour, continuing.\n");
-                    name = "";
-                    break;
-#ifndef NO_CURSORCOLOR
-                  case Color_cursor2:
-#endif
-                  case Color_pointer_fg:
-                    name = rs[Rs_color + Color_fg];
-                    xcol.set (this, name);
-                    break;
-                  default:
-                    name = rs[Rs_color + Color_bg];
-                    xcol.set (this, name);
-                    break;
-                }
-            }
-        }
-      pix_colors[i] = xcol;
-      rs[Rs_color + i] = name;
-    }
-  if (depth <= 2)
-    {
-      if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
-      if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
-      if (!rs[Rs_color + Color_border]    ) alias_color (Color_border,     Color_fg);
-    }
   /*
    * get scrollBar shadow colors
    *
    * The calculations of topShadow/bottomShadow values are adapted
    * from the fvwm window manager.
    */
 #ifdef RXVT_SCROLLBAR
-  if (depth <= 2)
-    {
-      /* Monochrome */
-      alias_color (Color_scroll,       Color_fg);
-      alias_color (Color_topShadow,    Color_bg);
-      alias_color (Color_bottomShadow, Color_bg);
-    }
-  else
-    {
-      pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
+  pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
-      rgba cscroll;
+  rgba cscroll;
-      pix_colors [Color_scroll].get (cscroll);
+  pix_colors [Color_scroll].get (cscroll);
-      /* topShadowColor */
+  /* topShadowColor */
-      if (!pix_colors[Color_topShadow].set (this,
+  if (!pix_colors[Color_topShadow].set (this,
-                       rgba (
+                   rgba (
-                         min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
+                     min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
-                         min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
+                     min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
-                         min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
+                     min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
-                         cscroll.a)
+                     cscroll.a)
-                       ))
+                   ))
-        alias_color (Color_topShadow, Color_White);
+    alias_color (Color_topShadow, Color_White);
-    }
 #endif
 #ifdef OFF_FOCUS_FADING
-  for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
+  for (i = 0; i < NRS_COLORS; i++)
-    update_fade_color (i);
+    update_fade_color (i, true);
 #endif
 }
 /*----------------------------------------------------------------------*/
 /* color aliases, fg/bg bright-bold */
 void
 rxvt_term::color_aliases (int idx)
 {
-  if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
+  if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
     {
       int i = atoi (rs[Rs_color + idx]);
       if (i >= 8 && i <= 15)
         /* bright colors */
       for (j = map->max_keypermod; j--; k++)
         {
           if (kc[k] == 0)
             break;
-          switch (XKeycodeToKeysym (dpy, kc[k], 0))
+          switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
             {
               case XK_Num_Lock:
                 ModNumLockMask = modmasks[i - 1];
                 continue;
   if (i)
     ModMetaMask = modmasks[i - 1];
 }
+void
+rxvt_term::set_icon (const char *file)
+{
+#if HAVE_PIXBUF && ENABLE_EWMH
+  GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
+  if (!pixbuf)
+    {
+      rxvt_warn ("Loading image icon failed, continuing without.\n");
+      return;
+    }
+  unsigned int w = gdk_pixbuf_get_width (pixbuf);
+  unsigned int h = gdk_pixbuf_get_height (pixbuf);
+  if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
+    {
+      rxvt_warn ("Icon image too big, continuing without.\n");
+      g_object_unref (pixbuf);
+      return;
+    }
+  if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
+    {
+      int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
+      unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
+      int channels = gdk_pixbuf_get_n_channels (pixbuf);
+      buffer [0] = w;
+      buffer [1] = h;
+      for (int i = 0; i < h; i++)
+        {
+          for (int j = 0; j < w; j++)
+            {
+              unsigned char *pixel = row + j * channels;
+              long value;
+              if (channels == 4)
+                value = pixel[3];
+              else
+                value = (unsigned char)0x00ff;
+              value = (value << 8) + pixel[0];
+              value = (value << 8) + pixel[1];
+              value = (value << 8) + pixel[2];
+              buffer[(i * w + j) + 2] = value;
+            }
+          row += rowstride;
+        }
+      XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
+                       PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
+      free (buffer);
+    }
+  else
+    rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
+  g_object_unref (pixbuf);
+#endif
+}
 /*----------------------------------------------------------------------*/
-/* rxvt_Create_Windows () - Open and map the window */
+/* Open and map the window */
 void
 rxvt_term::create_windows (int argc, const char *const *argv)
 {
   XClassHint classHint;
   XWMHints wmHint;
   Window top, parent;
   dLocal (Display *, dpy);
   /* grab colors before netscape does */
-  Get_Colours ();
+  get_colors ();
   if (!set_fonts ())
     rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
   parent = display->root;
     }
 #endif
   window_calc (0, 0);
-  /* sub-window placement & size in rxvt_resize_subwindows () */
+  /* sub-window placement & size in rxvt_term::resize_all_windows () */
   attributes.background_pixel = pix_colors_focused [Color_border];
   attributes.border_pixel     = pix_colors_focused [Color_border];
   attributes.colormap         = cmap;
   top = XCreateWindow (dpy, parent,
                        ext_bwidth,
                        depth, InputOutput, visual,
                        CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
                        &attributes);
-  this->parent[0] = top;
+  this->parent = top;
-  old_width = szHint.width;
+  set_title     (rs [Rs_title]);
-  old_height = szHint.height;
+  set_icon_name (rs [Rs_iconName]);
-  process_xterm_seq (XTerm_title,    rs[Rs_title],    CHAR_ST);
-  process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
   classHint.res_name  = (char *)rs[Rs_name];
   classHint.res_class = (char *)RESCLASS;
   wmHint.flags         = InputHint | StateHint | WindowGroupHint;
   wmHint.input         = True;
-  wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
+  wmHint.initial_state = option (Opt_iconic) ? IconicState
+                         : option (Opt_dockapp) ? WithdrawnState
+                         : NormalState;
   wmHint.window_group  = top;
   XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
                       &szHint, &wmHint, &classHint);
+#if ENABLE_EWMH
+  /*
+   * set up icon hint
+   * rs [Rs_iconfile] is path to icon
+   */
+  if (rs [Rs_iconfile])
+    set_icon (rs [Rs_iconfile]);
+#endif
 #if ENABLE_FRILLS
   if (mwmhints.flags)
     XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
                      PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
 #if ENABLE_EWMH
     xa[XA_NET_WM_PING],
 #endif
   };
-  XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
+  XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
 #if ENABLE_FRILLS
   if (rs[Rs_transient_for])
     XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
 #endif
                 | ExposureMask | StructureNotifyMask);
   termwin_ev.start (display, top);
   /* vt cursor: Black-on-White is standard, but this is more popular */
+  unsigned int shape = XC_xterm;
+#ifdef HAVE_XMU
+  if (rs[Rs_pointerShape])
+    {
+      int stmp = XmuCursorNameToIndex (rs[Rs_pointerShape]);
+      if (stmp >= 0)
+        shape = stmp;
+    }
+#endif
-  TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
+  TermWin_cursor = XCreateFontCursor (dpy, shape);
   /* 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 (rs[Rs_fade])
     pix_colors = pix_colors_unfocused;
 #endif
   pointer_unblank ();
-  scr_recolour ();
+  scr_recolor ();
-}
-/* ------------------------------------------------------------------------- *
- *                            GET TTY CURRENT STATE                          *
- * ------------------------------------------------------------------------- */
-void
-rxvt_get_ttymode (struct termios *tio, int erase)
-{
-  /*
-   * standard System V termios interface
-   */
-  if (tcgetattr (STDIN_FILENO, tio) < 0)
-    {
-      // return error - use system defaults,
-      // where possible, and zero elsewhere
-      memset (tio, 0, sizeof (struct termios));
-      tio->c_cc[VINTR] = CINTR;
-      tio->c_cc[VQUIT] = CQUIT;
-      tio->c_cc[VERASE] = CERASE;
-#ifdef VERASE2
-      tio->c_cc[VERASE2] = CERASE2;
-#endif
-      tio->c_cc[VKILL] = CKILL;
-      tio->c_cc[VSTART] = CSTART;
-      tio->c_cc[VSTOP] = CSTOP;
-      tio->c_cc[VSUSP] = CSUSP;
-# ifdef VDSUSP
-      tio->c_cc[VDSUSP] = CDSUSP;
-# endif
-# ifdef VREPRINT
-      tio->c_cc[VREPRINT] = CRPRNT;
-# endif
-# ifdef VDISCRD
-      tio->c_cc[VDISCRD] = CFLUSH;
-# endif
-# ifdef VWERSE
-      tio->c_cc[VWERSE] = CWERASE;
-# endif
-# ifdef VLNEXT
-      tio->c_cc[VLNEXT] = CLNEXT;
-# endif
-    }
-  tio->c_cc[VEOF] = CEOF;
-  tio->c_cc[VEOL] = VDISABLE;
-# ifdef VEOL2
-  tio->c_cc[VEOL2] = VDISABLE;
-# endif
-# ifdef VSWTC
-  tio->c_cc[VSWTC] = VDISABLE;
-# endif
-# ifdef VSWTCH
-  tio->c_cc[VSWTCH] = VDISABLE;
-# endif
-# if VMIN != VEOF
-  tio->c_cc[VMIN] = 1;
-# endif
-# if VTIME != VEOL
-  tio->c_cc[VTIME] = 0;
-# endif
-  if (erase != -1)
-    tio->c_cc[VERASE] = (char)erase;
-  /* input modes */
-  tio->c_iflag = (BRKINT | IGNPAR | ICRNL
-# ifdef IMAXBEL
-                  | IMAXBEL
-# endif
-                  | IXON);
-  /* output modes */
-  tio->c_oflag = (OPOST | ONLCR);
-  /* control modes */
-  tio->c_cflag = (CS8 | CREAD);
-  /* line discipline modes */
-  tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
-# if defined (ECHOCTL) && defined (ECHOKE)
-                  | ECHOCTL | ECHOKE
-# endif
-                  | ECHOE | ECHOK);
-  /*
-   * Debugging
-   */
-#ifdef DEBUG_TTYMODE
-  /* c_iflag bits */
-  fprintf (stderr, "Input flags\n");
-  /* cpp token stringize doesn't work on all machines <sigh> */
-# define FOO(flag,name)                 \
-    if ((tio->c_iflag) & flag)          \
-        fprintf (stderr, "%s ", name)
-  /* c_iflag bits */
-  FOO (IGNBRK, "IGNBRK");
-  FOO (BRKINT, "BRKINT");
-  FOO (IGNPAR, "IGNPAR");
-  FOO (PARMRK, "PARMRK");
-  FOO (INPCK, "INPCK");
-  FOO (ISTRIP, "ISTRIP");
-  FOO (INLCR, "INLCR");
-  FOO (IGNCR, "IGNCR");
-  FOO (ICRNL, "ICRNL");
-  FOO (IXON, "IXON");
-  FOO (IXOFF, "IXOFF");
-# ifdef IUCLC
-  FOO (IUCLC, "IUCLC");
-# endif
-# ifdef IXANY
-  FOO (IXANY, "IXANY");
-# endif
-# ifdef IMAXBEL
-  FOO (IMAXBEL, "IMAXBEL");
-# endif
-  fprintf (stderr, "\n");
-# undef FOO
-# define FOO(entry, name)                                       \
-    fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
-  FOO (VINTR, "VINTR");
-  FOO (VQUIT, "VQUIT");
-  FOO (VERASE, "VERASE");
-  FOO (VKILL, "VKILL");
-  FOO (VEOF, "VEOF");
-  FOO (VEOL, "VEOL");
-# ifdef VEOL2
-  FOO (VEOL2, "VEOL2");
-# endif
-# ifdef VSWTC
-  FOO (VSWTC, "VSWTC");
-# endif
-# ifdef VSWTCH
-  FOO (VSWTCH, "VSWTCH");
-# endif
-  FOO (VSTART, "VSTART");
-  FOO (VSTOP, "VSTOP");
-  FOO (VSUSP, "VSUSP");
-# ifdef VDSUSP
-  FOO (VDSUSP, "VDSUSP");
-# endif
-# ifdef VREPRINT
-  FOO (VREPRINT, "VREPRINT");
-# endif
-# ifdef VDISCRD
-  FOO (VDISCRD, "VDISCRD");
-# endif
-# ifdef VWERSE
-  FOO (VWERSE, "VWERSE");
-# endif
-# ifdef VLNEXT
-  FOO (VLNEXT, "VLNEXT");
-# endif
-  fprintf (stderr, "\n");
-# undef FOO
-#endif /* DEBUG_TTYMODE */
 }
 /*----------------------------------------------------------------------*/
 /*
  * Run the command in a subprocess and return a file descriptor for the
       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");
-  int er;
+  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])
-    er = rs[Rs_backspace_key][0];
+    tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
   else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
-    er = '\177';            /* the initial state anyway */
+    tio.c_cc[VERASE] = '\177';            /* the initial state anyway */
-  else
 #endif
-    er = -1;
-  rxvt_get_ttymode (&tio, er);
   /* init terminal attributes */
   cfsetospeed (&tio, BAUDRATE);
   cfsetispeed (&tio, BAUDRATE);
   tcsetattr (pty->tty, TCSANOW, &tio);
   pty->set_utf8_mode (enc_utf8);
         _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);
   signal (SIGQUIT, SIG_DFL);
   signal (SIGCHLD, SIG_DFL);
   signal (SIGHUP,  SIG_DFL);
   signal (SIGPIPE, SIG_DFL);
   /*
-   * mimick login's behavior by disabling the job control signals
+   * mimic login's behavior by disabling the job control signals
    * a shell that wants them can turn them back on
    */
 #ifdef SIGTSTP
   signal (SIGTSTP, SIG_IGN);
   signal (SIGTTIN, SIG_IGN);
   signal (SIGTTOU, SIG_IGN);
 #endif /* SIGTSTP */
-  // unblock signals (signals are blocked by iom.C
-  sigset_t ss;
-  sigemptyset (&ss);
-  sigprocmask (SIG_SETMASK, &ss, 0);
   /* command interpreter path */
   if (argv)
     {
 # ifdef DEBUG_CMD
       int             i;
       const char *argv0, *shell;
       if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
         shell = "/bin/sh";
-      argv0 = (const char *)rxvt_basename (shell);
+      argv0 = rxvt_basename (shell);
       if (option (Opt_loginShell))
         {
           login = (char *)rxvt_malloc (strlen (argv0) + 2);

Diff Legend

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

Comparing rxvt-unicode/src/init.C (file contents): Revision 1.249 by ayin, Tue Feb 19 10:47:03 2008 UTC vs. Revision 1.350 by root, Sat Jul 3 04:04:13 2021 UTC

Diff Legend

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.249 by ayin, Tue Feb 19 10:47:03 2008 UTC vs.
Revision 1.350 by root, Sat Jul 3 04:04:13 2021 UTC