--- rxvt-unicode/src/scrollbar.C	2007/12/30 23:45:42	1.43
+++ rxvt-unicode/src/scrollbar.C	2008/01/27 22:48:33	1.48
@@ -36,7 +36,6 @@
 {
   int change = 0;
 
-#ifdef HAVE_SCROLLBARS
   if (map)
     {
       scrollBar.setIdle ();
@@ -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,9 +141,7 @@
 rxvt_term::scrollbar_show (int update)
 {
   int             ret = 0;
-#ifdef HAVE_SCROLLBARS
   int             top, bot, len, adj;
-  int             scrollbar_len = 0;
 
   if (!scrollBar.state)
     return 0;
@@ -160,22 +154,21 @@
       adj = (((bot - top) * scrollbar_size ()) % len) > 0 ? 1 : 0;
 
       scrollBar.top = (scrollBar.beg + (top * scrollbar_size ()) / len);
-      scrollbar_len = ((bot - top) * scrollbar_size ()) / len +
+      scrollBar.len = ((bot - top) * scrollbar_size ()) / len +
                       scrollbar_minheight () + adj;
-      scrollBar.bot = (scrollBar.top + scrollbar_len);
+      scrollBar.bot = (scrollBar.top + scrollBar.len);
       /* no change */
-      if (scrollBar.top == last_top
-          && scrollBar.bot == last_bot
-          && (scrollBar.state == last_state || !scrollbar_isUpDn ()))
+      if (scrollBar.top == scrollBar.last_top
+          && scrollBar.bot == scrollBar.last_bot
+          && (scrollBar.state == scrollBar.last_state || !scrollbar_isUpDn ()))
         return 0;
     }
 
-  ret = (this->*scrollBar.update) (update, last_top, last_bot, scrollbar_len);
+  ret = (this->*scrollBar.update) (update, scrollBar.last_top, scrollBar.last_bot, scrollBar.len);
 
-  last_top = scrollBar.top;
-  last_bot = scrollBar.bot;
-  last_state = scrollBar.state;
-#endif
+  scrollBar.last_top = scrollBar.top;
+  scrollBar.last_bot = scrollBar.bot;
+  scrollBar.last_state = scrollBar.state;
 
   return ret;
 }
@@ -183,7 +176,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 +238,9 @@
       else if (strncasecmp (scrollalign, "bottom", 6) == 0)
         scrollBar.align = R_SB_ALIGN_BOTTOM;
     }
-#endif
+  scrollBar.last_bot = scrollBar.last_state = -1;
+  /* cursor scrollBar: Black-on-White */
+  scrollBar.leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
 }
 
 /*----------------------- end-of-file (C source) -----------------------*/