--- rxvt-unicode/src/scrollbar.C 2007/12/31 01:05:51 1.44 +++ rxvt-unicode/src/scrollbar.C 2008/01/04 17:57:28 1.47 @@ -120,7 +120,7 @@ 0, pix_colors[Color_fg], pix_colors[Color_border]); - XDefineCursor (dpy, scrollBar.win, leftptr_cursor); + XDefineCursor (dpy, scrollBar.win, scrollBar.leftptr_cursor); XSelectInput (dpy, scrollBar.win, ExposureMask | ButtonPressMask | ButtonReleaseMask @@ -147,7 +147,6 @@ int ret = 0; #ifdef HAVE_SCROLLBARS int top, bot, len, adj; - int scrollbar_len = 0; if (!scrollBar.state) return 0; @@ -160,9 +159,9 @@ adj = (((bot - top) * scrollbar_size ()) % len) > 0 ? 1 : 0; scrollBar.top = (scrollBar.beg + (top * scrollbar_size ()) / len); - scrollbar_len = ((bot - top) * scrollbar_size ()) / len + + scrollBar.len = ((bot - top) * scrollbar_size ()) / len + scrollbar_minheight () + adj; - scrollBar.bot = (scrollBar.top + scrollbar_len); + scrollBar.bot = (scrollBar.top + scrollBar.len); /* no change */ if (scrollBar.top == scrollBar.last_top && scrollBar.bot == scrollBar.last_bot @@ -170,7 +169,7 @@ return 0; } - ret = (this->*scrollBar.update) (update, scrollBar.last_top, scrollBar.last_bot, scrollbar_len); + ret = (this->*scrollBar.update) (update, scrollBar.last_top, scrollBar.last_bot, scrollBar.len); scrollBar.last_top = scrollBar.top; scrollBar.last_bot = scrollBar.bot; @@ -247,6 +246,8 @@ scrollBar.align = R_SB_ALIGN_BOTTOM; } scrollBar.last_bot = scrollBar.last_state = -1; + /* cursor scrollBar: Black-on-White */ + scrollBar.leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr); #endif }