--- rxvt-unicode/src/scrollbar-plain.C	2005/12/31 17:16:17	1.14
+++ rxvt-unicode/src/scrollbar-plain.C	2008/02/19 13:01:33	1.25
@@ -4,7 +4,7 @@
  *
  * Copyright (c) 1997,1998 mj olesen <olesen@me.QueensU.CA>
  * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com>
- * Copyright (c) 2004      Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2004-2006 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
@@ -28,42 +28,41 @@
 #if defined(PLAIN_SCROLLBAR)
 
 int
-rxvt_term::scrollbar_show_plain (int update, int last_top, int last_bot, int scrollbar_len)
+scrollBar_t::show_plain (int update)
 {
   int xsb = 0;
-  int sbwidth = scrollBar.width - 1;
+  int sbwidth = width - 1;
 
-  if ((scrollBar.init & R_SB_PLAIN) == 0)
+  if ((init & R_SB_PLAIN) == 0)
     {
       XGCValues gcvalue;
 
-      scrollBar.init |= R_SB_PLAIN;
-      gcvalue.foreground = pix_colors_focused[Color_scroll];
+      init |= R_SB_PLAIN;
+      gcvalue.foreground = term->pix_colors_focused[Color_scroll];
 
-      pscrollbarGC = XCreateGC (display->display, scrollBar.win,
-                                GCForeground, &gcvalue);
+      pscrollbarGC = XCreateGC (term->dpy, win, GCForeground, &gcvalue);
     }
 
-  xsb = OPTION (Opt_scrollBar_right) ? 1 : 0;
+  xsb = term->option (Opt_scrollBar_right) ? 1 : 0;
 
   if (update)
     {
-      if (last_top < scrollBar.top)
-        XClearArea (display->display, scrollBar.win,
-                    sb_shadow + xsb, last_top,
-                    sbwidth + 1, (scrollBar.top - last_top), False);
-
-      if (scrollBar.bot < last_bot)
-        XClearArea (display->display, scrollBar.win,
-                    sb_shadow + xsb, scrollBar.bot,
-                    sbwidth + 1, (last_bot - scrollBar.bot), False);
+      if (last_top < top)
+        XClearArea (term->dpy, win,
+                    0, last_top,
+                    sbwidth + 1, top - last_top, False);
+
+      if (bot < last_bot)
+        XClearArea (term->dpy, win,
+                    0, bot,
+                    sbwidth + 1, last_bot - bot, False);
     }
   else
-    XClearWindow (display->display, scrollBar.win);
+    XClearWindow (term->dpy, win);
 
   /* scrollbar slider */
-  XFillRectangle (display->display, scrollBar.win, pscrollbarGC,
-                  xsb + 1, scrollBar.top, sbwidth, scrollbar_len);
+  XFillRectangle (term->dpy, win, pscrollbarGC,
+                  1 - xsb, top, sbwidth, len);
 
   return 1;
 }