--- rxvt-unicode/src/scrollbar-xterm.C	2004/02/01 01:34:41	1.6
+++ rxvt-unicode/src/scrollbar-xterm.C	2004/08/15 22:09:24	1.15
@@ -1,9 +1,10 @@
 /*--------------------------------*-C-*---------------------------------*
- * File:	scrollbar-xterm.c
+ * File:	scrollbar-xterm.C
  *----------------------------------------------------------------------*
  *
  * 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
@@ -22,7 +23,6 @@
 
 #include "../config.h"		/* NECESSARY */
 #include "rxvt.h"		/* NECESSARY */
-#include "scrollbar-xterm.intpro"	/* PROTOS for internal routines */
 
 /*----------------------------------------------------------------------*/
 #if defined(XTERM_SCROLLBAR)
@@ -32,7 +32,7 @@
 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;
@@ -42,41 +42,39 @@
       XGCValues       gcvalue;
 
       scrollBar.init |= R_SB_XTERM;
-      gcvalue.stipple = XCreateBitmapFromData(Xdisplay, scrollBar.win,
+      gcvalue.stipple = XCreateBitmapFromData (display->display, 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);
-        }
+        rxvt_fatal ("can't create bitmap\n");
+
       gcvalue.fill_style = FillOpaqueStippled;
-      gcvalue.foreground = PixColors[Color_fg];
-      gcvalue.background = PixColors[Color_bg];
+      gcvalue.foreground = pix_colors[Color_fg];
+      gcvalue.background = pix_colors[Color_bg];
 
-      xscrollbarGC = XCreateGC(Xdisplay, scrollBar.win,
-                               GCForeground | GCBackground
-                               | GCFillStyle | GCStipple, &gcvalue);
-      gcvalue.foreground = PixColors[Color_border];
-      ShadowGC = XCreateGC(Xdisplay, scrollBar.win, GCForeground, &gcvalue);
+      xscrollbarGC = XCreateGC (display->display, scrollBar.win,
+                                GCForeground | GCBackground
+                                | GCFillStyle | GCStipple, &gcvalue);
+      gcvalue.foreground = pix_colors[Color_border];
+      ShadowGC = XCreateGC (display->display, scrollBar.win, GCForeground, &gcvalue);
     }
-  /* instead of XClearWindow (Xdisplay, scrollBar.win); */
-  xsb = (Options & Opt_scrollBar_right) ? 1 : 0;
+  /* instead of XClearWindow (display->display, scrollBar.win); */
+  xsb = (options & Opt_scrollBar_right) ? 1 : 0;
   if (last_top < scrollBar.top)
-    XClearArea(Xdisplay, scrollBar.win,
+    XClearArea (display->display, scrollBar.win,
                sb_shadow + xsb, last_top,
                sbwidth, (scrollBar.top - last_top), False);
 
   if (scrollBar.bot < last_bot)
-    XClearArea(Xdisplay, scrollBar.win,
+    XClearArea (display->display, scrollBar.win,
                sb_shadow + xsb, scrollBar.bot,
                sbwidth, (last_bot - scrollBar.bot), False);
 
   /* scrollbar slider */
-  XFillRectangle(Xdisplay, scrollBar.win, xscrollbarGC,
+  XFillRectangle (display->display, scrollBar.win, xscrollbarGC,
                  xsb + 1, scrollBar.top, sbwidth - 2, scrollbar_len);
 
-  XDrawLine(Xdisplay, scrollBar.win, ShadowGC,
+  XDrawLine (display->display, scrollBar.win, ShadowGC,
             xsb ? 0 : sbwidth, scrollBar.beg,
             xsb ? 0 : sbwidth, scrollBar.end);
   return 1;