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.49 by ayin, Tue Jan 29 13:57:23 2008 UTC vs.
Revision 1.53 by ayin, Sun Feb 17 12:11:56 2008 UTC

… …
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);
… …
149 if (update) 149 if (update)
150 { 150 {
151 top = view_start - top_row; 151 top = view_start - top_row;
152 bot = top + (nrow - 1); 152 bot = top + (nrow - 1);
153 len = max (nrow - 1 - top_row, 1); 153 len = max (nrow - 1 - top_row, 1);
154 adj = (((bot - top) * scrollbar_size ()) % len) > 0 ? 1 : 0; 154 adj = (((bot - top) * scrollBar.size ()) % len) > 0 ? 1 : 0;
155 155
156 scrollBar.top = (scrollBar.beg + (top * scrollbar_size ()) / len); 156 scrollBar.top = (scrollBar.beg + (top * scrollBar.size ()) / len);
157 scrollBar.len = ((bot - top) * scrollbar_size ()) / len + 157 scrollBar.len = ((bot - top) * scrollBar.size ()) / len +
158 scrollbar_minheight () + adj; 158 scrollBar.min_height () + adj;
159 scrollBar.bot = (scrollBar.top + scrollBar.len); 159 scrollBar.bot = (scrollBar.top + scrollBar.len);
160 /* no change */ 160 /* no change */
161 if (scrollBar.top == scrollBar.last_top 161 if (scrollBar.top == scrollBar.last_top
162 && scrollBar.bot == scrollBar.last_bot 162 && scrollBar.bot == scrollBar.last_bot
163 && (scrollBar.state == scrollBar.last_state 163 && (scrollBar.state == scrollBar.last_state
… …
173 173
174 return ret; 174 return ret;
175} 175}
176 176
177void 177void
178rxvt_term::setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness) 178scrollBar_t::setup (rxvt_term *term)
179{ 179{
180 int i; 180 int i;
181 short style, width; 181 short style, width;
182 const char *scrollalign, *scrollstyle, *thickness;
183
184 this->term = term;
185 scrollalign = term->rs[Rs_scrollBar_align];
186 scrollstyle = term->rs[Rs_scrollstyle];
187 thickness = term->rs[Rs_scrollBar_thickness];
182 188
183# if defined(RXVT_SCROLLBAR) 189# if defined(RXVT_SCROLLBAR)
184 style = R_SB_RXVT; 190 style = R_SB_RXVT;
185# elif defined(XTERM_SCROLLBAR) 191# elif defined(XTERM_SCROLLBAR)
186 style = R_SB_XTERM; 192 style = R_SB_XTERM;
… …
222 if (style != R_SB_NEXT) /* dishonour request - for now */ 228 if (style != R_SB_NEXT) /* dishonour request - for now */
223 if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM) 229 if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM)
224 width = min (i, SB_WIDTH_MAXIMUM); 230 width = min (i, SB_WIDTH_MAXIMUM);
225 231
226# ifdef RXVT_SCROLLBAR 232# ifdef RXVT_SCROLLBAR
227 if (! option (Opt_scrollBar_floating) && style == R_SB_RXVT) 233 if (! term->option (Opt_scrollBar_floating) && style == R_SB_RXVT)
228 scrollBar.shadow = SHADOW_WIDTH; 234 shadow = SHADOW_WIDTH;
229# endif 235# endif
230 236
231 scrollBar.style = style; 237 this->style = style;
232 scrollBar.width = width; 238 this->width = width;
233 239
234 /* scrollBar.align = R_SB_ALIGN_CENTRE; */ 240 /* align = R_SB_ALIGN_CENTRE; */
235 if (scrollalign) 241 if (scrollalign)
236 { 242 {
237 if (strncasecmp (scrollalign, "top", 3) == 0) 243 if (strncasecmp (scrollalign, "top", 3) == 0)
238 scrollBar.align = R_SB_ALIGN_TOP; 244 align = R_SB_ALIGN_TOP;
239 else if (strncasecmp (scrollalign, "bottom", 6) == 0) 245 else if (strncasecmp (scrollalign, "bottom", 6) == 0)
240 scrollBar.align = R_SB_ALIGN_BOTTOM; 246 align = R_SB_ALIGN_BOTTOM;
241 } 247 }
242 scrollBar.last_bot = scrollBar.last_state = -1; 248 last_bot = last_state = -1;
243 /* cursor scrollBar: Black-on-White */ 249 /* cursor scrollBar: Black-on-White */
244 scrollBar.leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr); 250 leftptr_cursor = XCreateFontCursor (term->dpy, XC_left_ptr);
245} 251}
246 252
247/*----------------------- end-of-file (C source) -----------------------*/ 253/*----------------------- end-of-file (C source) -----------------------*/
248 254

Diff Legend

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