--- rxvt-unicode/src/init.C	2007/10/09 13:36:10	1.217
+++ rxvt-unicode/src/init.C	2007/12/12 09:33:48	1.227
@@ -43,6 +43,21 @@
 
 #include <csignal>
 
+#include <fcntl.h>
+
+#ifdef HAVE_XSETLOCALE
+# define X_LOCALE
+# include <X11/Xlocale.h>
+#else
+# ifdef HAVE_SETLOCALE
+#  include <clocale>
+# endif
+#endif
+
+#ifdef HAVE_NL_LANGINFO
+# include <langinfo.h>
+#endif
+
 #ifdef DISPLAY_IS_IP
 /* On Solaris link with -lsocket and -lnsl */
 #include <sys/types.h>
@@ -143,9 +158,9 @@
     "rgb:00/00/cd",             // 4: blue              (Blue3)
     "rgb:cd/00/cd",             // 5: magenta           (Magenta3)
     "rgb:00/cd/cd",             // 6: cyan              (Cyan3)
-# ifdef XTERM_COLORS                                    
+# ifdef XTERM_COLORS
     "rgb:e5/e5/e5",             // 7: white             (Grey90)
-# else                                                  
+# else
     "rgb:fa/eb/d7",             // 7: white             (AntiqueWhite)
 # endif
     /* high-intensity colors */
@@ -239,7 +254,7 @@
 #ifndef NO_CURSORCOLOR
     COLOR_CURSOR_BACKGROUND,
     COLOR_CURSOR_FOREGROUND,
-#endif                          /* ! NO_CURSORCOLOR */
+#endif /* ! NO_CURSORCOLOR */
     NULL,                       /* Color_pointer_fg               */
     NULL,                       /* Color_pointer_bg               */
     NULL,                       /* Color_border                   */
@@ -248,7 +263,7 @@
     NULL,                       /* Color_IT                       */
     NULL,                       /* Color_UL                       */
     NULL,                       /* Color_RV                       */
-#endif                          /* ! NO_BOLD_UNDERLINE_REVERSE */
+#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
 #if ENABLE_FRILLS
     NULL,			// Color_underline
 #endif
@@ -258,7 +273,7 @@
 #ifdef KEEP_SCROLLCOLOR
     COLOR_SCROLLBAR,
     COLOR_SCROLLTROUGH,
-#endif                          /* KEEP_SCROLLCOLOR */
+#endif /* KEEP_SCROLLCOLOR */
 #if ENABLE_TRANSPARENCY
     NULL,
 #endif
@@ -267,7 +282,7 @@
 #endif
   };
 
-bool
+void
 rxvt_term::init_vars ()
 {
   pix_colors           = //
@@ -303,8 +318,6 @@
   set_option (Opt_pastableTabs);
   set_option (Opt_intensityStyles);
   set_option (Opt_iso14755_52);
-
-  return true;
 }
 
 void
@@ -358,7 +371,7 @@
   if (r_argc == argc)
     cmd_argv = NULL;
   else if (!argv[r_argc + 1])
-    rxvt_fatal ("-e requires an argument\n");
+    rxvt_fatal ("option '-e' requires an argument, aborting.\n");
   else
     {
       cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
@@ -527,7 +540,7 @@
 #ifndef NO_CURSORCOLOR
   color_aliases (Color_cursor);
   color_aliases (Color_cursor2);
-#endif                          /* NO_CURSORCOLOR */
+#endif /* NO_CURSORCOLOR */
   color_aliases (Color_pointer_fg);
   color_aliases (Color_pointer_bg);
   color_aliases (Color_border);
@@ -535,7 +548,7 @@
   color_aliases (Color_BD);
   color_aliases (Color_UL);
   color_aliases (Color_RV);
-#endif                          /* ! NO_BOLD_UNDERLINE_REVERSE */
+#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
 
   if (!rs[Rs_color + Color_border])
     rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
@@ -565,7 +578,7 @@
   rs[Rs_display_name] = (const char *)val;
 
   if (val == NULL)
-#endif                          /* DISPLAY_IS_IP */
+#endif /* DISPLAY_IS_IP */
     val = XDisplayString (dpy);
 
   if (rs[Rs_display_name] == NULL)
@@ -615,7 +628,7 @@
   unsetenv ("LINES");
   unsetenv ("COLUMNS");
   unsetenv ("TERMCAP");        /* terminfo should be okay */
-#endif                          /* HAVE_UNSETENV */
+#endif /* HAVE_UNSETENV */
 }
 
 /*----------------------------------------------------------------------*/
@@ -646,7 +659,7 @@
     }
 
 
-  this->locale = rxvt_strdup (this->locale);
+  this->locale = strdup (this->locale);
   SET_LOCALE (this->locale);
   mbstate.reset ();
 #endif
@@ -736,7 +749,7 @@
 #ifdef OFF_FOCUS_FADING
   pix_colors = pix_colors_focused;
 #endif
-  
+
   for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
     {
       const char *name = rs[Rs_color + i];
@@ -824,7 +837,7 @@
                        ))
         alias_color (Color_topShadow, Color_White);
     }
-#endif                          /* KEEP_SCROLLCOLOR */
+#endif /* KEEP_SCROLLCOLOR */
 
 #ifdef OFF_FOCUS_FADING
   for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
@@ -842,13 +855,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];
     }
 }
@@ -1218,7 +1228,6 @@
    * Debugging
    */
 #ifdef DEBUG_TTYMODE
-#ifdef HAVE_TERMIOS_H
   /* c_iflag bits */
   fprintf (stderr, "Input flags\n");
 
@@ -1291,8 +1300,7 @@
 
   fprintf (stderr, "\n");
 # undef FOO
-# endif                         /* HAVE_TERMIOS_H */
-#endif                          /* DEBUG_TTYMODE */
+#endif /* DEBUG_TTYMODE */
 }
 
 /*----------------------------------------------------------------------*/
@@ -1405,7 +1413,8 @@
   char *login;
 
   if (option (Opt_console))
-    {     /* be virtual console, fail silently */
+    {
+      /* be virtual console, fail silently */
 #ifdef TIOCCONS
       unsigned int on = 1;
 
@@ -1417,7 +1426,7 @@
       if (fd >= 0)
         if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
           close (fd);
-#endif                          /* SRIOCSREDIR */
+#endif /* SRIOCSREDIR */
     }
 
   /* reset signals and spin off the command interpreter */
@@ -1434,7 +1443,7 @@
   signal (SIGTSTP, SIG_IGN);
   signal (SIGTTIN, SIG_IGN);
   signal (SIGTTOU, SIG_IGN);
-#endif                          /* SIGTSTP */
+#endif /* SIGTSTP */
 
   // unblock signals (signals are blocked by iom.C
   sigset_t ss;