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.39 by root, Tue May 1 21:30:01 2007 UTC vs.
Revision 1.44 by ayin, Mon Dec 31 01:05:51 2007 UTC

… …
70#define R_SCROLLBEG_XTERM 0 70#define R_SCROLLBEG_XTERM 0
71#define R_SCROLLEND_XTERM szHint.height 71#define R_SCROLLEND_XTERM szHint.height
72#define R_SCROLLBEG_NEXT 0 72#define R_SCROLLBEG_NEXT 0
73#define R_SCROLLEND_NEXT szHint.height - (SB_BUTTON_TOTAL_HEIGHT + \ 73#define R_SCROLLEND_NEXT szHint.height - (SB_BUTTON_TOTAL_HEIGHT + \
74 SB_PADDING) 74 SB_PADDING)
75#define R_SCROLLBEG_RXVT (scrollBar.width + 1) + sb_shadow 75#define R_SCROLLBEG_RXVT (scrollBar.width + 1) + scrollBar.shadow
76#define R_SCROLLEND_RXVT szHint.height - R_SCROLLBEG_RXVT - \ 76#define R_SCROLLEND_RXVT szHint.height - R_SCROLLBEG_RXVT - \
77 (2 * sb_shadow) 77 (2 * scrollBar.shadow)
78 78
79#if defined(PLAIN_SCROLLBAR) 79#if defined(PLAIN_SCROLLBAR)
80 if (scrollBar.style == R_SB_PLAIN) 80 if (scrollBar.style == R_SB_PLAIN)
81 { 81 {
82 scrollBar.beg = R_SCROLLBEG_XTERM; 82 scrollBar.beg = R_SCROLLBEG_XTERM;
… …
145rxvt_term::scrollbar_show (int update) 145rxvt_term::scrollbar_show (int update)
146{ 146{
147 int ret = 0; 147 int ret = 0;
148#ifdef HAVE_SCROLLBARS 148#ifdef HAVE_SCROLLBARS
149 int top, bot, len, adj; 149 int top, bot, len, adj;
150 int scrollbar_len = 0;
150 151
151 if (!scrollBar.state) 152 if (!scrollBar.state)
152 return 0; 153 return 0;
153 154
154 if (update) 155 if (update)
… …
161 scrollBar.top = (scrollBar.beg + (top * scrollbar_size ()) / len); 162 scrollBar.top = (scrollBar.beg + (top * scrollbar_size ()) / len);
162 scrollbar_len = ((bot - top) * scrollbar_size ()) / len + 163 scrollbar_len = ((bot - top) * scrollbar_size ()) / len +
163 scrollbar_minheight () + adj; 164 scrollbar_minheight () + adj;
164 scrollBar.bot = (scrollBar.top + scrollbar_len); 165 scrollBar.bot = (scrollBar.top + scrollbar_len);
165 /* no change */ 166 /* no change */
166 if (scrollBar.top == last_top 167 if (scrollBar.top == scrollBar.last_top
167 && scrollBar.bot == last_bot 168 && scrollBar.bot == scrollBar.last_bot
168 && (scrollBar.state == last_state || !scrollbar_isUpDn ())) 169 && (scrollBar.state == scrollBar.last_state || !scrollbar_isUpDn ()))
169 return 0; 170 return 0;
170 } 171 }
171 172
172 ret = (this->*scrollBar.update) (update, last_top, last_bot, scrollbar_len); 173 ret = (this->*scrollBar.update) (update, scrollBar.last_top, scrollBar.last_bot, scrollbar_len);
173 174
174 last_top = scrollBar.top; 175 scrollBar.last_top = scrollBar.top;
175 last_bot = scrollBar.bot; 176 scrollBar.last_bot = scrollBar.bot;
176 last_state = scrollBar.state; 177 scrollBar.last_state = scrollBar.state;
177#endif 178#endif
178 179
179 return ret; 180 return ret;
180} 181}
181 182
… …
229 if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM) 230 if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM)
230 width = min (i, SB_WIDTH_MAXIMUM); 231 width = min (i, SB_WIDTH_MAXIMUM);
231 232
232# ifdef RXVT_SCROLLBAR 233# ifdef RXVT_SCROLLBAR
233 if (! option (Opt_scrollBar_floating) && style == R_SB_RXVT) 234 if (! option (Opt_scrollBar_floating) && style == R_SB_RXVT)
234 sb_shadow = SHADOW_WIDTH; 235 scrollBar.shadow = SHADOW_WIDTH;
235# endif 236# endif
236 237
237 scrollBar.style = style; 238 scrollBar.style = style;
238 scrollBar.width = width; 239 scrollBar.width = width;
239 240
240 /* scrollbar_align = R_SB_ALIGN_CENTRE; */ 241 /* scrollBar.align = R_SB_ALIGN_CENTRE; */
241 if (scrollalign) 242 if (scrollalign)
242 { 243 {
243 if (strncasecmp (scrollalign, "top", 3) == 0) 244 if (strncasecmp (scrollalign, "top", 3) == 0)
244 scrollbar_align = R_SB_ALIGN_TOP; 245 scrollBar.align = R_SB_ALIGN_TOP;
245 else if (strncasecmp (scrollalign, "bottom", 6) == 0) 246 else if (strncasecmp (scrollalign, "bottom", 6) == 0)
246 scrollbar_align = R_SB_ALIGN_BOTTOM; 247 scrollBar.align = R_SB_ALIGN_BOTTOM;
247 } 248 }
249 scrollBar.last_bot = scrollBar.last_state = -1;
248#endif 250#endif
249} 251}
250 252
251/*----------------------- end-of-file (C source) -----------------------*/ 253/*----------------------- end-of-file (C source) -----------------------*/
252 254

Diff Legend

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