ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/scrollbar.C
(Generate patch)

Comparing rxvt-unicode/src/scrollbar.C (file contents):
Revision 1.60 by ayin, Tue Feb 19 10:47:03 2008 UTC vs.
Revision 1.64 by root, Mon Feb 21 07:41:04 2011 UTC

… …
4 * 4 *
5 * Copyright (c) 1997,1998 mj olesen <olesen@me.QueensU.CA> 5 * Copyright (c) 1997,1998 mj olesen <olesen@me.QueensU.CA>
6 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 6 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
7 * - N*XTstep like scrollbars 7 * - N*XTstep like scrollbars
8 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com> 8 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com>
9 * Copyright (c) 2004-2006 Marc Lehmann <pcg@goof.com> 9 * Copyright (c) 2004-2006 Marc Lehmann <schmorp@schmorp.de>
10 * 10 *
11 * This program is free software; you can redistribute it and/or modify 11 * This program is free software; you can redistribute it and/or modify
12 * it under the terms of the GNU General Public License as published by 12 * it under the terms of the GNU General Public License as published by
13 * the Free Software Foundation; either version 2 of the License, or 13 * the Free Software Foundation; either version 2 of the License, or
14 * (at your option) any later version. 14 * (at your option) any later version.
… …
119 int sb_bot = sb_top + (term->nrow - 1); 119 int sb_bot = sb_top + (term->nrow - 1);
120 int sb_len = max (term->nrow - 1 - term->top_row, 1); 120 int sb_len = max (term->nrow - 1 - term->top_row, 1);
121 int sb_size = (sb_bot - sb_top) * size (); 121 int sb_size = (sb_bot - sb_top) * size ();
122 122
123 top = beg + (sb_top * size ()) / sb_len; 123 top = beg + (sb_top * size ()) / sb_len;
124 len = sb_size / sb_len + min_height () + (sb_size % sb_len > 0); 124 bot = top + sb_size / sb_len + min_height () + (sb_size % sb_len > 0);
125 bot = top + len;
126 /* no change */ 125 /* no change */
127 if (top == last_top 126 if (top == last_top
128 && bot == last_bot 127 && bot == last_bot
129 && (state == last_state 128 && (state == last_state
130 || !(state == STATE_UP || state == STATE_DOWN))) 129 || !(state == STATE_UP || state == STATE_DOWN)))
131 return 0; 130 return 0;
132 } 131 }
133 132
134 ret = (term->*update) (refresh, last_top, last_bot, len); 133 ret = (this->*update) (refresh);
135 134
136 last_top = top; 135 last_top = top;
137 last_bot = bot; 136 last_bot = bot;
138 last_state = state; 137 last_state = state;
139 138
… …
193 192
194 if (style != R_SB_NEXT) /* dishonour request - for now */ 193 if (style != R_SB_NEXT) /* dishonour request - for now */
195 if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM) 194 if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM)
196 width = min (i, SB_WIDTH_MAXIMUM); 195 width = min (i, SB_WIDTH_MAXIMUM);
197 196
198# ifdef RXVT_SCROLLBAR
199 if (! term->option (Opt_scrollBar_floating) && style == R_SB_RXVT)
200 shadow = SHADOW_WIDTH;
201# endif
202
203 this->style = style; 197 this->style = style;
204 this->width = width; 198 this->width = width;
205 199
206 /* align = R_SB_ALIGN_CENTRE; */ 200 /* align = R_SB_ALIGN_CENTRE; */
207 if (scrollalign) 201 if (scrollalign)
… …
215 /* cursor scrollBar: Black-on-White */ 209 /* cursor scrollBar: Black-on-White */
216 leftptr_cursor = XCreateFontCursor (term->dpy, XC_left_ptr); 210 leftptr_cursor = XCreateFontCursor (term->dpy, XC_left_ptr);
217} 211}
218 212
219void 213void
214scrollBar_t::destroy ()
215{
216#ifdef XTERM_SCROLLBAR
217 if (xscrollbarGC) XFreeGC (term->dpy, xscrollbarGC);
218 if (ShadowGC) XFreeGC (term->dpy, ShadowGC);
219#endif
220#ifdef PLAIN_SCROLLBAR
221 if (pscrollbarGC) XFreeGC (term->dpy, pscrollbarGC);
222#endif
223#ifdef NEXT_SCROLLBAR
224 if (blackGC) XFreeGC (term->dpy, blackGC);
225 if (whiteGC) XFreeGC (term->dpy, whiteGC);
226 if (grayGC) XFreeGC (term->dpy, grayGC);
227 if (darkGC) XFreeGC (term->dpy, darkGC);
228 if (stippleGC) XFreeGC (term->dpy, stippleGC);
229 if (dimple) XFreePixmap (term->dpy, dimple);
230 if (upArrow) XFreePixmap (term->dpy, upArrow);
231 if (downArrow) XFreePixmap (term->dpy, downArrow);
232 if (upArrowHi) XFreePixmap (term->dpy, upArrowHi);
233 if (downArrowHi) XFreePixmap (term->dpy, downArrowHi);
234#endif
235#ifdef RXVT_SCROLLBAR
236 if (topShadowGC) XFreeGC (term->dpy, topShadowGC);
237 if (botShadowGC) XFreeGC (term->dpy, botShadowGC);
238 if (scrollbarGC) XFreeGC (term->dpy, scrollbarGC);
239#endif
240}
241
242void
220scrollBar_t::update_data () 243scrollBar_t::update_data ()
221{ 244{
222#if defined(PLAIN_SCROLLBAR) 245#if defined(PLAIN_SCROLLBAR)
223 if (style == R_SB_PLAIN) 246 if (style == R_SB_PLAIN)
224 { 247 {
225 beg = 0; 248 beg = 0;
226 end = term->szHint.height; 249 end = term->szHint.height;
227 update = &rxvt_term::scrollbar_show_plain; 250 update = &scrollBar_t::show_plain;
228 } 251 }
229#endif 252#endif
230#if defined(XTERM_SCROLLBAR) 253#if defined(XTERM_SCROLLBAR)
231 if (style == R_SB_XTERM) 254 if (style == R_SB_XTERM)
232 { 255 {
233 beg = 0; 256 beg = 0;
234 end = term->szHint.height; 257 end = term->szHint.height;
235 update = &rxvt_term::scrollbar_show_xterm; 258 update = &scrollBar_t::show_xterm;
236 } 259 }
237#endif 260#endif
238#if defined(NEXT_SCROLLBAR) 261#if defined(NEXT_SCROLLBAR)
239 if (style == R_SB_NEXT) 262 if (style == R_SB_NEXT)
240 { 263 {
241 beg = 0; 264 beg = 0;
242 end = term->szHint.height - (SB_BUTTON_TOTAL_HEIGHT + SB_PADDING); 265 end = term->szHint.height - (SB_BUTTON_TOTAL_HEIGHT + SB_PADDING);
243 update = &rxvt_term::scrollbar_show_next; 266 update = &scrollBar_t::show_next;
244 } 267 }
245#endif 268#endif
246#if defined(RXVT_SCROLLBAR) 269#if defined(RXVT_SCROLLBAR)
247 if (style == R_SB_RXVT) 270 if (style == R_SB_RXVT)
248 { 271 {
249 beg = (width + 1) + shadow; 272 beg = (width + 1) + shadow;
250 end = term->szHint.height - beg - (2 * shadow); 273 end = term->szHint.height - beg - (2 * shadow);
251 update = &rxvt_term::scrollbar_show_rxvt; 274 update = &scrollBar_t::show_rxvt;
252 } 275 }
253#endif 276#endif
254} 277}
255 278
256/*----------------------- end-of-file (C source) -----------------------*/ 279/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines