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.74 by sf-exg, Thu Sep 1 08:11:27 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 = SB_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 = SB_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 == SB_STATE_UP || state == SB_STATE_DOWN)))
130 return 0; 122 return 0;
131 } 123 }
132 124
133 ret = (this->*update) (refresh); 125 ret = (this->*update) (refresh);
134 126
… …
140} 132}
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];
154 144
155# if defined(RXVT_SCROLLBAR) 145# if defined(RXVT_SCROLLBAR)
156 style = R_SB_RXVT; 146 style = SB_STYLE_RXVT;
157# elif defined(XTERM_SCROLLBAR) 147# elif defined(XTERM_SCROLLBAR)
158 style = R_SB_XTERM; 148 style = SB_STYLE_XTERM;
159# elif defined(NEXT_SCROLLBAR) 149# elif defined(NEXT_SCROLLBAR)
160 style = R_SB_NEXT; 150 style = SB_STYLE_NEXT;
161# elif defined(PLAIN_SCROLLBAR) 151# elif defined(PLAIN_SCROLLBAR)
162 style = R_SB_PLAIN; 152 style = SB_STYLE_PLAIN;
163#else 153#else
164 style = R_SB_RXVT; 154 style = SB_STYLE_RXVT;
165# endif 155# endif
166 156
167# if (defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)) 157# if (defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR))
168 if (scrollstyle) 158 if (scrollstyle)
169 { 159 {
170# ifdef NEXT_SCROLLBAR 160# ifdef NEXT_SCROLLBAR
171 if (strncasecmp (scrollstyle, "next", 4) == 0) 161 if (strncasecmp (scrollstyle, "next", 4) == 0)
172 style = R_SB_NEXT; 162 style = SB_STYLE_NEXT;
173# endif 163# endif
174# ifdef XTERM_SCROLLBAR 164# ifdef XTERM_SCROLLBAR
175 if (strncasecmp (scrollstyle, "xterm", 5) == 0) 165 if (strncasecmp (scrollstyle, "xterm", 5) == 0)
176 style = R_SB_XTERM; 166 style = SB_STYLE_XTERM;
177# endif 167# endif
178# ifdef PLAIN_SCROLLBAR 168# ifdef PLAIN_SCROLLBAR
179 if (strncasecmp (scrollstyle, "plain", 5) == 0) 169 if (strncasecmp (scrollstyle, "plain", 5) == 0)
180 style = R_SB_PLAIN; 170 style = SB_STYLE_PLAIN;
181# endif 171# endif
182 172
183 } 173 }
184# endif 174# endif
185 if (style == R_SB_NEXT) 175 if (style == SB_STYLE_NEXT)
186 width = SB_WIDTH_NEXT; 176 width = SB_WIDTH_NEXT;
187 else if (style == R_SB_XTERM) 177 else if (style == SB_STYLE_XTERM)
188 width = SB_WIDTH_XTERM; 178 width = SB_WIDTH_XTERM;
189 else if (style == R_SB_PLAIN) 179 else if (style == SB_STYLE_PLAIN)
190 width = SB_WIDTH_PLAIN; 180 width = SB_WIDTH_PLAIN;
191 else /* if (style == R_SB_RXVT) */ 181 else /* if (style == SB_STYLE_RXVT) */
192 width = SB_WIDTH_RXVT; 182 width = SB_WIDTH_RXVT;
193 183
194 if (style != R_SB_NEXT) /* dishonour request - for now */ 184 if (style != SB_STYLE_NEXT) /* dishonour request - for now */
195 if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM) 185 if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM)
196 width = min (i, SB_WIDTH_MAXIMUM); 186 width = min (i, SB_WIDTH_MAXIMUM);
197 187
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 == SB_STYLE_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 = 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 = SB_ALIGN_TOP;
211 else if (strncasecmp (scrollalign, "bottom", 6) == 0) 198 else if (strncasecmp (scrollalign, "bottom", 6) == 0)
212 align = R_SB_ALIGN_BOTTOM; 199 align = SB_ALIGN_BOTTOM;
213 } 200 }
214 last_state = STATE_OFF; 201 last_state = SB_STATE_OFF;
215 /* cursor scrollBar: Black-on-White */ 202 /* cursor scrollBar: Black-on-White */
216 leftptr_cursor = XCreateFontCursor (term->dpy, XC_left_ptr); 203 leftptr_cursor = XCreateFontCursor (term->dpy, XC_left_ptr);
217} 204}
218 205
219void 206void
… …
247 234
248void 235void
249scrollBar_t::update_data () 236scrollBar_t::update_data ()
250{ 237{
251#if defined(PLAIN_SCROLLBAR) 238#if defined(PLAIN_SCROLLBAR)
252 if (style == R_SB_PLAIN) 239 if (style == SB_STYLE_PLAIN)
253 { 240 {
254 beg = 0; 241 beg = 0;
255 end = term->szHint.height; 242 end = term->szHint.height;
256 update = &scrollBar_t::show_plain; 243 update = &scrollBar_t::show_plain;
257 } 244 }
258#endif 245#endif
259#if defined(XTERM_SCROLLBAR) 246#if defined(XTERM_SCROLLBAR)
260 if (style == R_SB_XTERM) 247 if (style == SB_STYLE_XTERM)
261 { 248 {
262 beg = 0; 249 beg = 0;
263 end = term->szHint.height; 250 end = term->szHint.height;
264 update = &scrollBar_t::show_xterm; 251 update = &scrollBar_t::show_xterm;
265 } 252 }
266#endif 253#endif
267#if defined(NEXT_SCROLLBAR) 254#if defined(NEXT_SCROLLBAR)
268 if (style == R_SB_NEXT) 255 if (style == SB_STYLE_NEXT)
269 { 256 {
270 beg = 0; 257 beg = 0;
271 end = term->szHint.height - (SB_BUTTON_TOTAL_HEIGHT + SB_PADDING); 258 end = term->szHint.height - (SB_BUTTON_TOTAL_HEIGHT + SB_PADDING);
272 update = &scrollBar_t::show_next; 259 update = &scrollBar_t::show_next;
273 } 260 }
274#endif 261#endif
275#if defined(RXVT_SCROLLBAR) 262#if defined(RXVT_SCROLLBAR)
276 if (style == R_SB_RXVT) 263 if (style == SB_STYLE_RXVT)
277 { 264 {
278 beg = (width + 1) + shadow; 265 beg = (width + 1) + shadow;
279 end = term->szHint.height - beg - (2 * shadow); 266 end = term->szHint.height - beg - (2 * shadow);
280 update = &scrollBar_t::show_rxvt; 267 update = &scrollBar_t::show_rxvt;
281 } 268 }

Diff Legend

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