--- rxvt-unicode/src/scrollbar-rxvt.C 2004/01/31 04:12:10 1.5 +++ rxvt-unicode/src/scrollbar-rxvt.C 2010/03/30 10:26:22 1.39 @@ -1,9 +1,10 @@ -/*--------------------------------*-C-*---------------------------------* - * File: scrollbar-rxvt.c +/*----------------------------------------------------------------------* + * File: scrollbar-rxvt.C *----------------------------------------------------------------------* * * Copyright (c) 1997,1998 mj olesen * Copyright (c) 1999-2001 Geoff Wing + * 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 @@ -22,164 +23,205 @@ #include "../config.h" /* NECESSARY */ #include "rxvt.h" /* NECESSARY */ -#include "scrollbar-rxvt.intpro" /* PROTOS for internal routines */ /*----------------------------------------------------------------------*/ #if defined(RXVT_SCROLLBAR) -/* draw triangular button with a shadow of SHADOW (1 or 2) pixels */ -void -rxvt_term::Draw_button (int x, int y, int state, int dirn) +static void +draw_shadow (scrollBar_t *sb, int x, int y, int w, int h) { - unsigned int sz, sz2; - XPoint pt[3]; - GC top, bot; - - sz = scrollBar.width; - sz2 = sz / 2; - switch (state) { - case +1: - top = topShadowGC; - bot = botShadowGC; - break; - case -1: - top = botShadowGC; - bot = topShadowGC; - break; - default: - top = bot = scrollbarGC; - break; - } - -/* fill triangle */ - 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; - pt[2].y = y; - } else { - pt[0].y = pt[1].y = y; - pt[2].y = y + sz - 1; - } - XFillPolygon(Xdisplay, scrollBar.win, scrollbarGC, - pt, 3, Convex, CoordModeOrigin); - -/* draw base */ - XDrawLine(Xdisplay, 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(Xdisplay, scrollBar.win, top, - pt[0].x, pt[0].y, pt[1].x, pt[1].y); - -#if (SHADOW > 1) -/* doubled */ - pt[0].x++; - if (dirn == UP) { - pt[0].y--; - pt[1].y++; - } else { - pt[0].y++; - pt[1].y--; + int shadow; + Drawable d = sb->win; + Display *dpy = sb->term->dpy; + + shadow = (w == 0 || h == 0) ? 1 : SHADOW_WIDTH; + w += x - 1; + h += y - 1; + + for (; shadow-- > 0; x++, y++, w--, h--) + { + XDrawLine (dpy, d, sb->topShadowGC, x, y, w , y ); + XDrawLine (dpy, d, sb->topShadowGC, x, y, x , h ); + XDrawLine (dpy, d, sb->botShadowGC, w, h, w , y + 1); + XDrawLine (dpy, d, sb->botShadowGC, w, h, x + 1, h ); + } +} + +/* draw triangular button with a shadow of 2 pixels */ +static void +draw_button (scrollBar_t *sb, int x, int y, int dirn) +{ + unsigned int sz, sz2; + XPoint pt[3]; + GC top, bot; + Drawable d = sb->win; + Display *dpy = sb->term->dpy; + + sz = sb->width; + sz2 = sz / 2; + + if ((dirn == UP && sb->state == STATE_UP) + || (dirn == DN && sb->state == STATE_DOWN)) + { + top = sb->botShadowGC; + bot = sb->topShadowGC; + } + else + { + top = sb->topShadowGC; + bot = sb->botShadowGC; + } + + /* fill triangle */ + 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; + pt[2].y = y; + } + else + { + pt[0].y = pt[1].y = y; + pt[2].y = y + sz - 1; + } + + XFillPolygon (dpy, d, sb->scrollbarGC, + pt, 3, Convex, CoordModeOrigin); + + /* draw base */ + XDrawLine (dpy, d, (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 (dpy, d, top, + pt[0].x, pt[0].y, pt[1].x, pt[1].y); + +#if SHADOW_WIDTH > 1 + /* doubled */ + pt[0].x++; + + if (dirn == UP) + { + pt[0].y--; + pt[1].y++; } - XDrawLine(Xdisplay, scrollBar.win, top, - pt[0].x, pt[0].y, pt[1].x, pt[1].y); + else + { + pt[0].y++; + pt[1].y--; + } + + XDrawLine (dpy, d, top, + pt[0].x, pt[0].y, pt[1].x, pt[1].y); #endif -/* draw shadow on right */ - pt[1].x = x + sz - 1; -/* pt[2].x = x + sz2; */ - pt[1].y = y + (dirn == UP ? sz - 1 : 0); - pt[2].y = y + (dirn == UP ? 0 : sz - 1); - XDrawLine(Xdisplay, scrollBar.win, bot, - pt[2].x, pt[2].y, pt[1].x, pt[1].y); -#if (SHADOW > 1) -/* doubled */ - pt[1].x--; - if (dirn == UP) { - pt[2].y++; - pt[1].y--; - } else { - pt[2].y--; - pt[1].y++; + + /* draw shadow on right */ + pt[1].x = x + sz - 1; + /* pt[2].x = x + sz2; */ + pt[1].y = y + (dirn == UP ? sz - 1 : 0); + pt[2].y = y + (dirn == UP ? 0 : sz - 1); + XDrawLine (dpy, d, bot, + pt[2].x, pt[2].y, pt[1].x, pt[1].y); + +#if SHADOW_WIDTH > 1 + /* doubled */ + pt[1].x--; + if (dirn == UP) + { + pt[2].y++; + pt[1].y--; } - XDrawLine(Xdisplay, scrollBar.win, bot, - pt[2].x, pt[2].y, pt[1].x, pt[1].y); + else + { + pt[2].y--; + pt[1].y++; + } + + XDrawLine (dpy, d, bot, + pt[2].x, pt[2].y, pt[1].x, pt[1].y); #endif } int -rxvt_term::scrollbar_show_rxvt (int update __attribute__((unused)), int last_top, int last_bot, int scrollbar_len) +scrollBar_t::show_rxvt (int update) { - int sbshadow = sb_shadow; - int sbwidth = (int)scrollBar.width; + int sbwidth = (int)width; - if ((scrollBar.init & R_SB_RXVT) == 0) { - XGCValues gcvalue; + if ((init & R_SB_RXVT) == 0) + { + XGCValues gcvalue; - scrollBar.init |= R_SB_RXVT; - gcvalue.foreground = PixColors[Color_trough]; - if (sbshadow) { - XSetWindowBackground(Xdisplay, scrollBar.win, - gcvalue.foreground); - XClearWindow(Xdisplay, scrollBar.win); - } - } else { -/* instead of XClearWindow (Xdisplay, scrollBar.win); */ - if (last_top < scrollBar.top) - XClearArea(Xdisplay, scrollBar.win, - sbshadow, last_top, - sbwidth, (scrollBar.top - last_top), - False); - - if (scrollBar.bot < last_bot) - XClearArea(Xdisplay, scrollBar.win, - sbshadow, scrollBar.bot, - sbwidth, (last_bot - scrollBar.bot), - False); - } + init |= R_SB_RXVT; -/* scrollbar slider */ -#ifdef SB_BORDER + gcvalue.foreground = term->pix_colors[Color_topShadow]; + topShadowGC = XCreateGC (term->dpy, term->vt, GCForeground, &gcvalue); + gcvalue.foreground = term->pix_colors[Color_bottomShadow]; + botShadowGC = XCreateGC (term->dpy, term->vt, GCForeground, &gcvalue); + gcvalue.foreground = term->pix_colors[ (term->depth <= 2 ? Color_fg : Color_scroll)]; + scrollbarGC = XCreateGC (term->dpy, term->vt, GCForeground, &gcvalue); + if (shadow) + { + XSetWindowBackground (term->dpy, win, term->pix_colors_focused[Color_trough]); + XClearWindow (term->dpy, win); + } + } + else { - int xofs; + if (update) + { + if (last_top < top) + XClearArea (term->dpy, win, + shadow, last_top, + sbwidth, (top - last_top), + False); + + if (bot < last_bot) + XClearArea (term->dpy, win, + shadow, bot, + sbwidth, (last_bot - bot), + False); + } + else + XClearWindow (term->dpy, win); + } - if (Options & Opt_scrollBar_right) - xofs = 0; - else - xofs = sbshadow ? sbwidth : sbwidth - 1; + /* scrollbar slider */ +#ifdef SB_BORDER + { + int xofs; - XDrawLine(Xdisplay, scrollBar.win, botShadowGC, - xofs, 0, xofs, scrollBar.end + sbwidth); - } + if (term->option (Opt_scrollBar_right)) + xofs = 0; + else + xofs = shadow ? sbwidth : sbwidth - 1; + + XDrawLine (term->dpy, win, botShadowGC, + xofs, 0, xofs, end + sbwidth); + } #endif - XFillRectangle(Xdisplay, scrollBar.win, scrollbarGC, - sbshadow, scrollBar.top, sbwidth, - scrollbar_len); - - if (sbshadow) - /* trough shadow */ - rxvt_Draw_Shadow(Xdisplay, scrollBar.win, - botShadowGC, topShadowGC, - 0, 0, - sbwidth + 2 * sbshadow, /* scrollbar_TotalWidth() */ - scrollBar.end + (sbwidth + 1) + sbshadow); -/* shadow for scrollbar slider */ - rxvt_Draw_Shadow(Xdisplay, scrollBar.win, - topShadowGC, botShadowGC, - 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); - return 1; + + XFillRectangle (term->dpy, win, scrollbarGC, + shadow, top, sbwidth, + bot - top); + + if (shadow) + /* trough shadow */ + draw_shadow (this, 0, 0, sbwidth + 2 * shadow, end + (sbwidth + 1) + shadow); + + /* shadow for scrollbar slider */ + draw_shadow (this, shadow, top, sbwidth, bot - top); + + /* Redraw scrollbar arrows */ + draw_button (this, shadow, shadow, UP); + draw_button (this, shadow, end + 1, DN); + + return 1; } -#endif /* RXVT_SCROLLBAR */ +#endif /* RXVT_SCROLLBAR */ /*----------------------- end-of-file (C source) -----------------------*/ +