--- rxvt-unicode/src/init.C	2006/02/18 15:24:39	1.170
+++ rxvt-unicode/src/init.C	2007/02/16 21:46:05	1.180
@@ -1,4 +1,4 @@
-/*--------------------------------*-C-*---------------------------------*
+/*----------------------------------------------------------------------*
  * File:        init.C
  *----------------------------------------------------------------------*
  *
@@ -208,7 +208,7 @@
   oldcursor.row = oldcursor.col = -1;
 #ifdef XPM_BACKGROUND
   /*  bgPixmap.w = bgPixmap.h = 0; */
-  bgPixmap.x = bgPixmap.y = 50;
+  bgPixmap.x = bgPixmap.y = 0;
   bgPixmap.pixmap = None;
 #endif
 
@@ -260,10 +260,10 @@
   const char **cmd_argv, **r_argv;
 
   /*
-   * Look for -exec option.  Find => split and make cmd_argv[] of command args
+   * 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") || !strcmp (argv[r_argc], "-exec"))
+    if (!strcmp (argv[r_argc], "-e"))
       break;
 
   r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
@@ -302,14 +302,13 @@
   // using a local pointer decreases code size a lot
   xa = display->xa;
 
+  set (display);
+  extract_resources ();
+
 #if XFT
   if (rs[Rs_depth])
-    set (display, strtol (rs[Rs_depth], 0, 0));
-  else
+    select_visual (strtol (rs[Rs_depth], 0, 0));
 #endif
-    set (display);
-
-  extract_resources ();
 
   free (r_argv);
 
@@ -751,13 +750,8 @@
 #endif                          /* KEEP_SCROLLCOLOR */
 
 #ifdef OFF_FOCUS_FADING
-  if (rs[Rs_fade])
-    for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
-      {
-        rgba c;
-        pix_colors [Color_fade].get (c);
-        pix_colors_focused [i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
-      }
+  for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
+    update_fade_color (i);
 #endif
 }
 
@@ -1087,7 +1081,6 @@
 void
 rxvt_get_ttymode (ttymode_t *tio, int erase)
 {
-#ifdef HAVE_TERMIOS_H
   /*
    * standard System V termios interface
    */
@@ -1164,53 +1157,6 @@
                   | ECHOCTL | ECHOKE
 # endif
                   | ECHOE | ECHOK);
-# else                          /* HAVE_TERMIOS_H */
-
-  /*
-  * sgtty interface
-  */
-
-  /* get parameters -- gtty */
-  if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
-    {
-      tio->sg.sg_erase = CERASE;      /* ^H */
-      tio->sg.sg_kill = CKILL;        /* ^U */
-    }
-
-  if (erase != -1)
-    tio->sg.sg_erase = (char)erase;
-
-  tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
-
-  /* get special characters */
-  if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
-    {
-      tio->tc.t_intrc = CINTR;        /* ^C */
-      tio->tc.t_quitc = CQUIT;        /* ^\ */
-      tio->tc.t_startc = CSTART;      /* ^Q */
-      tio->tc.t_stopc = CSTOP;        /* ^S */
-      tio->tc.t_eofc = CEOF;  /* ^D */
-      tio->tc.t_brkc = -1;
-    }
-
-  /* get local special chars */
-  if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
-    {
-      tio->lc.t_suspc = CSUSP;        /* ^Z */
-      tio->lc.t_dsuspc = CDSUSP;      /* ^Y */
-      tio->lc.t_rprntc = CRPRNT;      /* ^R */
-      tio->lc.t_flushc = CFLUSH;      /* ^O */
-      tio->lc.t_werasc = CWERASE;     /* ^W */
-      tio->lc.t_lnextc = CLNEXT;      /* ^V */
-    }
-  /* get line discipline */
-  ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
-# ifdef NTTYDISC
-  tio->line = NTTYDISC;
-# endif                         /* NTTYDISC */
-
-  tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
-#endif                          /* HAVE_TERMIOS_H */
 
   /*
    * Debugging
@@ -1321,11 +1267,6 @@
     if (!pty->get ())
       rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
 
-  pty->set_utf8_mode (enc_utf8);
-
-  /* set initial window size */
-  tt_winch ();
-
   int er;
 
 #ifndef NO_BACKSPACE_KEY
@@ -1338,6 +1279,11 @@
     er = -1;
 
   rxvt_get_ttymode (&tio, er);
+  SET_TERMIOS (pty->tty, &tio);       /* init terminal attributes */
+  pty->set_utf8_mode (enc_utf8);
+
+  /* set initial window size */
+  tt_winch ();
 
 #if ENABLE_FRILLS
   if (rs[Rs_pty_fd])
@@ -1402,8 +1348,6 @@
 {
   char *login;
 
-  SET_TTYMODE (STDIN_FILENO, &tio);       /* init terminal attributes */
-
   if (OPTION (Opt_console))
     {     /* be virtual console, fail silently */
 #ifdef TIOCCONS