--- rxvt-unicode/src/init.C	2008/01/19 13:00:07	1.239
+++ rxvt-unicode/src/init.C	2008/02/19 10:47:03	1.249
@@ -12,7 +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) 2003-2007 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2003-2008 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
@@ -269,10 +269,10 @@
 #ifdef OPTION_HC
     NULL,
 #endif
-#ifdef KEEP_SCROLLCOLOR
     COLOR_SCROLLBAR,
+#ifdef RXVT_SCROLLBAR
     COLOR_SCROLLTROUGH,
-#endif /* KEEP_SCROLLCOLOR */
+#endif
 #if ENABLE_TRANSPARENCY
     NULL,
 #endif
@@ -310,20 +310,16 @@
   set_option (Opt_pastableTabs);
   set_option (Opt_intensityStyles);
   set_option (Opt_iso14755_52);
+  set_option (Opt_buffered);
 }
 
-void
-rxvt_term::init_secondary ()
+static void
+init_secondary ()
 {
   int i;
 
-  /*
-   * Close all unused file descriptors
-   * We don't want them, we don't need them.
-   */
   if ((i = open ("/dev/null", O_RDONLY)) < 0)
     {
-      /* TODO: BOO HISS */
       dup2 (STDERR_FILENO, STDIN_FILENO);
     }
   else if (i != STDIN_FILENO)
@@ -333,17 +329,6 @@
     }
 
   dup2 (STDERR_FILENO, STDOUT_FILENO);
-
-#if 0 // schmorp sayz closing filies is murder
-  for (i = STDERR_FILENO + 1; i < num_fds; i++)
-    {
-#ifdef __sgi                    /* Alex Coventry says we need 4 & 7 too */
-      if (i == 4 || i == 7)
-        continue;
-#endif
-      close (i);
-    }
-#endif
 }
 
 /*----------------------------------------------------------------------*/
@@ -502,9 +487,7 @@
 # endif
 #endif
 
-#ifdef HAVE_SCROLLBARS
-  setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
-#endif
+    scrollBar.setup (this);
 
 #ifdef XTERM_REVERSE_VIDEO
   /* this is how xterm implements reverseVideo */
@@ -570,10 +553,8 @@
   keyboard->register_done ();
 #endif
 
-#ifdef HAVE_SCROLLBARS
   if (option (Opt_scrollBar))
-    scrollBar.setIdle ();    /* set existence for size calculations */
-#endif
+    scrollBar.state = STATE_IDLE;    /* set existence for size calculations */
 
   pty = ptytty::create ();
 
@@ -587,10 +568,8 @@
   XSynchronize (dpy, True);
 #endif
 
-#ifdef HAVE_SCROLLBARS
   if (option (Opt_scrollBar))
-    resize_scrollbar ();      /* create and map scrollbar */
-#endif
+    scrollBar.resize ();      /* create and map scrollbar */
 #ifdef HAVE_BG_PIXMAP
   {
     bgPixmap.set_target (this);
@@ -925,7 +904,7 @@
    * The calculations of topShadow/bottomShadow values are adapted
    * from the fvwm window manager.
    */
-#ifdef KEEP_SCROLLCOLOR
+#ifdef RXVT_SCROLLBAR
   if (depth <= 2)
     {
       /* Monochrome */
@@ -950,7 +929,7 @@
                        ))
         alias_color (Color_topShadow, Color_White);
     }
-#endif /* KEEP_SCROLLCOLOR */
+#endif
 
 #ifdef OFF_FOCUS_FADING
   for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)