--- rxvt-unicode/src/scrollbar-xterm.C	2004/01/31 00:20:21	1.4
+++ rxvt-unicode/src/scrollbar-xterm.C	2004/04/08 20:31:45	1.10
@@ -1,10 +1,10 @@
 /*--------------------------------*-C-*---------------------------------*
- * File:	scrollbar-xterm.c
+ * File:	scrollbar-xterm.C
  *----------------------------------------------------------------------*
- * $Id: scrollbar-xterm.C,v 1.4 2004/01/31 00:20:21 pcg Exp $
  *
  * 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>
  *
  * 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
@@ -30,56 +30,55 @@
 
 #define x_stp_width	8
 #define x_stp_height	2
-const unsigned char x_stp_bits[] = { 0xff, 0xff };
+const unsigned char x_stp_bits[] = { 0xaa, 0x55 };
 
 int
-rxvt_term::scrollbar_show_xterm (int update __attribute__((unused)), int last_top, int last_bot, int scrollbar_len)
+rxvt_term::scrollbar_show_xterm (int update __attribute__ ((unused)), int last_top, int last_bot, int scrollbar_len)
 {
-    int             xsb = 0;
-    int             sbwidth = scrollBar.width - 1;
+  int             xsb = 0;
+  int             sbwidth = scrollBar.width - 1;
 
-    if ((scrollBar.init & R_SB_XTERM) == 0) {
-	XGCValues       gcvalue;
-
-	scrollBar.init |= R_SB_XTERM;
-	gcvalue.stipple = XCreateBitmapFromData(Xdisplay, scrollBar.win,
-						(char *)x_stp_bits, x_stp_width,
-						x_stp_height);
-	if (!gcvalue.stipple) {
-	    rxvt_print_error("can't create bitmap");
-	    exit(EXIT_FAILURE);
-	}
-	gcvalue.fill_style = FillOpaqueStippled;
-	gcvalue.foreground = PixColors[Color_fg];
-	gcvalue.background = PixColors[Color_bg];
-
-	xscrollbarGC = XCreateGC(Xdisplay, scrollBar.win,
-				       GCForeground | GCBackground
-				       | GCFillStyle | GCStipple, &gcvalue);
-	gcvalue.foreground = PixColors[Color_border];
-	ShadowGC = XCreateGC(Xdisplay, scrollBar.win, GCForeground,
-				   &gcvalue);
+  if ((scrollBar.init & R_SB_XTERM) == 0)
+    {
+      XGCValues       gcvalue;
+
+      scrollBar.init |= R_SB_XTERM;
+      gcvalue.stipple = XCreateBitmapFromData (display->display, scrollBar.win,
+                                              (char *)x_stp_bits, x_stp_width,
+                                              x_stp_height);
+      if (!gcvalue.stipple)
+        rxvt_fatal ("can't create bitmap");
+
+      gcvalue.fill_style = FillOpaqueStippled;
+      gcvalue.foreground = PixColors[Color_fg];
+      gcvalue.background = PixColors[Color_bg];
+
+      xscrollbarGC = XCreateGC (display->display, scrollBar.win,
+                               GCForeground | GCBackground
+                               | GCFillStyle | GCStipple, &gcvalue);
+      gcvalue.foreground = PixColors[Color_border];
+      ShadowGC = XCreateGC (display->display, scrollBar.win, GCForeground, &gcvalue);
     }
-/* instead of XClearWindow (Xdisplay, scrollBar.win); */
-    xsb = (Options & Opt_scrollBar_right) ? 1 : 0;
-    if (last_top < scrollBar.top)
-	XClearArea(Xdisplay, scrollBar.win,
-		   sb_shadow + xsb, last_top,
-		   sbwidth + 1, (scrollBar.top - last_top), False);
-
-    if (scrollBar.bot < last_bot)
-	XClearArea(Xdisplay, scrollBar.win,
-		   sb_shadow + xsb, scrollBar.bot,
-		   sbwidth + 1, (last_bot - scrollBar.bot), False);
-
-/* scrollbar slider */
-    XFillRectangle(Xdisplay, scrollBar.win, xscrollbarGC,
-		   xsb + 1, scrollBar.top, sbwidth, scrollbar_len);
-
-    /*XDrawLine(Xdisplay, scrollBar.win, ShadowGC,
-	      xsb ? 0 : sbwidth, scrollBar.beg,
-	      xsb ? 0 : sbwidth, scrollBar.end);*/
-    return 1;
+  /* instead of XClearWindow (display->display, scrollBar.win); */
+  xsb = (Options & Opt_scrollBar_right) ? 1 : 0;
+  if (last_top < scrollBar.top)
+    XClearArea (display->display, scrollBar.win,
+               sb_shadow + xsb, last_top,
+               sbwidth, (scrollBar.top - last_top), False);
+
+  if (scrollBar.bot < last_bot)
+    XClearArea (display->display, scrollBar.win,
+               sb_shadow + xsb, scrollBar.bot,
+               sbwidth, (last_bot - scrollBar.bot), False);
+
+  /* scrollbar slider */
+  XFillRectangle (display->display, scrollBar.win, xscrollbarGC,
+                 xsb + 1, scrollBar.top, sbwidth - 2, scrollbar_len);
+
+  XDrawLine (display->display, scrollBar.win, ShadowGC,
+            xsb ? 0 : sbwidth, scrollBar.beg,
+            xsb ? 0 : sbwidth, scrollBar.end);
+  return 1;
 }
 #endif				/* XTERM_SCROLLBAR */
 /*----------------------- end-of-file (C source) -----------------------*/