--- rxvt-unicode/src/init.C	2005/07/07 19:37:47	1.117
+++ rxvt-unicode/src/init.C	2005/11/28 18:37:42	1.120
@@ -171,6 +171,9 @@
 #if TINTING
     NULL,
 #endif
+#if OFF_FOCUS_FADING
+    "black",
+#endif
   };
 
 const char *const xa_names[] =
@@ -739,13 +742,15 @@
         }
 
       pix_colors[i] = xcol;
-#ifdef OFF_FOCUS_FADING
-      if (rs[Rs_fade])
-        pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade]));
-#endif
       SET_PIXCOLOR (i);
     }
 
+#ifdef OFF_FOCUS_FADING
+  if (rs[Rs_fade])
+    for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
+      pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
+#endif
+
   if (display->depth <= 2)
     {
       if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
@@ -762,7 +767,8 @@
 #ifdef KEEP_SCROLLCOLOR
 
   if (display->depth <= 2)
-    {  /* Monochrome */
+    {
+      /* Monochrome */
       pix_colors[Color_scroll]       = pix_colors[Color_fg];
       pix_colors[Color_topShadow]    = pix_colors[Color_bg];
       pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
@@ -1201,47 +1207,37 @@
       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
 
@@ -1279,6 +1275,7 @@
       tio->sg.sg_erase = CERASE;      /* ^H */
       tio->sg.sg_kill = CKILL;        /* ^U */
     }
+
   if (erase != -1)
     tio->sg.sg_erase = (char)erase;
 
@@ -1294,6 +1291,7 @@
       tio->tc.t_eofc = CEOF;  /* ^D */
       tio->tc.t_brkc = -1;
     }
+
   /* get local special chars */
   if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
     {
@@ -1307,7 +1305,6 @@
   /* get line discipline */
   ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
 # ifdef NTTYDISC
-
   tio->line = NTTYDISC;
 # endif                         /* NTTYDISC */
 
@@ -1340,15 +1337,12 @@
   FOO (IXON, "IXON");
   FOO (IXOFF, "IXOFF");
 # ifdef IUCLC
-
   FOO (IUCLC, "IUCLC");
 # endif
 # ifdef IXANY
-
   FOO (IXANY, "IXANY");
 # endif
 # ifdef IMAXBEL
-
   FOO (IMAXBEL, "IMAXBEL");
 # endif
 
@@ -1365,39 +1359,30 @@
   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