--- rxvt-unicode/src/scrollbar.C 2004/02/01 01:34:41 1.12 +++ rxvt-unicode/src/scrollbar.C 2008/02/19 17:49:16 1.62 @@ -1,11 +1,12 @@ -/*--------------------------------*-C-*---------------------------------* - * File: scrollbar.c +/*----------------------------------------------------------------------* + * File: scrollbar.C *----------------------------------------------------------------------* * * Copyright (c) 1997,1998 mj olesen * Copyright (c) 1998 Alfredo K. Kojima * - N*XTstep like scrollbars * Copyright (c) 1999-2001 Geoff Wing + * 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 @@ -24,7 +25,6 @@ #include "../config.h" /* NECESSARY */ #include "rxvt.h" /* NECESSARY */ -#include "scrollbar.intpro" /* PROTOS for internal routines */ /*----------------------------------------------------------------------*/ @@ -32,154 +32,124 @@ * Map or unmap a scrollbar. Returns non-zero upon change of state */ int -rxvt_term::scrollbar_mapping (int map) +scrollBar_t::map (int map) { - int change = 0; + int change = 0; -#ifdef HAVE_SCROLLBARS - if (map && !scrollbar_visible()) + if (map) { - scrollBar.setIdle (); - if (!scrollBar.win) - resize_scrollbar (); - if (scrollBar.win) + state = STATE_IDLE; + + if (!win) + resize (); + + if (win) { - XMapWindow(Xdisplay, scrollBar.win); + XMapWindow (term->dpy, win); change = 1; } } - else if (!map && scrollbar_visible()) + else { - scrollBar.state = 0; - XUnmapWindow(Xdisplay, scrollBar.win); + state = 0; + XUnmapWindow (term->dpy, win); change = 1; } -#endif + return change; } void -rxvt_term::resize_scrollbar () +scrollBar_t::resize () { -#ifdef HAVE_SCROLLBARS int delayed_init = 0; + int window_sb_x = 0; -#define R_SCROLLBEG_XTERM 0 -#define R_SCROLLEND_XTERM szHint.height -#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_SCROLLEND_RXVT szHint.height - R_SCROLLBEG_RXVT - \ - (2 * sb_shadow) + if (term->option (Opt_scrollBar_right)) + window_sb_x = term->szHint.width - total_width (); -#if defined(PLAIN_SCROLLBAR) - if (scrollBar.style == R_SB_PLAIN) - { - scrollBar.beg = R_SCROLLBEG_XTERM; - scrollBar.end = R_SCROLLEND_XTERM; - scrollBar.update = &rxvt_term::scrollbar_show_plain; - } -#endif -#if defined(XTERM_SCROLLBAR) - if (scrollBar.style == R_SB_XTERM) - { - scrollBar.beg = R_SCROLLBEG_XTERM; - scrollBar.end = R_SCROLLEND_XTERM; - scrollBar.update = &rxvt_term::scrollbar_show_xterm; - } -#endif -#if defined(NEXT_SCROLLBAR) - if (scrollBar.style == R_SB_NEXT) - { - scrollBar.beg = R_SCROLLBEG_NEXT; - scrollBar.end = R_SCROLLEND_NEXT; - scrollBar.update = &rxvt_term::scrollbar_show_next; - } -#endif -#if defined(RXVT_SCROLLBAR) - if (scrollBar.style == R_SB_RXVT) - { - scrollBar.beg = R_SCROLLBEG_RXVT; - scrollBar.end = R_SCROLLEND_RXVT; - scrollBar.update = &rxvt_term::scrollbar_show_rxvt; - } -#endif + update_data (); - if (!scrollBar.win) + if (!win) { /* create the scrollbar window */ - scrollBar.win = XCreateSimpleWindow(Xdisplay, - TermWin.parent[0], - window_sb_x, 0, - scrollbar_TotalWidth(), - szHint.height, - 0, - PixColors[Color_fg], - PixColors[Color_bg]); -#ifdef DEBUG_X - XStoreName(Xdisplay, scrollBar.win, "scrollbar"); -#endif - XDefineCursor(Xdisplay, scrollBar.win, leftptr_cursor); - XSelectInput(Xdisplay, scrollBar.win, - (ExposureMask | ButtonPressMask | ButtonReleaseMask - | Button1MotionMask | Button2MotionMask - | Button3MotionMask)); + win = XCreateSimpleWindow (term->dpy, + term->parent[0], + 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 (term->dpy, win, + ExposureMask | ButtonPressMask | ButtonReleaseMask + | Button1MotionMask | Button2MotionMask + | Button3MotionMask); + term->scrollbar_ev.start (term->display, win); + delayed_init = 1; } - scrollbar_show (1); + else + XMoveResizeWindow (term->dpy, win, + window_sb_x, 0, + total_width (), term->szHint.height); + + show (1); + if (delayed_init) - XMapWindow (Xdisplay, scrollBar.win); -#endif + 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; -#ifdef HAVE_SCROLLBARS - int top, bot, len, adj; + int ret; - if (!scrollbar_visible()) + if (!state) return 0; - if (update) + if (refresh) { - top = (TermWin.nscrolled - TermWin.view_start); - bot = top + (TermWin.nrow - 1); - len = max((TermWin.nscrolled + (TermWin.nrow - 1)), 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 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); + int sb_size = (sb_bot - sb_top) * size (); + + top = beg + (sb_top * size ()) / sb_len; + bot = top + sb_size / sb_len + min_height () + (sb_size % sb_len > 0); /* no change */ - if (scrollBar.top == last_top - && scrollBar.bot == last_bot - && (scrollBar.state == last_state || !scrollbar_isUpDn())) + if (top == last_top + && bot == last_bot + && (state == last_state + || !(state == STATE_UP || state == STATE_DOWN))) return 0; } - ret = (this->*scrollBar.update) (update, last_top, last_bot, scrollbar_len); + ret = (this->*update) (refresh); - last_top = scrollBar.top; - last_bot = scrollBar.bot; - last_state = scrollBar.state; -#endif + last_top = top; + last_bot = bot; + last_state = 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; @@ -197,15 +167,15 @@ if (scrollstyle) { # ifdef NEXT_SCROLLBAR - if (STRNCASECMP(scrollstyle, "next", 4) == 0) + if (strncasecmp (scrollstyle, "next", 4) == 0) style = R_SB_NEXT; # endif # ifdef XTERM_SCROLLBAR - if (STRNCASECMP(scrollstyle, "xterm", 5) == 0) + if (strncasecmp (scrollstyle, "xterm", 5) == 0) style = R_SB_XTERM; # endif # ifdef PLAIN_SCROLLBAR - if (STRNCASECMP(scrollstyle, "plain", 5) == 0) + if (strncasecmp (scrollstyle, "plain", 5) == 0) style = R_SB_PLAIN; # endif @@ -221,24 +191,92 @@ width = SB_WIDTH_RXVT; if (style != R_SB_NEXT) /* dishonour request - for now */ - if (thickness && (i = atoi(thickness)) >= SB_WIDTH_MINIMUM) - width = min(i, SB_WIDTH_MAXIMUM); + if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM) + width = min (i, SB_WIDTH_MAXIMUM); -# if defined(RXVT_SCROLLBAR) - if (!(Options & Opt_scrollBar_floating) && style == R_SB_RXVT) - sb_shadow = SHADOW; +# ifdef RXVT_SCROLLBAR + 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; - else if (STRNCASECMP(scrollalign, "bottom", 6) == 0) - scrollbar_align = R_SB_ALIGN_BOTTOM; + if (strncasecmp (scrollalign, "top", 3) == 0) + align = R_SB_ALIGN_TOP; + else if (strncasecmp (scrollalign, "bottom", 6) == 0) + align = R_SB_ALIGN_BOTTOM; + } + last_bot = last_state = -1; + /* 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) + if (style == R_SB_PLAIN) + { + beg = 0; + end = term->szHint.height; + update = &scrollBar_t::show_plain; + } +#endif +#if defined(XTERM_SCROLLBAR) + if (style == R_SB_XTERM) + { + beg = 0; + end = term->szHint.height; + update = &scrollBar_t::show_xterm; + } +#endif +#if defined(NEXT_SCROLLBAR) + if (style == R_SB_NEXT) + { + beg = 0; + end = term->szHint.height - (SB_BUTTON_TOTAL_HEIGHT + SB_PADDING); + update = &scrollBar_t::show_next; + } +#endif +#if defined(RXVT_SCROLLBAR) + if (style == R_SB_RXVT) + { + beg = (width + 1) + shadow; + end = term->szHint.height - beg - (2 * shadow); + update = &scrollBar_t::show_rxvt; } #endif }