--- rxvt-unicode/src/init.C	2010/07/26 22:07:38	1.273
+++ rxvt-unicode/src/init.C	2010/08/29 15:05:08	1.279
@@ -1281,6 +1281,61 @@
     ModMetaMask = modmasks[i - 1];
 }
 
+void
+rxvt_term::set_icon (const char *file)
+{
+#ifdef HAVE_AFTERIMAGE
+  init_asv ();
+
+  ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
+  if (!im)
+    {
+      rxvt_warn ("Loading image icon failed, continuing without.\n");
+      return;
+    }
+
+  int w = im->width;
+  int h = im->height;
+
+  if (!IN_RANGE_INC (w, 1, 32767) || !IN_RANGE_INC (h, 1, 32767))
+    {
+      rxvt_warn ("Icon image too big, continuing without.\n");
+      destroy_asimage (&im);
+      return;
+    }
+
+  ASImage *result = scale_asimage (asv, im,
+                                   w, h, ASA_ARGB32,
+                                   100, ASIMAGE_QUALITY_DEFAULT);
+  destroy_asimage (&im);
+
+  if (!result)
+    {
+      rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
+      return;
+    }
+
+  long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
+  if (buffer)
+    {
+      ARGB32 *asbuf = result->alt.argb32;
+      buffer [0] = w;
+      buffer [1] = h;
+
+      for (unsigned int i = 0; i < w * h; ++i)
+        buffer [i + 2] = asbuf [i];
+
+      XChangeProperty (dpy, parent[0], 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");
+
+  destroy_asimage (&result);
+#endif
+}
+
 /*----------------------------------------------------------------------*/
 /* rxvt_Create_Windows () - Open and map the window */
 void
@@ -1370,54 +1425,15 @@
   XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
                       &szHint, &wmHint, &classHint);
 #if ENABLE_EWMH
-# ifdef HAVE_AFTERIMAGE
   /*
    * set up icon hint
-   * rs [Rs_iconfile] is path to icon, asv has been created in init_resources
+   * rs [Rs_iconfile] is path to icon
    */
 
   if (rs [Rs_iconfile])
     {
-      init_asv ();
-
-      ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
-      if (asv && im)
-        {
-          int w = im->width;
-          int h = im->height;
-          long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
-          ASImage *result = scale_asimage (asv, im,
-                                           w, h, ASA_ARGB32,
-                                           100, ASIMAGE_QUALITY_DEFAULT);
-          destroy_asimage (&im);
-
-          if (buffer && result)
-            {
-              ARGB32 *asbuf = result->alt.argb32;
-              buffer [0] = w;
-              buffer [1] = h;
-
-              for (unsigned int i = 0; i < w * h; ++i)
-                buffer [i + 2] = asbuf [i];
-
-              destroy_asimage (&result);
-              XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
-                               PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
-              free (buffer);
-            }
-          else
-            {
-              if (!buffer)
-                rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
-
-              if (!result)
-                rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
-            }
-        }
-      else
-        rxvt_warn ("Loading image icon failed, continuing without.\n");
+      set_icon (rs [Rs_iconfile]);
     }
-# endif
 #endif
 
 #if ENABLE_FRILLS
@@ -1506,160 +1522,6 @@
   scr_recolour ();
 }
 
-/* ------------------------------------------------------------------------- *
- *                            GET TTY CURRENT STATE                          *
- * ------------------------------------------------------------------------- */
-static void
-rxvt_get_ttymode (struct termios *tio)
-{
-  /*
-   * standard System V termios interface
-   */
-  // does not work as stdin is not a tty
-  // if (tcgetattr (STDIN_FILENO, tio) < 0)
-  if (1)
-    {
-      // return error - use system defaults,
-      // where possible, and zero elsewhere
-      memset (tio, 0, sizeof (struct termios));
-      if (VDISABLE)
-        for (int i = 0; i < NCCS; i++)
-          tio->c_cc[i] = VDISABLE;
-
-      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;
-# if VMIN != VEOF
-  tio->c_cc[VMIN] = 1;
-# endif
-# if VTIME != VEOL
-  tio->c_cc[VTIME] = 0;
-# endif
-
-  /* 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
@@ -1688,7 +1550,7 @@
     if (!pty->get ())
       rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
 
-  rxvt_get_ttymode (&tio);
+  struct termios tio = def_tio;
 
 #ifndef NO_BACKSPACE_KEY
   if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])