--- rxvt-unicode/src/init.C	2006/02/01 21:15:33	1.168
+++ rxvt-unicode/src/init.C	2007/01/20 00:37:13	1.175
@@ -1,4 +1,4 @@
-/*--------------------------------*-C-*---------------------------------*
+/*----------------------------------------------------------------------*
  * File:        init.C
  *----------------------------------------------------------------------*
  *
@@ -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);
 
@@ -490,7 +489,7 @@
 
   if (val == NULL)
 #endif                          /* DISPLAY_IS_IP */
-    val = XDisplayString (xdisp);
+    val = XDisplayString (dpy);
 
   if (rs[Rs_display_name] == NULL)
     rs[Rs_display_name] = val;   /* use broken `:0' value */
@@ -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
 }
 
@@ -807,7 +801,7 @@
       && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
     requestedmeta = rsmod[3] - '0';
 
-  map = XGetModifierMapping (xdisp);
+  map = XGetModifierMapping (dpy);
   kc = map->modifiermap;
 
   for (i = 1; i < 6; i++)
@@ -819,7 +813,7 @@
           if (kc[k] == 0)
             break;
 
-          switch (XKeycodeToKeysym (xdisp, kc[k], 0))
+          switch (XKeycodeToKeysym (dpy, kc[k], 0))
             {
               case XK_Num_Lock:
                 ModNumLockMask = modmasks[i - 1];
@@ -885,7 +879,7 @@
   XSetWindowAttributes attributes;
   Window top, parent;
 
-  dLocal (Display *, xdisp);
+  dLocal (Display *, dpy);
 
   /* grab colors before netscape does */
   Get_Colours ();
@@ -900,7 +894,7 @@
 #if ENABLE_FRILLS
   if (OPTION (Opt_borderLess))
     {
-      if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None)
+      if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
         {
           /*     print_warning("Window Manager does not support MWM hints.  Bypassing window manager control for borderless window.\n");*/
           attributes.override_redirect = true;
@@ -923,7 +917,7 @@
 
       parent = strtol (rs[Rs_embed], 0, 0);
 
-      if (!XGetWindowAttributes (xdisp, parent, &wattr))
+      if (!XGetWindowAttributes (dpy, parent, &wattr))
         rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
 
       window_calc (wattr.width, wattr.height);
@@ -937,7 +931,7 @@
   attributes.border_pixel     = pix_colors_focused [Color_border];
   attributes.colormap         = cmap;
 
-  top = XCreateWindow (xdisp, parent,
+  top = XCreateWindow (dpy, parent,
                        szHint.x, szHint.y,
                        szHint.width, szHint.height,
                        ext_bwidth,
@@ -961,12 +955,12 @@
   wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
   wmHint.window_group  = top;
 
-  XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc,
+  XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
                       &szHint, &wmHint, &classHint);
 
 #if ENABLE_FRILLS
   if (mwmhints.flags)
-    XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
+    XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
                      PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
 #endif
 
@@ -977,24 +971,24 @@
 #endif
   };
 
-  XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
+  XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
 
 #if ENABLE_FRILLS
   if (rs[Rs_transient_for])
-    XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
+    XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
 #endif
 
 #if ENABLE_EWMH
   long pid = getpid ();
 
-  XChangeProperty (xdisp, top,
+  XChangeProperty (dpy, top,
                    xa[XA_NET_WM_PID], XA_CARDINAL, 32,
                    PropModeReplace, (unsigned char *)&pid, 1);
 
   // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
 #endif
 
-  XSelectInput (xdisp, top,
+  XSelectInput (dpy, top,
                 KeyPressMask
 #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
                 | KeyReleaseMask
@@ -1005,15 +999,15 @@
   termwin_ev.start (display, top);
 
   /* vt cursor: Black-on-White is standard, but this is more popular */
-  TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm);
+  TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
 
 #ifdef HAVE_SCROLLBARS
   /* cursor scrollBar: Black-on-White */
-  leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr);
+  leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
 #endif
 
   /* the vt window */
-  vt = XCreateSimpleWindow (xdisp, top,
+  vt = XCreateSimpleWindow (dpy, top,
                             window_vt_x, window_vt_y,
                             width, height,
                             0,
@@ -1021,7 +1015,7 @@
                             pix_colors_focused[Color_bg]);
 
   attributes.bit_gravity = NorthWestGravity;
-  XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes);
+  XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
 
   vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
 
@@ -1054,9 +1048,9 @@
   /* graphics context for the vt window */
   gcvalue.foreground         = pix_colors[Color_fg];
   gcvalue.background         = pix_colors[Color_bg];
-  gcvalue.graphics_exposures = 1;
+  gcvalue.graphics_exposures = 0;
 
-  gc = XCreateGC (xdisp, vt,
+  gc = XCreateGC (dpy, vt,
                   GCForeground | GCBackground | GCGraphicsExposures,
                   &gcvalue);
 
@@ -1064,11 +1058,11 @@
 
 #ifdef RXVT_SCROLLBAR
   gcvalue.foreground = pix_colors[Color_topShadow];
-  topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
+  topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
   gcvalue.foreground = pix_colors[Color_bottomShadow];
-  botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
+  botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
   gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
-  scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
+  scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
 #endif
 
 #ifdef OFF_FOCUS_FADING
@@ -1321,11 +1315,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 +1327,11 @@
     er = -1;
 
   rxvt_get_ttymode (&tio, er);
+  pty->set_utf8_mode (enc_utf8);
+  SET_TTYMODE (STDIN_FILENO, &tio);       /* init terminal attributes */
+
+  /* set initial window size */
+  tt_winch ();
 
 #if ENABLE_FRILLS
   if (rs[Rs_pty_fd])
@@ -1402,8 +1396,6 @@
 {
   char *login;
 
-  SET_TTYMODE (STDIN_FILENO, &tio);       /* init terminal attributes */
-
   if (OPTION (Opt_console))
     {     /* be virtual console, fail silently */
 #ifdef TIOCCONS