| … | |
… | |
| 110 | { |
110 | { |
| 111 | /* create the scrollbar window */ |
111 | /* create the scrollbar window */ |
| 112 | scrollBar.win = XCreateSimpleWindow (dpy, |
112 | scrollBar.win = XCreateSimpleWindow (dpy, |
| 113 | parent[0], |
113 | parent[0], |
| 114 | window_sb_x, 0, |
114 | window_sb_x, 0, |
| 115 | scrollbar_TotalWidth (), |
115 | scrollBar.total_width (), |
| 116 | szHint.height, |
116 | szHint.height, |
| 117 | 0, |
117 | 0, |
| 118 | pix_colors[Color_fg], |
118 | pix_colors[Color_fg], |
| 119 | pix_colors[Color_border]); |
119 | pix_colors[Color_border]); |
| 120 | XDefineCursor (dpy, scrollBar.win, scrollBar.leftptr_cursor); |
120 | XDefineCursor (dpy, scrollBar.win, scrollBar.leftptr_cursor); |
| … | |
… | |
| 139 | */ |
139 | */ |
| 140 | int |
140 | int |
| 141 | rxvt_term::scrollbar_show (int update) |
141 | rxvt_term::scrollbar_show (int update) |
| 142 | { |
142 | { |
| 143 | int ret = 0; |
143 | int ret = 0; |
| 144 | int top, bot, len, adj; |
|
|
| 145 | |
144 | |
| 146 | if (!scrollBar.state) |
145 | if (!scrollBar.state) |
| 147 | return 0; |
146 | return 0; |
| 148 | |
147 | |
| 149 | if (update) |
148 | if (update) |
| 150 | { |
149 | { |
| 151 | top = view_start - top_row; |
150 | int top = view_start - top_row; |
| 152 | bot = top + (nrow - 1); |
151 | int bot = top + (nrow - 1); |
| 153 | len = max (nrow - 1 - top_row, 1); |
152 | int len = max (nrow - 1 - top_row, 1); |
| 154 | adj = (((bot - top) * scrollbar_size ()) % len) > 0 ? 1 : 0; |
153 | int adj = (((bot - top) * scrollBar.size ()) % len) > 0 ? 1 : 0; |
| 155 | |
154 | |
| 156 | scrollBar.top = (scrollBar.beg + (top * scrollbar_size ()) / len); |
155 | scrollBar.top = (scrollBar.beg + (top * scrollBar.size ()) / len); |
| 157 | scrollBar.len = ((bot - top) * scrollbar_size ()) / len + |
156 | scrollBar.len = ((bot - top) * scrollBar.size ()) / len + |
| 158 | scrollbar_minheight () + adj; |
157 | scrollBar.min_height () + adj; |
| 159 | scrollBar.bot = (scrollBar.top + scrollBar.len); |
158 | scrollBar.bot = (scrollBar.top + scrollBar.len); |
| 160 | /* no change */ |
159 | /* no change */ |
| 161 | if (scrollBar.top == scrollBar.last_top |
160 | if (scrollBar.top == scrollBar.last_top |
| 162 | && scrollBar.bot == scrollBar.last_bot |
161 | && scrollBar.bot == scrollBar.last_bot |
| 163 | && (scrollBar.state == scrollBar.last_state |
162 | && (scrollBar.state == scrollBar.last_state |
| … | |
… | |
| 229 | if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM) |
228 | if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM) |
| 230 | width = min (i, SB_WIDTH_MAXIMUM); |
229 | width = min (i, SB_WIDTH_MAXIMUM); |
| 231 | |
230 | |
| 232 | # ifdef RXVT_SCROLLBAR |
231 | # ifdef RXVT_SCROLLBAR |
| 233 | if (! term->option (Opt_scrollBar_floating) && style == R_SB_RXVT) |
232 | if (! term->option (Opt_scrollBar_floating) && style == R_SB_RXVT) |
| 234 | scrollBar.shadow = SHADOW_WIDTH; |
233 | shadow = SHADOW_WIDTH; |
| 235 | # endif |
234 | # endif |
| 236 | |
235 | |
| 237 | this->style = style; |
236 | this->style = style; |
| 238 | this->width = width; |
237 | this->width = width; |
| 239 | |
238 | |
| 240 | /* scrollBar.align = R_SB_ALIGN_CENTRE; */ |
239 | /* align = R_SB_ALIGN_CENTRE; */ |
| 241 | if (scrollalign) |
240 | if (scrollalign) |
| 242 | { |
241 | { |
| 243 | if (strncasecmp (scrollalign, "top", 3) == 0) |
242 | if (strncasecmp (scrollalign, "top", 3) == 0) |
| 244 | align = R_SB_ALIGN_TOP; |
243 | align = R_SB_ALIGN_TOP; |
| 245 | else if (strncasecmp (scrollalign, "bottom", 6) == 0) |
244 | else if (strncasecmp (scrollalign, "bottom", 6) == 0) |
