--- rxvt-unicode/src/scrollbar.C 2006/01/16 15:12:48 1.32 +++ rxvt-unicode/src/scrollbar.C 2008/02/17 12:21:45 1.54 @@ -1,4 +1,4 @@ -/*--------------------------------*-C-*---------------------------------* +/*----------------------------------------------------------------------* * File: scrollbar.C *----------------------------------------------------------------------* * @@ -6,7 +6,7 @@ * Copyright (c) 1998 Alfredo K. Kojima * - N*XTstep like scrollbars * Copyright (c) 1999-2001 Geoff Wing - * Copyright (c) 2004 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 @@ -34,36 +34,34 @@ int rxvt_term::scrollbar_mapping (int map) { - int change = 0; + int change = 0; -#ifdef HAVE_SCROLLBARS if (map) { - scrollBar.setIdle (); + scrollBar.state = STATE_IDLE; if (!scrollBar.win) resize_scrollbar (); if (scrollBar.win) { - XMapWindow (display->display, scrollBar.win); + XMapWindow (dpy, scrollBar.win); change = 1; } } else { scrollBar.state = 0; - XUnmapWindow (display->display, scrollBar.win); + XUnmapWindow (dpy, scrollBar.win); change = 1; } -#endif + return change; } void rxvt_term::resize_scrollbar () { -#ifdef HAVE_SCROLLBARS int delayed_init = 0; #define R_SCROLLBEG_XTERM 0 @@ -71,9 +69,9 @@ #define R_SCROLLBEG_NEXT 0 #define R_SCROLLEND_NEXT szHint.height - (SB_BUTTON_TOTAL_HEIGHT + \ SB_PADDING) -#define R_SCROLLBEG_RXVT (scrollBar.width + 1) + sb_shadow +#define R_SCROLLBEG_RXVT (scrollBar.width + 1) + scrollBar.shadow #define R_SCROLLEND_RXVT szHint.height - R_SCROLLBEG_RXVT - \ - (2 * sb_shadow) + (2 * scrollBar.shadow) #if defined(PLAIN_SCROLLBAR) if (scrollBar.style == R_SB_PLAIN) @@ -111,20 +109,17 @@ if (!scrollBar.win) { /* create the scrollbar window */ - scrollBar.win = XCreateSimpleWindow (display->display, + scrollBar.win = XCreateSimpleWindow (dpy, parent[0], window_sb_x, 0, - scrollbar_TotalWidth (), + scrollBar.total_width (), szHint.height, 0, pix_colors[Color_fg], pix_colors[Color_border]); -#ifdef DEBUG_X - XStoreName (display->display, scrollBar.win, "scrollbar"); -#endif - XDefineCursor (display->display, scrollBar.win, leftptr_cursor); + XDefineCursor (dpy, scrollBar.win, scrollBar.leftptr_cursor); - XSelectInput (display->display, scrollBar.win, + XSelectInput (dpy, scrollBar.win, ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask | Button2MotionMask | Button3MotionMask); @@ -136,8 +131,7 @@ scrollbar_show (1); if (delayed_init) - XMapWindow (display->display, scrollBar.win); -#endif + XMapWindow (dpy, scrollBar.win); } /* @@ -147,46 +141,49 @@ rxvt_term::scrollbar_show (int update) { int ret = 0; -#ifdef HAVE_SCROLLBARS - int top, bot, len, adj; if (!scrollBar.state) return 0; if (update) { - top = view_start - top_row; - bot = top + (nrow - 1); - len = max (nrow - 1 - top_row, 1); - 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_minheight () + adj; - scrollBar.bot = (scrollBar.top + scrollbar_len); + int top = view_start - top_row; + int bot = top + (nrow - 1); + int len = max (nrow - 1 - top_row, 1); + int 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.min_height () + adj; + scrollBar.bot = (scrollBar.top + scrollBar.len); /* no change */ - if (scrollBar.top == last_top - && scrollBar.bot == last_bot - && (scrollBar.state == last_state || !scrollbar_isUpDn ())) + if (scrollBar.top == scrollBar.last_top + && scrollBar.bot == scrollBar.last_bot + && (scrollBar.state == scrollBar.last_state + || !(scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN))) return 0; } - ret = (this->*scrollBar.update) (update, last_top, last_bot, scrollbar_len); + ret = (this->*scrollBar.update) (update, scrollBar.last_top, scrollBar.last_bot, scrollBar.len); - last_top = scrollBar.top; - last_bot = scrollBar.bot; - last_state = scrollBar.state; -#endif + scrollBar.last_top = scrollBar.top; + scrollBar.last_bot = scrollBar.bot; + scrollBar.last_state = scrollBar.state; return ret; } void -rxvt_term::setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness) +scrollBar_t::setup (rxvt_term *term) { -#ifdef HAVE_SCROLLBARS int i; short style, width; + const char *scrollalign, *scrollstyle, *thickness; + + this->term = term; + scrollalign = term->rs[Rs_scrollBar_align]; + scrollstyle = term->rs[Rs_scrollstyle]; + thickness = term->rs[Rs_scrollBar_thickness]; # if defined(RXVT_SCROLLBAR) style = R_SB_RXVT; @@ -232,22 +229,24 @@ width = min (i, SB_WIDTH_MAXIMUM); # ifdef RXVT_SCROLLBAR - if (! OPTION (Opt_scrollBar_floating) && style == R_SB_RXVT) - sb_shadow = 2; + if (! term->option (Opt_scrollBar_floating) && style == R_SB_RXVT) + shadow = SHADOW_WIDTH; # endif - scrollBar.style = style; - scrollBar.width = width; + this->style = style; + this->width = width; - /* scrollbar_align = R_SB_ALIGN_CENTRE; */ + /* align = R_SB_ALIGN_CENTRE; */ if (scrollalign) { if (strncasecmp (scrollalign, "top", 3) == 0) - scrollbar_align = R_SB_ALIGN_TOP; + align = R_SB_ALIGN_TOP; else if (strncasecmp (scrollalign, "bottom", 6) == 0) - scrollbar_align = R_SB_ALIGN_BOTTOM; + align = R_SB_ALIGN_BOTTOM; } -#endif + last_bot = last_state = -1; + /* cursor scrollBar: Black-on-White */ + leftptr_cursor = XCreateFontCursor (term->dpy, XC_left_ptr); } /*----------------------- end-of-file (C source) -----------------------*/