--- rxvt-unicode/src/scrollbar-rxvt.C 2006/01/16 15:12:48 1.21 +++ rxvt-unicode/src/scrollbar-rxvt.C 2006/02/20 22:42:01 1.29 @@ -1,10 +1,10 @@ -/*--------------------------------*-C-*---------------------------------* +/*----------------------------------------------------------------------* * File: scrollbar-rxvt.C *----------------------------------------------------------------------* * * Copyright (c) 1997,1998 mj olesen * Copyright (c) 1999-2001 Geoff Wing - * Copyright (c) 2004 Marc Lehmann + * Copyright (c) 2004-2006 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 @@ -27,30 +27,47 @@ /*----------------------------------------------------------------------*/ #if defined(RXVT_SCROLLBAR) -#define DOUBLED 1 +static void +draw_shadow (rxvt_term *term, int x, int y, int w, int h) +{ + int shadow; + + shadow = (w == 0 || h == 0) ? 1 : SHADOW_WIDTH; + w += x - 1; + h += y - 1; + + for (; shadow-- > 0; x++, y++, w--, h--) + { + XDrawLine (term->dpy, term->scrollBar.win, term->topShadowGC, x, y, w , y ); + XDrawLine (term->dpy, term->scrollBar.win, term->topShadowGC, x, y, x , h ); + XDrawLine (term->dpy, term->scrollBar.win, term->botShadowGC, w, h, w , y + 1); + XDrawLine (term->dpy, term->scrollBar.win, term->botShadowGC, w, h, x + 1, h ); + } +} /* draw triangular button with a shadow of 2 pixels */ -void -rxvt_term::Draw_button (int x, int y, int state, int dirn) +static void +draw_button (rxvt_term *term, int x, int y, int state, int dirn) { - unsigned int sz, sz2; - XPoint pt[3]; - GC top, bot; + unsigned int sz, sz2; + XPoint pt[3]; + GC top, bot; - sz = scrollBar.width; + sz = term->scrollBar.width; sz2 = sz / 2; + switch (state) { case +1: - top = topShadowGC; - bot = botShadowGC; + top = term->topShadowGC; + bot = term->botShadowGC; break; case -1: - top = botShadowGC; - bot = topShadowGC; + top = term->botShadowGC; + bot = term->topShadowGC; break; default: - top = bot = scrollbarGC; + top = bot = term->scrollbarGC; break; } @@ -58,6 +75,7 @@ pt[0].x = x; pt[1].x = x + sz - 1; pt[2].x = x + sz2; + if (dirn == UP) { pt[0].y = pt[1].y = y + sz - 1; @@ -69,20 +87,20 @@ pt[2].y = y + sz - 1; } - XFillPolygon (display->display, scrollBar.win, scrollbarGC, + XFillPolygon (term->dpy, term->scrollBar.win, term->scrollbarGC, pt, 3, Convex, CoordModeOrigin); /* draw base */ - XDrawLine (display->display, scrollBar.win, (dirn == UP ? bot : top), + XDrawLine (term->dpy, term->scrollBar.win, (dirn == UP ? bot : top), pt[0].x, pt[0].y, pt[1].x, pt[1].y); /* draw shadow on left */ pt[1].x = x + sz2 - 1; pt[1].y = y + (dirn == UP ? 0 : sz - 1); - XDrawLine (display->display, scrollBar.win, top, + XDrawLine (term->dpy, term->scrollBar.win, top, pt[0].x, pt[0].y, pt[1].x, pt[1].y); -#if DOUBLED +#if SHADOW_WIDTH > 1 /* doubled */ pt[0].x++; @@ -97,7 +115,7 @@ pt[1].y--; } - XDrawLine (display->display, scrollBar.win, top, + XDrawLine (term->dpy, term->scrollBar.win, top, pt[0].x, pt[0].y, pt[1].x, pt[1].y); #endif @@ -106,10 +124,10 @@ /* pt[2].x = x + sz2; */ pt[1].y = y + (dirn == UP ? sz - 1 : 0); pt[2].y = y + (dirn == UP ? 0 : sz - 1); - XDrawLine (display->display, scrollBar.win, bot, + XDrawLine (term->dpy, term->scrollBar.win, bot, pt[2].x, pt[2].y, pt[1].x, pt[1].y); -#if DOUBLED +#if SHADOW_WIDTH > 1 /* doubled */ pt[1].x--; if (dirn == UP) @@ -123,7 +141,7 @@ pt[1].y++; } - XDrawLine (display->display, scrollBar.win, bot, + XDrawLine (term->dpy, term->scrollBar.win, bot, pt[2].x, pt[2].y, pt[1].x, pt[1].y); #endif } @@ -140,8 +158,8 @@ if (sbshadow) { - XSetWindowBackground (display->display, scrollBar.win, pix_colors_focused[Color_trough]); - XClearWindow (display->display, scrollBar.win); + XSetWindowBackground (dpy, scrollBar.win, pix_colors_focused[Color_trough]); + XClearWindow (dpy, scrollBar.win); } } else @@ -149,19 +167,19 @@ if (update) { if (last_top < scrollBar.top) - XClearArea (display->display, scrollBar.win, + XClearArea (dpy, scrollBar.win, sbshadow, last_top, sbwidth, (scrollBar.top - last_top), False); if (scrollBar.bot < last_bot) - XClearArea (display->display, scrollBar.win, + XClearArea (dpy, scrollBar.win, sbshadow, scrollBar.bot, sbwidth, (last_bot - scrollBar.bot), False); } else - XClearWindow (display->display, scrollBar.win); + XClearWindow (dpy, scrollBar.win); } /* scrollbar slider */ @@ -174,32 +192,25 @@ else xofs = sbshadow ? sbwidth : sbwidth - 1; - XDrawLine (display->display, scrollBar.win, botShadowGC, + XDrawLine (dpy, scrollBar.win, botShadowGC, xofs, 0, xofs, scrollBar.end + sbwidth); } #endif - XFillRectangle (display->display, scrollBar.win, scrollbarGC, + XFillRectangle (dpy, scrollBar.win, scrollbarGC, sbshadow, scrollBar.top, sbwidth, scrollbar_len); if (sbshadow) /* trough shadow */ - rxvt_Draw_Shadow (display->display, scrollBar.win, - botShadowGC, topShadowGC, - 0, 0, - sbwidth + 2 * sbshadow, /* scrollbar_TotalWidth () */ - scrollBar.end + (sbwidth + 1) + sbshadow); + draw_shadow (this, 0, 0, sbwidth + 2 * sbshadow, scrollBar.end + (sbwidth + 1) + sbshadow); /* shadow for scrollbar slider */ - rxvt_Draw_Shadow (display->display, scrollBar.win, - topShadowGC, botShadowGC, - sbshadow, scrollBar.top, sbwidth, - scrollbar_len); + draw_shadow (this, sbshadow, scrollBar.top, sbwidth, scrollbar_len); /* Redraw scrollbar arrows */ - Draw_button (sbshadow, sbshadow, (scrollbar_isUp () ? -1 : +1), UP); - Draw_button (sbshadow, scrollBar.end + 1, (scrollbar_isDn () ? -1 : +1), DN); + draw_button (this, sbshadow, sbshadow, (scrollbar_isUp () ? -1 : +1), UP); + draw_button (this, sbshadow, scrollBar.end + 1, (scrollbar_isDn () ? -1 : +1), DN); return 1; }