--- rxvt-unicode/src/init.C	2008/01/25 16:04:57	1.243
+++ rxvt-unicode/src/init.C	2008/02/19 17:47:01	1.250
@@ -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,6 +310,7 @@
   set_option (Opt_pastableTabs);
   set_option (Opt_intensityStyles);
   set_option (Opt_iso14755_52);
+  set_option (Opt_buffered);
 }
 
 static void
@@ -486,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 */
@@ -554,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 ();
 
@@ -571,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);
@@ -909,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 */
@@ -934,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++)
@@ -1531,11 +1526,6 @@
   signal (SIGTTOU, SIG_IGN);
 #endif /* SIGTSTP */
 
-  // unblock signals (signals are blocked by iom.C
-  sigset_t ss;
-  sigemptyset (&ss);
-  sigprocmask (SIG_SETMASK, &ss, 0);
-
   /* command interpreter path */
   if (argv)
     {