… | |
… | |
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; |
150 | |
151 | |
151 | if (!scrollBar.state) |
152 | if (!scrollBar.state) |
152 | return 0; |
153 | return 0; |
153 | |
154 | |
154 | if (update) |
155 | if (update) |
… | |
… | |
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 | scrollBar.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 | } |
248 | #endif |
249 | #endif |
249 | } |
250 | } |
250 | |
251 | |
251 | /*----------------------- end-of-file (C source) -----------------------*/ |
252 | /*----------------------- end-of-file (C source) -----------------------*/ |