--- rxvt-unicode/src/scrollbar.C	2008/01/02 08:24:39	1.46
+++ rxvt-unicode/src/scrollbar.C	2008/01/29 13:57:23	1.49
@@ -36,10 +36,9 @@
 {
   int change = 0;
 
-#ifdef HAVE_SCROLLBARS
   if (map)
     {
-      scrollBar.setIdle ();
+      scrollBar.state = STATE_IDLE;
 
       if (!scrollBar.win)
         resize_scrollbar ();
@@ -56,7 +55,6 @@
       XUnmapWindow (dpy, scrollBar.win);
       change = 1;
     }
-#endif
 
   return change;
 }
@@ -64,7 +62,6 @@
 void
 rxvt_term::resize_scrollbar ()
 {
-#ifdef HAVE_SCROLLBARS
   int delayed_init = 0;
 
 #define R_SCROLLBEG_XTERM	0
@@ -120,7 +117,7 @@
                                            0,
                                            pix_colors[Color_fg],
                                            pix_colors[Color_border]);
-      XDefineCursor (dpy, scrollBar.win, leftptr_cursor);
+      XDefineCursor (dpy, scrollBar.win, scrollBar.leftptr_cursor);
 
       XSelectInput (dpy, scrollBar.win,
                    ExposureMask | ButtonPressMask | ButtonReleaseMask
@@ -135,7 +132,6 @@
 
   if (delayed_init)
     XMapWindow (dpy, scrollBar.win);
-#endif
 }
 
 /*
@@ -145,7 +141,6 @@
 rxvt_term::scrollbar_show (int update)
 {
   int             ret = 0;
-#ifdef HAVE_SCROLLBARS
   int             top, bot, len, adj;
 
   if (!scrollBar.state)
@@ -165,7 +160,8 @@
       /* no change */
       if (scrollBar.top == scrollBar.last_top
           && scrollBar.bot == scrollBar.last_bot
-          && (scrollBar.state == scrollBar.last_state || !scrollbar_isUpDn ()))
+          && (scrollBar.state == scrollBar.last_state
+              || !(scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)))
         return 0;
     }
 
@@ -174,7 +170,6 @@
   scrollBar.last_top = scrollBar.top;
   scrollBar.last_bot = scrollBar.bot;
   scrollBar.last_state = scrollBar.state;
-#endif
 
   return ret;
 }
@@ -182,7 +177,6 @@
 void
 rxvt_term::setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness)
 {
-#ifdef HAVE_SCROLLBARS
   int             i;
   short           style, width;
 
@@ -246,7 +240,8 @@
         scrollBar.align = R_SB_ALIGN_BOTTOM;
     }
   scrollBar.last_bot = scrollBar.last_state = -1;
-#endif
+  /* cursor scrollBar: Black-on-White */
+  scrollBar.leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
 }
 
 /*----------------------- end-of-file (C source) -----------------------*/