--- rxvt-unicode/src/scrollbar-next.C 2004/01/31 04:12:10 1.6 +++ rxvt-unicode/src/scrollbar-next.C 2011/09/01 08:11:27 1.32 @@ -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-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 @@ -24,7 +25,6 @@ #include "../config.h" /* NECESSARY */ #include "rxvt.h" /* NECESSARY */ -#include "scrollbar-next.intpro" /* PROTOS for internal routines */ /*----------------------------------------------------------------------*/ #if defined(NEXT_SCROLLBAR) @@ -41,15 +41,17 @@ #define ARROW_WIDTH 13 #define ARROW_HEIGHT 13 -const char *const SCROLLER_DIMPLE[] = { +const char *const SCROLLER_DIMPLE[] = + { ".%###.", "%#%%%%", "#%%...", "#%.. ", "#%. ", ".%. ." -}; -const char *const SCROLLER_ARROW_UP[] = { + }; +const char *const SCROLLER_ARROW_UP[] = + { ".............", ".............", "......%......", @@ -63,8 +65,9 @@ "..%#######%..", ".............", "............." -}; -const char *const SCROLLER_ARROW_DOWN[] = { + }; +const char *const SCROLLER_ARROW_DOWN[] = + { ".............", ".............", "..%#######%..", @@ -78,8 +81,9 @@ "......%......", ".............", "............." -}; -const char *const HI_SCROLLER_ARROW_UP[] = { + }; +const char *const HI_SCROLLER_ARROW_UP[] = + { " ", " ", " % ", @@ -93,8 +97,9 @@ " %%%%%%%%% ", " ", " " -}; -const char *const HI_SCROLLER_ARROW_DOWN[] = { + }; +const char *const HI_SCROLLER_ARROW_DOWN[] = + { " ", " ", " %%%%%%%%% ", @@ -108,177 +113,189 @@ " % ", " ", " " -}; + }; -Pixmap -rxvt_term::renderPixmap (const char *const *data, int width, int height) +static Pixmap +renderPixmap (scrollBar_t *sb, const char *const *data, int width, int height) { - char a; - int x, y; - Pixmap d; - GC pointcolour; - - d = XCreatePixmap(Xdisplay, scrollBar.win, width, height, XDEPTH); - - for (y = 0; y < height; y++) { - for (x = 0; x < width; x++) { - if ((a = data[y][x]) == ' ' || a == 'w') - pointcolour = whiteGC; - else if (a == '.' || a == 'l') - pointcolour = grayGC; - else if (a == '%' || a == 'd') - pointcolour = darkGC; - else /* if (a == '#' || a == 'b' || a) */ - pointcolour = blackGC; - XDrawPoint(Xdisplay, d, pointcolour, x, y); - } + char a; + int x, y; + Pixmap d; + GC pointcolour; + + d = XCreatePixmap (sb->term->dpy, sb->win, width, height, sb->term->depth); + + for (y = 0; y < height; y++) + { + for (x = 0; x < width; x++) + { + if ((a = data[y][x]) == ' ' || a == 'w') + pointcolour = sb->whiteGC; + else if (a == '.' || a == 'l') + pointcolour = sb->grayGC; + else if (a == '%' || a == 'd') + pointcolour = sb->darkGC; + else /* if (a == '#' || a == 'b' || a) */ + pointcolour = sb->blackGC; + + XDrawPoint (sb->term->dpy, d, pointcolour, x, y); + } } - return d; + return d; } void -rxvt_term::init_scrollbar_stuff () +scrollBar_t::init_next () { - XGCValues gcvalue; - XColor xcol; - Pixmap stipple; - unsigned long light, dark; - - gcvalue.graphics_exposures = False; - - gcvalue.foreground = PixColors[Color_Black]; - blackGC = XCreateGC(Xdisplay, scrollBar.win, - GCForeground | GCGraphicsExposures, &gcvalue); - - gcvalue.foreground = PixColors[Color_White]; - whiteGC = XCreateGC(Xdisplay, 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]; - light = gcvalue.foreground = xcol.pixel; - grayGC = XCreateGC(Xdisplay, 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]; - dark = gcvalue.foreground = xcol.pixel; - darkGC = XCreateGC(Xdisplay, scrollBar.win, - GCForeground | GCGraphicsExposures, &gcvalue); - - stipple = XCreateBitmapFromData(Xdisplay, scrollBar.win, - (char *)n_stp_bits, n_stp_width, - n_stp_height); - - gcvalue.foreground = dark; - gcvalue.background = light; - gcvalue.fill_style = FillOpaqueStippled; - gcvalue.stipple = stipple; - -/* XSetWindowBackground(Xdisplay, scrollBar.win, PixColors[Color_Red]); */ - - stippleGC = XCreateGC(Xdisplay, scrollBar.win, - GCForeground | GCBackground | GCStipple - | GCFillStyle | GCGraphicsExposures, &gcvalue); - - dimple = renderPixmap (SCROLLER_DIMPLE, SCROLLER_DIMPLE_WIDTH, - SCROLLER_DIMPLE_HEIGHT); - - upArrow = renderPixmap (SCROLLER_ARROW_UP, ARROW_WIDTH, - ARROW_HEIGHT); - downArrow = renderPixmap (SCROLLER_ARROW_DOWN, ARROW_WIDTH, - ARROW_HEIGHT); - upArrowHi = renderPixmap (HI_SCROLLER_ARROW_UP, ARROW_WIDTH, - ARROW_HEIGHT); - downArrowHi = renderPixmap (HI_SCROLLER_ARROW_DOWN, - ARROW_WIDTH, ARROW_HEIGHT); + XGCValues gcvalue; + XColor xcol; + Pixmap stipple; + unsigned long light, dark; + + gcvalue.graphics_exposures = False; + + gcvalue.foreground = term->pix_colors_focused[Color_Black]; + blackGC = XCreateGC (term->dpy, win, + GCForeground | GCGraphicsExposures, &gcvalue); + + gcvalue.foreground = term->pix_colors_focused[Color_White]; + whiteGC = XCreateGC (term->dpy, win, + GCForeground | GCGraphicsExposures, &gcvalue); + + xcol.red = 0xaeba; + xcol.green = 0xaaaa; + xcol.blue = 0xaeba; + xcol.pixel = term->pix_colors_focused[Color_scroll]; + light = gcvalue.foreground = xcol.pixel; + grayGC = XCreateGC (term->dpy, win, + GCForeground | GCGraphicsExposures, &gcvalue); + + xcol.red = 0x51aa; + xcol.green = 0x5555; + xcol.blue = 0x5144; + //if (!rXAllocColor (&xcol, "dark gray"))//TODO//D// + xcol.pixel = term->pix_colors_focused[Color_Grey25]; + dark = gcvalue.foreground = xcol.pixel; + darkGC = XCreateGC (term->dpy, win, + GCForeground | GCGraphicsExposures, &gcvalue); + + stipple = XCreateBitmapFromData (term->dpy, win, + (char *)n_stp_bits, n_stp_width, + n_stp_height); + + gcvalue.foreground = dark; + gcvalue.background = light; + gcvalue.fill_style = FillOpaqueStippled; + gcvalue.stipple = stipple; + + /* XSetWindowBackground (dpy, scrollBar.win, pix_colors_focused[Color_Red]); */ + + stippleGC = XCreateGC (term->dpy, win, + GCForeground | GCBackground | GCStipple + | GCFillStyle | GCGraphicsExposures, &gcvalue); + + dimple = renderPixmap (this, SCROLLER_DIMPLE, SCROLLER_DIMPLE_WIDTH, + SCROLLER_DIMPLE_HEIGHT); + + upArrow = renderPixmap (this, SCROLLER_ARROW_UP, ARROW_WIDTH, + ARROW_HEIGHT); + downArrow = renderPixmap (this, SCROLLER_ARROW_DOWN, ARROW_WIDTH, + ARROW_HEIGHT); + upArrowHi = renderPixmap (this, HI_SCROLLER_ARROW_UP, ARROW_WIDTH, + ARROW_HEIGHT); + downArrowHi = renderPixmap (this, HI_SCROLLER_ARROW_DOWN, + ARROW_WIDTH, ARROW_HEIGHT); } /* Draw bevel & arrows */ -void -rxvt_term::drawBevel (Drawable d, int x1, int y1, int w, int h) +static void +drawBevel (scrollBar_t *sb, int x1, int y1, int w, int h) { - int x2, y2; - - 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); -/* black bottom and right */ - XDrawLine(Xdisplay, d, blackGC, x1, y2, x2, y2); - XDrawLine(Xdisplay, 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); + int x2, y2; + Drawable d = sb->win; + Display *dpy = sb->term->dpy; + + x2 = x1 + w - 1; /* right point */ + y2 = y1 + h - 1; /* bottom point */ + /* white top and left */ + XDrawLine (dpy, d, sb->whiteGC, x1, y1, x2, y1); + XDrawLine (dpy, d, sb->whiteGC, x1, y1, x1, y2); + /* black bottom and right */ + XDrawLine (dpy, d, sb->blackGC, x1, y2, x2, y2); + XDrawLine (dpy, d, sb->blackGC, x2, y1, x2, y2); + /* dark inside bottom and right */ + x1++, y1++, x2--, y2--; /* move in one point */ + XDrawLine (dpy, d, sb->darkGC, x1, y2, x2, y2); + XDrawLine (dpy, d, sb->darkGC, x2, y1, x2, y2); } int -rxvt_term::scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len) +scrollBar_t::show_next (int update) { - int height = scrollBar.end + SB_BUTTON_TOTAL_HEIGHT + SB_PADDING; - Drawable s; + int height = end + SB_BUTTON_TOTAL_HEIGHT + SB_PADDING; + Drawable src; - if ((scrollBar.init & R_SB_NEXT) == 0) { - scrollBar.init |= R_SB_NEXT; - init_scrollbar_stuff (); + if ((init & SB_STYLE_NEXT) == 0) + { + init |= SB_STYLE_NEXT; + init_next (); } - if (TermWin.nscrolled == 0 || !update) { - XFillRectangle(Xdisplay, scrollBar.win, grayGC, 0, 0, - SB_WIDTH_NEXT + 1, height); - XDrawRectangle(Xdisplay, scrollBar.win, blackGC, 0, - -SB_BORDER_WIDTH, SB_WIDTH_NEXT, - height + SB_BORDER_WIDTH); - XFillRectangle(Xdisplay, scrollBar.win, stippleGC, - SB_LEFT_PADDING, 0, SB_BUTTON_WIDTH, height); + if (term->top_row == 0 || !update) + { + XFillRectangle (term->dpy, win, grayGC, 0, 0, + SB_WIDTH_NEXT + 1, height); + XDrawRectangle (term->dpy, win, blackGC, 0, + -SB_BORDER_WIDTH, SB_WIDTH_NEXT, + height + SB_BORDER_WIDTH); + XFillRectangle (term->dpy, win, stippleGC, + SB_LEFT_PADDING, 0, SB_BUTTON_WIDTH, height); } - if (TermWin.nscrolled) { - if (last_top < scrollBar.top || !update) - XFillRectangle(Xdisplay, 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, - SB_LEFT_PADDING, scrollBar.bot + SB_PADDING, - SB_BUTTON_WIDTH, (last_bot - scrollBar.bot)); - XFillRectangle(Xdisplay, scrollBar.win, grayGC, - SB_LEFT_PADDING, scrollBar.top + SB_PADDING, - SB_BUTTON_WIDTH, scrollbar_len); - XCopyArea(Xdisplay, 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 + - (scrollbar_len - SCROLLER_DIMPLE_HEIGHT) / 2); - - drawBevel (scrollBar.win, SB_BUTTON_BEVEL_X, - scrollBar.top + SB_PADDING, SB_BUTTON_WIDTH, - scrollbar_len); - drawBevel (scrollBar.win, SB_BUTTON_BEVEL_X, - height - SB_BUTTON_BOTH_HEIGHT, SB_BUTTON_WIDTH, - SB_BUTTON_HEIGHT); - drawBevel (scrollBar.win, SB_BUTTON_BEVEL_X, - height - SB_BUTTON_SINGLE_HEIGHT, SB_BUTTON_WIDTH, - SB_BUTTON_HEIGHT); - - s = (scrollbar_isUp()) ? upArrowHi : upArrow; - XCopyArea(Xdisplay, 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, - ARROW_WIDTH, ARROW_HEIGHT, SB_BUTTON_FACE_X, - height - SB_BUTTON_SINGLE_HEIGHT + SB_BEVEL_WIDTH_UPPER_LEFT); + + if (term->top_row) + { + if (last_top < top || !update) + XFillRectangle (term->dpy, win, stippleGC, + SB_LEFT_PADDING, SB_PADDING + last_top, + SB_BUTTON_WIDTH, top - last_top); + + if (bot < last_bot || !update) + XFillRectangle (term->dpy, win, stippleGC, + SB_LEFT_PADDING, bot + SB_PADDING, + SB_BUTTON_WIDTH, (last_bot - bot)); + + XFillRectangle (term->dpy, win, grayGC, + SB_LEFT_PADDING, top + SB_PADDING, + SB_BUTTON_WIDTH, bot - top); + + XCopyArea (term->dpy, dimple, win, whiteGC, 0, 0, + SCROLLER_DIMPLE_WIDTH, SCROLLER_DIMPLE_HEIGHT, + (SB_WIDTH_NEXT - SCROLLER_DIMPLE_WIDTH) / 2, + top + SB_BEVEL_WIDTH_UPPER_LEFT + + (bot - top - SCROLLER_DIMPLE_HEIGHT) / 2); + + drawBevel (this, SB_BUTTON_BEVEL_X, + top + SB_PADDING, SB_BUTTON_WIDTH, + bot - top); + drawBevel (this, SB_BUTTON_BEVEL_X, + height - SB_BUTTON_BOTH_HEIGHT, SB_BUTTON_WIDTH, + SB_BUTTON_HEIGHT); + drawBevel (this, SB_BUTTON_BEVEL_X, + height - SB_BUTTON_SINGLE_HEIGHT, SB_BUTTON_WIDTH, + SB_BUTTON_HEIGHT); + + src = state == SB_STATE_UP ? upArrowHi : upArrow; + XCopyArea (term->dpy, src, win, whiteGC, 0, 0, + ARROW_WIDTH, ARROW_HEIGHT, SB_BUTTON_FACE_X, + height - SB_BUTTON_BOTH_HEIGHT + SB_BEVEL_WIDTH_UPPER_LEFT); + + src = state == SB_STATE_DOWN ? downArrowHi : downArrow; + XCopyArea (term->dpy, src, win, whiteGC, 0, 0, + ARROW_WIDTH, ARROW_HEIGHT, SB_BUTTON_FACE_X, + height - SB_BUTTON_SINGLE_HEIGHT + SB_BEVEL_WIDTH_UPPER_LEFT); } - return 1; + + return 1; } -#endif /* NEXT_SCROLLBAR */ +#endif /* NEXT_SCROLLBAR */ /*----------------------- end-of-file (C source) -----------------------*/