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.68 by sf-exg, Mon Aug 22 17:09:46 2011 UTC vs.
Revision 1.72 by sf-exg, Sun Aug 28 19:04:23 2011 UTC

… …
29/*----------------------------------------------------------------------*/ 29/*----------------------------------------------------------------------*/
30 30
31/* 31/*
32 * Map or unmap a scrollbar. Returns non-zero upon change of state 32 * Map or unmap a scrollbar. Returns non-zero upon change of state
33 */ 33 */
34int 34void
35scrollBar_t::map (int map) 35scrollBar_t::map (int map)
36{ 36{
37 int change = 0;
38
39 if (map) 37 if (map)
40 { 38 {
41 state = STATE_IDLE; 39 state = STATE_IDLE;
42 40
43 if (!win) 41 if (!win)
44 resize (); 42 resize ();
43 else
44 XMapWindow (term->dpy, win);
45 }
46 else
47 {
48 state = STATE_OFF;
45 49
46 if (win) 50 if (win)
47 {
48 XMapWindow (term->dpy, win);
49 change = 1;
50 }
51 }
52 else
53 {
54 state = STATE_OFF;
55 XUnmapWindow (term->dpy, win); 51 XUnmapWindow (term->dpy, win);
56 change = 1;
57 } 52 }
58
59 return change;
60} 53}
61 54
62void 55void
63scrollBar_t::resize () 56scrollBar_t::resize ()
64{ 57{
… …
116 if (refresh) 109 if (refresh)
117 { 110 {
118 int sb_top = term->view_start - term->top_row; 111 int sb_top = term->view_start - term->top_row;
119 int sb_bot = sb_top + (term->nrow - 1); 112 int sb_bot = sb_top + (term->nrow - 1);
120 int sb_len = max (term->nrow - 1 - term->top_row, 1); 113 int sb_len = max (term->nrow - 1 - term->top_row, 1);
121 int sb_size = (sb_bot - sb_top) * size ();
122 114
123 top = beg + (sb_top * size ()) / sb_len; 115 top = beg + (sb_top * size ()) / sb_len;
124 bot = top + sb_size / sb_len + min_height () + (sb_size % sb_len > 0); 116 bot = top + ecb_div_ru ((sb_bot - sb_top) * size (), sb_len) + min_height ();
125 /* no change */ 117 /* no change */
126 if (top == last_top 118 if (top == last_top
127 && bot == last_bot 119 && bot == last_bot
128 && (state == last_state 120 && (state == last_state
129 || !(state == STATE_UP || state == STATE_DOWN))) 121 || !(state == STATE_UP || state == STATE_DOWN)))
… …
141 133
142void 134void
143scrollBar_t::setup (rxvt_term *term) 135scrollBar_t::setup (rxvt_term *term)
144{ 136{
145 int i; 137 int i;
146 short width;
147 const char *scrollalign, *scrollstyle, *thickness; 138 const char *scrollalign, *scrollstyle, *thickness;
148 enum sb_style style;
149 139
150 this->term = term; 140 this->term = term;
151 scrollalign = term->rs[Rs_scrollBar_align]; 141 scrollalign = term->rs[Rs_scrollBar_align];
152 scrollstyle = term->rs[Rs_scrollstyle]; 142 scrollstyle = term->rs[Rs_scrollstyle];
153 thickness = term->rs[Rs_scrollBar_thickness]; 143 thickness = term->rs[Rs_scrollBar_thickness];
… …
198# ifdef RXVT_SCROLLBAR 188# ifdef RXVT_SCROLLBAR
199 if (! term->option (Opt_scrollBar_floating) && style == R_SB_RXVT) 189 if (! term->option (Opt_scrollBar_floating) && style == R_SB_RXVT)
200 shadow = SHADOW_WIDTH; 190 shadow = SHADOW_WIDTH;
201# endif 191# endif
202 192
203 this->style = style;
204 this->width = width;
205
206 /* align = R_SB_ALIGN_CENTRE; */ 193 /* align = R_SB_ALIGN_CENTRE; */
207 if (scrollalign) 194 if (scrollalign)
208 { 195 {
209 if (strncasecmp (scrollalign, "top", 3) == 0) 196 if (strncasecmp (scrollalign, "top", 3) == 0)
210 align = R_SB_ALIGN_TOP; 197 align = R_SB_ALIGN_TOP;

Diff Legend

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