--- rxvt-unicode/src/init.C	2007/11/15 11:36:15	1.222
+++ rxvt-unicode/src/init.C	2007/12/18 15:44:55	1.232
@@ -12,9 +12,7 @@
  * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
  * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
  *                              - extensive modifications
- * Copyright (c) 1999      D J Hawkey Jr <hawkeyd@visi.com>
- *                              - QNX support
- * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
  *
  * 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
@@ -43,6 +41,8 @@
 
 #include <csignal>
 
+#include <fcntl.h>
+
 #ifdef HAVE_XSETLOCALE
 # define X_LOCALE
 # include <X11/Xlocale.h>
@@ -280,7 +280,7 @@
 #endif
   };
 
-bool
+void
 rxvt_term::init_vars ()
 {
   pix_colors           = //
@@ -289,7 +289,6 @@
   pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
 #endif
 
-
   MEvent.time = CurrentTime;
   MEvent.button = AnyButton;
   want_refresh = 1;
@@ -300,7 +299,6 @@
   ext_bwidth = EXTERNALBORDERWIDTH;
   lineSpace = LINESPACE;
   saveLines = SAVELINES;
-  numpix_colors = TOTAL_COLORS;
 
   refresh_type = SLOW_REFRESH;
 
@@ -316,8 +314,6 @@
   set_option (Opt_pastableTabs);
   set_option (Opt_intensityStyles);
   set_option (Opt_iso14755_52);
-
-  return true;
 }
 
 void
@@ -418,6 +414,8 @@
 #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);
@@ -855,13 +853,10 @@
       int i = atoi (rs[Rs_color + idx]);
 
       if (i >= 8 && i <= 15)
-        {        /* bright colors */
-          i -= 8;
-          rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
-          return;
-        }
-
-      if (i >= 0 && i <= 7)   /* normal colors */
+        /* bright colors */
+        rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
+      else if (i >= 0 && i <= 7)
+        /* normal colors */
         rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
     }
 }
@@ -1231,7 +1226,6 @@
    * Debugging
    */
 #ifdef DEBUG_TTYMODE
-#ifdef HAVE_TERMIOS_H
   /* c_iflag bits */
   fprintf (stderr, "Input flags\n");
 
@@ -1304,7 +1298,6 @@
 
   fprintf (stderr, "\n");
 # undef FOO
-# endif /* HAVE_TERMIOS_H */
 #endif /* DEBUG_TTYMODE */
 }
 
@@ -1418,7 +1411,8 @@
   char *login;
 
   if (option (Opt_console))
-    {     /* be virtual console, fail silently */
+    {
+      /* be virtual console, fail silently */
 #ifdef TIOCCONS
       unsigned int on = 1;