--- rxvt-unicode/src/scrollbar.C	2008/01/01 21:14:39	1.45
+++ rxvt-unicode/src/scrollbar.C	2008/02/18 11:41:39	1.57
@@ -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,50 +62,13 @@
 void
 rxvt_term::resize_scrollbar ()
 {
-#ifdef HAVE_SCROLLBARS
   int delayed_init = 0;
+  int window_sb_x = 0;
 
-#define R_SCROLLBEG_XTERM	0
-#define R_SCROLLEND_XTERM	szHint.height
-#define R_SCROLLBEG_NEXT	0
-#define R_SCROLLEND_NEXT	szHint.height - (SB_BUTTON_TOTAL_HEIGHT + \
-                                                    SB_PADDING)
-#define R_SCROLLBEG_RXVT	(scrollBar.width + 1) + scrollBar.shadow
-#define R_SCROLLEND_RXVT	szHint.height - R_SCROLLBEG_RXVT - \
-                                    (2 * scrollBar.shadow)
+  if (option (Opt_scrollBar_right))
+    window_sb_x = szHint.width - scrollBar.total_width ();
 
-#if defined(PLAIN_SCROLLBAR)
-  if (scrollBar.style == R_SB_PLAIN)
-    {
-      scrollBar.beg = R_SCROLLBEG_XTERM;
-      scrollBar.end = R_SCROLLEND_XTERM;
-      scrollBar.update = &rxvt_term::scrollbar_show_plain;
-    }
-#endif
-#if defined(XTERM_SCROLLBAR)
-  if (scrollBar.style == R_SB_XTERM)
-    {
-      scrollBar.beg = R_SCROLLBEG_XTERM;
-      scrollBar.end = R_SCROLLEND_XTERM;
-      scrollBar.update = &rxvt_term::scrollbar_show_xterm;
-    }
-#endif
-#if defined(NEXT_SCROLLBAR)
-  if (scrollBar.style == R_SB_NEXT)
-    {
-      scrollBar.beg = R_SCROLLBEG_NEXT;
-      scrollBar.end = R_SCROLLEND_NEXT;
-      scrollBar.update = &rxvt_term::scrollbar_show_next;
-    }
-#endif
-#if defined(RXVT_SCROLLBAR)
-  if (scrollBar.style == R_SB_RXVT)
-    {
-      scrollBar.beg = R_SCROLLBEG_RXVT;
-      scrollBar.end = R_SCROLLEND_RXVT;
-      scrollBar.update = &rxvt_term::scrollbar_show_rxvt;
-    }
-#endif
+  scrollBar.update_data ();
 
   if (!scrollBar.win)
     {
@@ -115,12 +76,12 @@
       scrollBar.win = XCreateSimpleWindow (dpy,
                                            parent[0],
                                            window_sb_x, 0,
-                                           scrollbar_TotalWidth (),
+                                           scrollBar.total_width (),
                                            szHint.height,
                                            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
@@ -130,12 +91,15 @@
 
       delayed_init = 1;
     }
+  else
+    XMoveResizeWindow (dpy, scrollBar.win,
+                       window_sb_x, 0,
+                       scrollBar.total_width (), szHint.height);
 
   scrollbar_show (1);
 
   if (delayed_init)
     XMapWindow (dpy, scrollBar.win);
-#endif
 }
 
 /*
@@ -145,27 +109,25 @@
 rxvt_term::scrollbar_show (int update)
 {
   int             ret = 0;
-#ifdef HAVE_SCROLLBARS
-  int             top, bot, len, adj;
 
   if (!scrollBar.state)
     return 0;
 
   if (update)
     {
-      top = view_start - top_row;
-      bot = top + (nrow - 1);
-      len = max (nrow - 1 - top_row, 1);
-      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_minheight () + adj;
-      scrollBar.bot = (scrollBar.top + ScrollBar.len);
+      int top = view_start - top_row;
+      int bot = top + (nrow - 1);
+      int len = max (nrow - 1 - top_row, 1);
+      int size = (bot - top) * scrollBar.size ();
+
+      scrollBar.top = (scrollBar.beg + (top * scrollBar.size ()) / len);
+      scrollBar.len = size / len + scrollBar.min_height () + (size % len > 0);
+      scrollBar.bot = (scrollBar.top + scrollBar.len);
       /* 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,17 +136,21 @@
   scrollBar.last_top = scrollBar.top;
   scrollBar.last_bot = scrollBar.bot;
   scrollBar.last_state = scrollBar.state;
-#endif
 
   return ret;
 }
 
 void
-rxvt_term::setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness)
+scrollBar_t::setup (rxvt_term *term)
 {
-#ifdef HAVE_SCROLLBARS
   int             i;
   short           style, width;
+  const char *scrollalign, *scrollstyle, *thickness;
+
+  this->term = term;
+  scrollalign = term->rs[Rs_scrollBar_align];
+  scrollstyle = term->rs[Rs_scrollstyle];
+  thickness = term->rs[Rs_scrollBar_thickness];
 
 # if defined(RXVT_SCROLLBAR)
   style = R_SB_RXVT;
@@ -230,22 +196,60 @@
       width = min (i, SB_WIDTH_MAXIMUM);
 
 # ifdef RXVT_SCROLLBAR
-  if (! option (Opt_scrollBar_floating) && style == R_SB_RXVT)
-    scrollBar.shadow = SHADOW_WIDTH;
+  if (! term->option (Opt_scrollBar_floating) && style == R_SB_RXVT)
+    shadow = SHADOW_WIDTH;
 # endif
 
-  scrollBar.style = style;
-  scrollBar.width = width;
+  this->style = style;
+  this->width = width;
 
-  /* scrollBar.align = R_SB_ALIGN_CENTRE; */
+  /* align = R_SB_ALIGN_CENTRE; */
   if (scrollalign)
     {
       if (strncasecmp (scrollalign, "top", 3) == 0)
-        scrollBar.align = R_SB_ALIGN_TOP;
+        align = R_SB_ALIGN_TOP;
       else if (strncasecmp (scrollalign, "bottom", 6) == 0)
-        scrollBar.align = R_SB_ALIGN_BOTTOM;
+        align = R_SB_ALIGN_BOTTOM;
+    }
+  last_bot = last_state = -1;
+  /* cursor scrollBar: Black-on-White */
+  leftptr_cursor = XCreateFontCursor (term->dpy, XC_left_ptr);
+}
+
+void
+scrollBar_t::update_data ()
+{
+#if defined(PLAIN_SCROLLBAR)
+  if (style == R_SB_PLAIN)
+    {
+      beg = 0;
+      end = term->szHint.height;
+      update = &rxvt_term::scrollbar_show_plain;
+    }
+#endif
+#if defined(XTERM_SCROLLBAR)
+  if (style == R_SB_XTERM)
+    {
+      beg = 0;
+      end = term->szHint.height;
+      update = &rxvt_term::scrollbar_show_xterm;
+    }
+#endif
+#if defined(NEXT_SCROLLBAR)
+  if (style == R_SB_NEXT)
+    {
+      beg = 0;
+      end = term->szHint.height - (SB_BUTTON_TOTAL_HEIGHT + SB_PADDING);
+      update = &rxvt_term::scrollbar_show_next;
+    }
+#endif
+#if defined(RXVT_SCROLLBAR)
+  if (style == R_SB_RXVT)
+    {
+      beg = (width + 1) + shadow;
+      end = term->szHint.height - beg - (2 * shadow);
+      update = &rxvt_term::scrollbar_show_rxvt;
     }
-  scrollBar.last_bot = scrollBar.last_state = -1;
 #endif
 }