… | |
… | |
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) + scrollBar.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 * scrollBar.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; |
… | |
… | |
145 | rxvt_term::scrollbar_show (int update) |
145 | rxvt_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; |
|
|
151 | |
150 | |
152 | if (!scrollBar.state) |
151 | if (!scrollBar.state) |
153 | return 0; |
152 | return 0; |
154 | |
153 | |
155 | if (update) |
154 | if (update) |
… | |
… | |
158 | bot = top + (nrow - 1); |
157 | bot = top + (nrow - 1); |
159 | len = max (nrow - 1 - top_row, 1); |
158 | len = max (nrow - 1 - top_row, 1); |
160 | adj = (((bot - top) * scrollbar_size ()) % len) > 0 ? 1 : 0; |
159 | adj = (((bot - top) * scrollbar_size ()) % len) > 0 ? 1 : 0; |
161 | |
160 | |
162 | scrollBar.top = (scrollBar.beg + (top * scrollbar_size ()) / len); |
161 | scrollBar.top = (scrollBar.beg + (top * scrollbar_size ()) / len); |
163 | scrollbar_len = ((bot - top) * scrollbar_size ()) / len + |
162 | scrollBar.len = ((bot - top) * scrollbar_size ()) / len + |
164 | scrollbar_minheight () + adj; |
163 | scrollbar_minheight () + adj; |
165 | scrollBar.bot = (scrollBar.top + scrollbar_len); |
164 | scrollBar.bot = (scrollBar.top + scrollBar.len); |
166 | /* no change */ |
165 | /* no change */ |
167 | if (scrollBar.top == last_top |
166 | if (scrollBar.top == scrollBar.last_top |
168 | && scrollBar.bot == last_bot |
167 | && scrollBar.bot == scrollBar.last_bot |
169 | && (scrollBar.state == last_state || !scrollbar_isUpDn ())) |
168 | && (scrollBar.state == scrollBar.last_state || !scrollbar_isUpDn ())) |
170 | return 0; |
169 | return 0; |
171 | } |
170 | } |
172 | |
171 | |
173 | ret = (this->*scrollBar.update) (update, last_top, last_bot, scrollbar_len); |
172 | ret = (this->*scrollBar.update) (update, scrollBar.last_top, scrollBar.last_bot, scrollBar.len); |
174 | |
173 | |
175 | last_top = scrollBar.top; |
174 | scrollBar.last_top = scrollBar.top; |
176 | last_bot = scrollBar.bot; |
175 | scrollBar.last_bot = scrollBar.bot; |
177 | last_state = scrollBar.state; |
176 | scrollBar.last_state = scrollBar.state; |
178 | #endif |
177 | #endif |
179 | |
178 | |
180 | return ret; |
179 | return ret; |
181 | } |
180 | } |
182 | |
181 | |
… | |
… | |
230 | if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM) |
229 | if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM) |
231 | width = min (i, SB_WIDTH_MAXIMUM); |
230 | width = min (i, SB_WIDTH_MAXIMUM); |
232 | |
231 | |
233 | # ifdef RXVT_SCROLLBAR |
232 | # ifdef RXVT_SCROLLBAR |
234 | if (! option (Opt_scrollBar_floating) && style == R_SB_RXVT) |
233 | if (! option (Opt_scrollBar_floating) && style == R_SB_RXVT) |
235 | scrollBar.sb_shadow = SHADOW_WIDTH; |
234 | scrollBar.shadow = SHADOW_WIDTH; |
236 | # endif |
235 | # endif |
237 | |
236 | |
238 | scrollBar.style = style; |
237 | scrollBar.style = style; |
239 | scrollBar.width = width; |
238 | scrollBar.width = width; |
240 | |
239 | |
241 | /* scrollbar_align = R_SB_ALIGN_CENTRE; */ |
240 | /* scrollBar.align = R_SB_ALIGN_CENTRE; */ |
242 | if (scrollalign) |
241 | if (scrollalign) |
243 | { |
242 | { |
244 | if (strncasecmp (scrollalign, "top", 3) == 0) |
243 | if (strncasecmp (scrollalign, "top", 3) == 0) |
245 | scrollbar_align = R_SB_ALIGN_TOP; |
244 | scrollBar.align = R_SB_ALIGN_TOP; |
246 | else if (strncasecmp (scrollalign, "bottom", 6) == 0) |
245 | else if (strncasecmp (scrollalign, "bottom", 6) == 0) |
247 | scrollbar_align = R_SB_ALIGN_BOTTOM; |
246 | scrollBar.align = R_SB_ALIGN_BOTTOM; |
248 | } |
247 | } |
|
|
248 | scrollBar.last_bot = scrollBar.last_state = -1; |
249 | #endif |
249 | #endif |
250 | } |
250 | } |
251 | |
251 | |
252 | /*----------------------- end-of-file (C source) -----------------------*/ |
252 | /*----------------------- end-of-file (C source) -----------------------*/ |
253 | |
253 | |