--- rxvt-unicode/src/scrollbar.C 2008/02/18 11:41:39 1.57 +++ rxvt-unicode/src/scrollbar.C 2011/08/28 19:04:23 1.72 @@ -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 @@ -31,111 +31,102 @@ /* * Map or unmap a scrollbar. Returns non-zero upon change of state */ -int -rxvt_term::scrollbar_mapping (int map) +void +scrollBar_t::map (int map) { - int change = 0; - if (map) { - scrollBar.state = STATE_IDLE; - - if (!scrollBar.win) - resize_scrollbar (); + state = STATE_IDLE; - if (scrollBar.win) - { - XMapWindow (dpy, scrollBar.win); - change = 1; - } + if (!win) + resize (); + else + XMapWindow (term->dpy, win); } else { - scrollBar.state = 0; - XUnmapWindow (dpy, scrollBar.win); - change = 1; - } + state = STATE_OFF; - return change; + if (win) + XUnmapWindow (term->dpy, win); + } } void -rxvt_term::resize_scrollbar () +scrollBar_t::resize () { int delayed_init = 0; int window_sb_x = 0; - if (option (Opt_scrollBar_right)) - window_sb_x = szHint.width - scrollBar.total_width (); + if (term->option (Opt_scrollBar_right)) + window_sb_x = term->szHint.width - total_width (); - scrollBar.update_data (); + update_data (); - if (!scrollBar.win) + if (!win) { /* create the scrollbar window */ - scrollBar.win = XCreateSimpleWindow (dpy, - parent[0], - window_sb_x, 0, - scrollBar.total_width (), - szHint.height, - 0, - pix_colors[Color_fg], - pix_colors[Color_border]); - XDefineCursor (dpy, scrollBar.win, scrollBar.leftptr_cursor); + win = XCreateSimpleWindow (term->dpy, + term->parent, + window_sb_x, 0, + total_width (), + term->szHint.height, + 0, + term->pix_colors[Color_fg], + term->pix_colors[Color_border]); + XDefineCursor (term->dpy, win, leftptr_cursor); - XSelectInput (dpy, scrollBar.win, + XSelectInput (term->dpy, win, ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask | Button2MotionMask | Button3MotionMask); - scrollbar_ev.start (display, scrollBar.win); + term->scrollbar_ev.start (term->display, win); delayed_init = 1; } else - XMoveResizeWindow (dpy, scrollBar.win, + XMoveResizeWindow (term->dpy, win, window_sb_x, 0, - scrollBar.total_width (), szHint.height); + total_width (), term->szHint.height); - scrollbar_show (1); + show (1); if (delayed_init) - XMapWindow (dpy, scrollBar.win); + XMapWindow (term->dpy, win); } /* * Update current scrollbar view w.r.t. slider heights, etc. */ int -rxvt_term::scrollbar_show (int update) +scrollBar_t::show (int refresh) { - int ret = 0; + int ret; - if (!scrollBar.state) + if (!state) return 0; - if (update) + if (refresh) { - int top = view_start - top_row; - int bot = top + (nrow - 1); - int len = max (nrow - 1 - top_row, 1); - int size = (bot - top) * scrollBar.size (); - - scrollBar.top = (scrollBar.beg + (top * scrollBar.size ()) / len); - scrollBar.len = size / len + scrollBar.min_height () + (size % len > 0); - scrollBar.bot = (scrollBar.top + scrollBar.len); + int sb_top = term->view_start - term->top_row; + int sb_bot = sb_top + (term->nrow - 1); + int sb_len = max (term->nrow - 1 - term->top_row, 1); + + top = beg + (sb_top * size ()) / sb_len; + bot = top + ecb_div_ru ((sb_bot - sb_top) * size (), sb_len) + min_height (); /* no change */ - if (scrollBar.top == scrollBar.last_top - && scrollBar.bot == scrollBar.last_bot - && (scrollBar.state == scrollBar.last_state - || !(scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN))) + if (top == last_top + && bot == last_bot + && (state == last_state + || !(state == STATE_UP || state == STATE_DOWN))) return 0; } - ret = (this->*scrollBar.update) (update, scrollBar.last_top, scrollBar.last_bot, scrollBar.len); + ret = (this->*update) (refresh); - scrollBar.last_top = scrollBar.top; - scrollBar.last_bot = scrollBar.bot; - scrollBar.last_state = scrollBar.state; + last_top = top; + last_bot = bot; + last_state = state; return ret; } @@ -144,7 +135,6 @@ scrollBar_t::setup (rxvt_term *term) { int i; - short style, width; const char *scrollalign, *scrollstyle, *thickness; this->term = term; @@ -200,9 +190,6 @@ shadow = SHADOW_WIDTH; # endif - this->style = style; - this->width = width; - /* align = R_SB_ALIGN_CENTRE; */ if (scrollalign) { @@ -211,12 +198,41 @@ else if (strncasecmp (scrollalign, "bottom", 6) == 0) align = R_SB_ALIGN_BOTTOM; } - last_bot = last_state = -1; + last_state = STATE_OFF; /* cursor scrollBar: Black-on-White */ leftptr_cursor = XCreateFontCursor (term->dpy, XC_left_ptr); } void +scrollBar_t::destroy () +{ +#ifdef XTERM_SCROLLBAR + if (xscrollbarGC) XFreeGC (term->dpy, xscrollbarGC); + if (ShadowGC) XFreeGC (term->dpy, ShadowGC); +#endif +#ifdef PLAIN_SCROLLBAR + if (pscrollbarGC) XFreeGC (term->dpy, pscrollbarGC); +#endif +#ifdef NEXT_SCROLLBAR + if (blackGC) XFreeGC (term->dpy, blackGC); + if (whiteGC) XFreeGC (term->dpy, whiteGC); + if (grayGC) XFreeGC (term->dpy, grayGC); + if (darkGC) XFreeGC (term->dpy, darkGC); + if (stippleGC) XFreeGC (term->dpy, stippleGC); + if (dimple) XFreePixmap (term->dpy, dimple); + if (upArrow) XFreePixmap (term->dpy, upArrow); + if (downArrow) XFreePixmap (term->dpy, downArrow); + if (upArrowHi) XFreePixmap (term->dpy, upArrowHi); + if (downArrowHi) XFreePixmap (term->dpy, downArrowHi); +#endif +#ifdef RXVT_SCROLLBAR + if (topShadowGC) XFreeGC (term->dpy, topShadowGC); + if (botShadowGC) XFreeGC (term->dpy, botShadowGC); + if (scrollbarGC) XFreeGC (term->dpy, scrollbarGC); +#endif +} + +void scrollBar_t::update_data () { #if defined(PLAIN_SCROLLBAR) @@ -224,7 +240,7 @@ { beg = 0; end = term->szHint.height; - update = &rxvt_term::scrollbar_show_plain; + update = &scrollBar_t::show_plain; } #endif #if defined(XTERM_SCROLLBAR) @@ -232,7 +248,7 @@ { beg = 0; end = term->szHint.height; - update = &rxvt_term::scrollbar_show_xterm; + update = &scrollBar_t::show_xterm; } #endif #if defined(NEXT_SCROLLBAR) @@ -240,7 +256,7 @@ { beg = 0; end = term->szHint.height - (SB_BUTTON_TOTAL_HEIGHT + SB_PADDING); - update = &rxvt_term::scrollbar_show_next; + update = &scrollBar_t::show_next; } #endif #if defined(RXVT_SCROLLBAR) @@ -248,7 +264,7 @@ { beg = (width + 1) + shadow; end = term->szHint.height - beg - (2 * shadow); - update = &rxvt_term::scrollbar_show_rxvt; + update = &scrollBar_t::show_rxvt; } #endif }