--- rxvt-unicode/src/scrollbar-next.C 2004/02/01 01:34:41 1.7 +++ rxvt-unicode/src/scrollbar-next.C 2004/08/15 21:55:45 1.13 @@ -1,11 +1,12 @@ /*--------------------------------*-C-*---------------------------------* - * File: scrollbar-next.c + * File: scrollbar-next.C *----------------------------------------------------------------------* * * Copyright (c) 1997,1998 mj olesen * Copyright (c) 1998 Alfredo K. Kojima * - N*XTstep like scrollbars * Copyright (c) 1999-2001 Geoff Wing + * Copyright (c) 2004 Marc Lehmann * * 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 @@ -24,7 +25,6 @@ #include "../config.h" /* NECESSARY */ #include "rxvt.h" /* NECESSARY */ -#include "scrollbar-next.intpro" /* PROTOS for internal routines */ /*----------------------------------------------------------------------*/ #if defined(NEXT_SCROLLBAR) @@ -123,7 +123,7 @@ Pixmap d; GC pointcolour; - d = XCreatePixmap(Xdisplay, scrollBar.win, width, height, XDEPTH); + d = XCreatePixmap (display->display, scrollBar.win, width, height, display->depth); for (y = 0; y < height; y++) { @@ -137,7 +137,7 @@ pointcolour = darkGC; else /* if (a == '#' || a == 'b' || a) */ pointcolour = blackGC; - XDrawPoint(Xdisplay, d, pointcolour, x, y); + XDrawPoint (display->display, d, pointcolour, x, y); } } return d; @@ -153,33 +153,33 @@ gcvalue.graphics_exposures = False; - gcvalue.foreground = PixColors[Color_Black]; - blackGC = XCreateGC(Xdisplay, scrollBar.win, + gcvalue.foreground = pix_colors[Color_Black]; + blackGC = XCreateGC (display->display, scrollBar.win, GCForeground | GCGraphicsExposures, &gcvalue); - gcvalue.foreground = PixColors[Color_White]; - whiteGC = XCreateGC(Xdisplay, scrollBar.win, + gcvalue.foreground = pix_colors[Color_White]; + whiteGC = XCreateGC (display->display, scrollBar.win, GCForeground | GCGraphicsExposures, &gcvalue); xcol.red = 0xaeba; xcol.green = 0xaaaa; xcol.blue = 0xaeba; //if (!rXAllocColor (&xcol, "light gray"))//TODO//D// - xcol.pixel = PixColors[Color_AntiqueWhite]; + xcol.pixel = pix_colors[Color_AntiqueWhite]; light = gcvalue.foreground = xcol.pixel; - grayGC = XCreateGC(Xdisplay, scrollBar.win, + grayGC = XCreateGC (display->display, scrollBar.win, GCForeground | GCGraphicsExposures, &gcvalue); xcol.red = 0x51aa; xcol.green = 0x5555; xcol.blue = 0x5144; //if (!rXAllocColor (&xcol, "dark gray"))//TODO//D// - xcol.pixel = PixColors[Color_Grey25]; + xcol.pixel = pix_colors[Color_Grey25]; dark = gcvalue.foreground = xcol.pixel; - darkGC = XCreateGC(Xdisplay, scrollBar.win, + darkGC = XCreateGC (display->display, scrollBar.win, GCForeground | GCGraphicsExposures, &gcvalue); - stipple = XCreateBitmapFromData(Xdisplay, scrollBar.win, + stipple = XCreateBitmapFromData (display->display, scrollBar.win, (char *)n_stp_bits, n_stp_width, n_stp_height); @@ -188,9 +188,9 @@ gcvalue.fill_style = FillOpaqueStippled; gcvalue.stipple = stipple; - /* XSetWindowBackground(Xdisplay, scrollBar.win, PixColors[Color_Red]); */ + /* XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_Red]); */ - stippleGC = XCreateGC(Xdisplay, scrollBar.win, + stippleGC = XCreateGC (display->display, scrollBar.win, GCForeground | GCBackground | GCStipple | GCFillStyle | GCGraphicsExposures, &gcvalue); @@ -216,15 +216,15 @@ x2 = x1 + w - 1; /* right point */ y2 = y1 + h - 1; /* bottom point */ /* white top and left */ - XDrawLine(Xdisplay, d, whiteGC, x1, y1, x2, y1); - XDrawLine(Xdisplay, d, whiteGC, x1, y1, x1, y2); + XDrawLine (display->display, d, whiteGC, x1, y1, x2, y1); + XDrawLine (display->display, d, whiteGC, x1, y1, x1, y2); /* black bottom and right */ - XDrawLine(Xdisplay, d, blackGC, x1, y2, x2, y2); - XDrawLine(Xdisplay, d, blackGC, x2, y1, x2, y2); + XDrawLine (display->display, d, blackGC, x1, y2, x2, y2); + XDrawLine (display->display, d, blackGC, x2, y1, x2, y2); /* dark inside bottom and right */ x1++, y1++, x2--, y2--; /* move in one point */ - XDrawLine(Xdisplay, d, darkGC, x1, y2, x2, y2); - XDrawLine(Xdisplay, d, darkGC, x2, y1, x2, y2); + XDrawLine (display->display, d, darkGC, x1, y2, x2, y2); + XDrawLine (display->display, d, darkGC, x2, y1, x2, y2); } int @@ -241,28 +241,28 @@ if (TermWin.nscrolled == 0 || !update) { - XFillRectangle(Xdisplay, scrollBar.win, grayGC, 0, 0, + XFillRectangle (display->display, scrollBar.win, grayGC, 0, 0, SB_WIDTH_NEXT + 1, height); - XDrawRectangle(Xdisplay, scrollBar.win, blackGC, 0, + XDrawRectangle (display->display, scrollBar.win, blackGC, 0, -SB_BORDER_WIDTH, SB_WIDTH_NEXT, height + SB_BORDER_WIDTH); - XFillRectangle(Xdisplay, scrollBar.win, stippleGC, + XFillRectangle (display->display, scrollBar.win, stippleGC, SB_LEFT_PADDING, 0, SB_BUTTON_WIDTH, height); } if (TermWin.nscrolled) { if (last_top < scrollBar.top || !update) - XFillRectangle(Xdisplay, scrollBar.win, stippleGC, + XFillRectangle (display->display, scrollBar.win, stippleGC, SB_LEFT_PADDING, SB_PADDING + last_top, SB_BUTTON_WIDTH, scrollBar.top - last_top); if (scrollBar.bot < last_bot || !update) - XFillRectangle(Xdisplay, scrollBar.win, stippleGC, + XFillRectangle (display->display, scrollBar.win, stippleGC, SB_LEFT_PADDING, scrollBar.bot + SB_PADDING, SB_BUTTON_WIDTH, (last_bot - scrollBar.bot)); - XFillRectangle(Xdisplay, scrollBar.win, grayGC, + XFillRectangle (display->display, scrollBar.win, grayGC, SB_LEFT_PADDING, scrollBar.top + SB_PADDING, SB_BUTTON_WIDTH, scrollbar_len); - XCopyArea(Xdisplay, dimple, scrollBar.win, whiteGC, 0, 0, + XCopyArea (display->display, dimple, scrollBar.win, whiteGC, 0, 0, SCROLLER_DIMPLE_WIDTH, SCROLLER_DIMPLE_HEIGHT, (SB_WIDTH_NEXT - SCROLLER_DIMPLE_WIDTH) / 2, scrollBar.top + SB_BEVEL_WIDTH_UPPER_LEFT + @@ -278,13 +278,13 @@ height - SB_BUTTON_SINGLE_HEIGHT, SB_BUTTON_WIDTH, SB_BUTTON_HEIGHT); - s = (scrollbar_isUp()) ? upArrowHi : upArrow; - XCopyArea(Xdisplay, s, scrollBar.win, whiteGC, 0, 0, + s = (scrollbar_isUp ()) ? upArrowHi : upArrow; + XCopyArea (display->display, s, scrollBar.win, whiteGC, 0, 0, ARROW_WIDTH, ARROW_HEIGHT, SB_BUTTON_FACE_X, height - SB_BUTTON_BOTH_HEIGHT + SB_BEVEL_WIDTH_UPPER_LEFT); - s = (scrollbar_isDn()) ? downArrowHi : downArrow; - XCopyArea(Xdisplay, s, scrollBar.win, whiteGC, 0, 0, + s = (scrollbar_isDn ()) ? downArrowHi : downArrow; + XCopyArea (display->display, s, scrollBar.win, whiteGC, 0, 0, ARROW_WIDTH, ARROW_HEIGHT, SB_BUTTON_FACE_X, height - SB_BUTTON_SINGLE_HEIGHT + SB_BEVEL_WIDTH_UPPER_LEFT); }