{
if (last_top < scrollBar.top)
XClearArea (dpy, scrollBar.win,
- scrollBar.sb_shadow, last_top,
+ scrollBar.shadow, last_top,
sbwidth + 1, scrollBar.top - last_top, False);
if (scrollBar.bot < last_bot)
XClearArea (dpy, scrollBar.win,
- scrollBar.sb_shadow, scrollBar.bot,
+ scrollBar.shadow, scrollBar.bot,
sbwidth + 1, last_bot - scrollBar.bot, False);
}
else
int
rxvt_term::scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len)
{
- int sbshadow = scrollBar.sb_shadow;
+ int sbshadow = scrollBar.shadow;
int sbwidth = (int)scrollBar.width;
if ((scrollBar.init & R_SB_RXVT) == 0)
{
if (last_top < scrollBar.top)
XClearArea (dpy, scrollBar.win,
- scrollBar.sb_shadow + xsb, last_top,
+ scrollBar.shadow + xsb, last_top,
sbwidth, (scrollBar.top - last_top), False);
if (scrollBar.bot < last_bot)
XClearArea (dpy, scrollBar.win,
- scrollBar.sb_shadow + xsb, scrollBar.bot,
+ scrollBar.shadow + xsb, scrollBar.bot,
sbwidth, (last_bot - scrollBar.bot), False);
}
else
#define R_SCROLLBEG_NEXT 0
#define R_SCROLLEND_NEXT szHint.height - (SB_BUTTON_TOTAL_HEIGHT + \
SB_PADDING)
-#define R_SCROLLBEG_RXVT (scrollBar.width + 1) + scrollBar.sb_shadow
+#define R_SCROLLBEG_RXVT (scrollBar.width + 1) + scrollBar.shadow
#define R_SCROLLEND_RXVT szHint.height - R_SCROLLBEG_RXVT - \
- (2 * scrollBar.sb_shadow)
+ (2 * scrollBar.shadow)
#if defined(PLAIN_SCROLLBAR)
if (scrollBar.style == R_SB_PLAIN)
# ifdef RXVT_SCROLLBAR
if (! option (Opt_scrollBar_floating) && style == R_SB_RXVT)
- scrollBar.sb_shadow = SHADOW_WIDTH;
+ scrollBar.shadow = SHADOW_WIDTH;
# endif
scrollBar.style = style;
unsigned int bot; /* slider bottom position */
unsigned int style; /* style: rxvt, xterm, next */
unsigned int width; /* scrollbar width */
- int sb_shadow; /* scrollbar shadow width */
+ int shadow; /* scrollbar shadow width */
Window win;
int (rxvt_term::*update)(int, int, int, int);
void setDn() { state = 'D'; }
} scrollBar_t;
-#define scrollbar_TotalWidth() (scrollBar.width + scrollBar.sb_shadow * 2)
+#define scrollbar_TotalWidth() (scrollBar.width + scrollBar.shadow * 2)
#define scrollbar_isMotion() (scrollBar.state == 'm')
#define scrollbar_isUp() (scrollBar.state == 'U')
#define scrollbar_isDn() (scrollBar.state == 'D')