--- rxvt-unicode/src/scrollbar-next.C 2008/02/19 13:01:33 1.29 +++ rxvt-unicode/src/scrollbar-next.C 2011/09/01 08:11:27 1.32 @@ -6,7 +6,7 @@ * Copyright (c) 1998 Alfredo K. Kojima * - N*XTstep like scrollbars * Copyright (c) 1999-2001 Geoff Wing - * Copyright (c) 2004-2006 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 @@ -235,9 +235,9 @@ int height = end + SB_BUTTON_TOTAL_HEIGHT + SB_PADDING; Drawable src; - if ((init & R_SB_NEXT) == 0) + if ((init & SB_STYLE_NEXT) == 0) { - init |= R_SB_NEXT; + init |= SB_STYLE_NEXT; init_next (); } @@ -266,17 +266,17 @@ XFillRectangle (term->dpy, win, grayGC, SB_LEFT_PADDING, top + SB_PADDING, - SB_BUTTON_WIDTH, len); + 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 + - (len - SCROLLER_DIMPLE_HEIGHT) / 2); + (bot - top - SCROLLER_DIMPLE_HEIGHT) / 2); drawBevel (this, SB_BUTTON_BEVEL_X, top + SB_PADDING, SB_BUTTON_WIDTH, - len); + bot - top); drawBevel (this, SB_BUTTON_BEVEL_X, height - SB_BUTTON_BOTH_HEIGHT, SB_BUTTON_WIDTH, SB_BUTTON_HEIGHT); @@ -284,12 +284,12 @@ height - SB_BUTTON_SINGLE_HEIGHT, SB_BUTTON_WIDTH, SB_BUTTON_HEIGHT); - src = state == STATE_UP ? upArrowHi : upArrow; + 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 == STATE_DOWN ? downArrowHi : downArrow; + 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);