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.73 by sf-exg, Tue Aug 30 16:39:03 2011 UTC vs.
Revision 1.78 by sf-exg, Sun Oct 14 12:31:59 2012 UTC

… …
34void 34void
35scrollBar_t::map (int map) 35scrollBar_t::map (int map)
36{ 36{
37 if (map) 37 if (map)
38 { 38 {
39 state = STATE_IDLE; 39 state = SB_STATE_IDLE;
40 40
41 if (!win) 41 if (!win)
42 resize (); 42 resize ();
43 else 43 else
44 XMapWindow (term->dpy, win); 44 XMapWindow (term->dpy, win);
45 } 45 }
46 else 46 else
47 { 47 {
48 state = STATE_OFF; 48 state = SB_STATE_OFF;
49 49
50 if (win) 50 if (win)
51 XUnmapWindow (term->dpy, win); 51 XUnmapWindow (term->dpy, win);
52 } 52 }
53} 53}
… …
71 window_sb_x, 0, 71 window_sb_x, 0,
72 total_width (), 72 total_width (),
73 term->szHint.height, 73 term->szHint.height,
74 0, 74 0,
75 term->pix_colors[Color_fg], 75 term->pix_colors[Color_fg],
76 term->pix_colors[Color_border]); 76 term->pix_colors[color ()]);
77 XDefineCursor (term->dpy, win, leftptr_cursor); 77 XDefineCursor (term->dpy, win, leftptr_cursor);
78 78
79 XSelectInput (term->dpy, win, 79 XSelectInput (term->dpy, win,
80 ExposureMask | ButtonPressMask | ButtonReleaseMask 80 ExposureMask | ButtonPressMask | ButtonReleaseMask
81 | Button1MotionMask | Button2MotionMask 81 | Button1MotionMask | Button2MotionMask
… …
109 if (refresh) 109 if (refresh)
110 { 110 {
111 int sb_top = term->view_start - term->top_row; 111 int sb_top = term->view_start - term->top_row;
112 int sb_bot = sb_top + (term->nrow - 1); 112 int sb_bot = sb_top + (term->nrow - 1);
113 int sb_len = max (term->nrow - 1 - term->top_row, 1); 113 int sb_len = max (term->nrow - 1 - term->top_row, 1);
114 int n = min (min_height (), size ());
114 115
115 top = beg + (sb_top * size ()) / sb_len; 116 top = beg + (sb_top * (size () - n)) / sb_len;
116 bot = top + ecb_div_ru ((sb_bot - sb_top) * size (), sb_len) + min_height (); 117 bot = top + ecb_div_ru ((sb_bot - sb_top) * (size () - n), sb_len) + n;
117 /* no change */ 118 /* no change */
118 if (top == last_top 119 if (top == last_top
119 && bot == last_bot 120 && bot == last_bot
120 && (state == last_state 121 && (state == last_state
121 || !(state == STATE_UP || state == STATE_DOWN))) 122 || !(state == SB_STATE_UP || state == SB_STATE_DOWN)))
122 return 0; 123 return 0;
123 } 124 }
124 125
125 ret = (this->*update) (refresh); 126 ret = (this->*update) (refresh);
126 127
… …
141 scrollalign = term->rs[Rs_scrollBar_align]; 142 scrollalign = term->rs[Rs_scrollBar_align];
142 scrollstyle = term->rs[Rs_scrollstyle]; 143 scrollstyle = term->rs[Rs_scrollstyle];
143 thickness = term->rs[Rs_scrollBar_thickness]; 144 thickness = term->rs[Rs_scrollBar_thickness];
144 145
145# if defined(RXVT_SCROLLBAR) 146# if defined(RXVT_SCROLLBAR)
146 style = R_SB_RXVT; 147 style = SB_STYLE_RXVT;
147# elif defined(XTERM_SCROLLBAR) 148# elif defined(XTERM_SCROLLBAR)
148 style = R_SB_XTERM; 149 style = SB_STYLE_XTERM;
149# elif defined(NEXT_SCROLLBAR) 150# elif defined(NEXT_SCROLLBAR)
150 style = R_SB_NEXT; 151 style = SB_STYLE_NEXT;
151# elif defined(PLAIN_SCROLLBAR) 152# elif defined(PLAIN_SCROLLBAR)
152 style = R_SB_PLAIN; 153 style = SB_STYLE_PLAIN;
153#else 154#else
154 style = R_SB_RXVT; 155 style = SB_STYLE_RXVT;
155# endif 156# endif
156 157
157# if (defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)) 158# if (defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR))
158 if (scrollstyle) 159 if (scrollstyle)
159 { 160 {
160# ifdef NEXT_SCROLLBAR 161# ifdef NEXT_SCROLLBAR
161 if (strncasecmp (scrollstyle, "next", 4) == 0) 162 if (strncasecmp (scrollstyle, "next", 4) == 0)
162 style = R_SB_NEXT; 163 style = SB_STYLE_NEXT;
163# endif 164# endif
164# ifdef XTERM_SCROLLBAR 165# ifdef XTERM_SCROLLBAR
165 if (strncasecmp (scrollstyle, "xterm", 5) == 0) 166 if (strncasecmp (scrollstyle, "xterm", 5) == 0)
166 style = R_SB_XTERM; 167 style = SB_STYLE_XTERM;
167# endif 168# endif
168# ifdef PLAIN_SCROLLBAR 169# ifdef PLAIN_SCROLLBAR
169 if (strncasecmp (scrollstyle, "plain", 5) == 0) 170 if (strncasecmp (scrollstyle, "plain", 5) == 0)
170 style = R_SB_PLAIN; 171 style = SB_STYLE_PLAIN;
171# endif 172# endif
172 173
173 } 174 }
174# endif 175# endif
175 if (style == R_SB_NEXT) 176 if (style == SB_STYLE_NEXT)
176 width = SB_WIDTH_NEXT; 177 width = SB_WIDTH_NEXT;
177 else if (style == R_SB_XTERM) 178 else if (style == SB_STYLE_XTERM)
178 width = SB_WIDTH_XTERM; 179 width = SB_WIDTH_XTERM;
179 else if (style == R_SB_PLAIN) 180 else if (style == SB_STYLE_PLAIN)
180 width = SB_WIDTH_PLAIN; 181 width = SB_WIDTH_PLAIN;
181 else /* if (style == R_SB_RXVT) */ 182 else /* if (style == SB_STYLE_RXVT) */
182 width = SB_WIDTH_RXVT; 183 width = SB_WIDTH_RXVT;
183 184
184 if (style != R_SB_NEXT) /* dishonour request - for now */ 185 if (style != SB_STYLE_NEXT) /* dishonour request - for now */
185 if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM) 186 if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM)
186 width = min (i, SB_WIDTH_MAXIMUM); 187 width = min (i, SB_WIDTH_MAXIMUM);
187 188
188# ifdef RXVT_SCROLLBAR 189# ifdef RXVT_SCROLLBAR
189 if (! term->option (Opt_scrollBar_floating) && style == R_SB_RXVT) 190 if (! term->option (Opt_scrollBar_floating) && style == SB_STYLE_RXVT)
190 shadow = SHADOW_WIDTH; 191 shadow = SHADOW_WIDTH;
191# endif 192# endif
192 193
193 /* align = R_SB_ALIGN_CENTRE; */ 194 /* align = SB_ALIGN_CENTRE; */
194 if (scrollalign) 195 if (scrollalign)
195 { 196 {
196 if (strncasecmp (scrollalign, "top", 3) == 0) 197 if (strncasecmp (scrollalign, "top", 3) == 0)
197 align = R_SB_ALIGN_TOP; 198 align = SB_ALIGN_TOP;
198 else if (strncasecmp (scrollalign, "bottom", 6) == 0) 199 else if (strncasecmp (scrollalign, "bottom", 6) == 0)
199 align = R_SB_ALIGN_BOTTOM; 200 align = SB_ALIGN_BOTTOM;
200 } 201 }
201 last_state = STATE_OFF; 202 last_state = SB_STATE_OFF;
202 /* cursor scrollBar: Black-on-White */ 203 /* cursor scrollBar: Black-on-White */
203 leftptr_cursor = XCreateFontCursor (term->dpy, XC_left_ptr); 204 leftptr_cursor = XCreateFontCursor (term->dpy, XC_left_ptr);
204} 205}
205 206
206void 207void
… …
230 if (botShadowGC) XFreeGC (term->dpy, botShadowGC); 231 if (botShadowGC) XFreeGC (term->dpy, botShadowGC);
231 if (scrollbarGC) XFreeGC (term->dpy, scrollbarGC); 232 if (scrollbarGC) XFreeGC (term->dpy, scrollbarGC);
232#endif 233#endif
233} 234}
234 235
236int
237scrollBar_t::color ()
238{
239#ifdef RXVT_SCROLLBAR
240 if (style == SB_STYLE_RXVT && shadow)
241 return Color_trough;
242 else
243#endif
244 return Color_border;
245}
246
235void 247void
236scrollBar_t::update_data () 248scrollBar_t::update_data ()
237{ 249{
238#if defined(PLAIN_SCROLLBAR) 250#if defined(PLAIN_SCROLLBAR)
239 if (style == R_SB_PLAIN) 251 if (style == SB_STYLE_PLAIN)
240 { 252 {
241 beg = 0; 253 beg = 0;
242 end = term->szHint.height; 254 end = term->szHint.height;
243 update = &scrollBar_t::show_plain; 255 update = &scrollBar_t::show_plain;
244 } 256 }
245#endif 257#endif
246#if defined(XTERM_SCROLLBAR) 258#if defined(XTERM_SCROLLBAR)
247 if (style == R_SB_XTERM) 259 if (style == SB_STYLE_XTERM)
248 { 260 {
249 beg = 0; 261 beg = 0;
250 end = term->szHint.height; 262 end = term->szHint.height;
251 update = &scrollBar_t::show_xterm; 263 update = &scrollBar_t::show_xterm;
252 } 264 }
253#endif 265#endif
254#if defined(NEXT_SCROLLBAR) 266#if defined(NEXT_SCROLLBAR)
255 if (style == R_SB_NEXT) 267 if (style == SB_STYLE_NEXT)
256 { 268 {
257 beg = 0; 269 beg = 0;
258 end = term->szHint.height - (SB_BUTTON_TOTAL_HEIGHT + SB_PADDING); 270 end = term->szHint.height - (SB_BUTTON_TOTAL_HEIGHT + SB_PADDING);
259 update = &scrollBar_t::show_next; 271 update = &scrollBar_t::show_next;
260 } 272 }
261#endif 273#endif
262#if defined(RXVT_SCROLLBAR) 274#if defined(RXVT_SCROLLBAR)
263 if (style == R_SB_RXVT) 275 if (style == SB_STYLE_RXVT)
264 { 276 {
265 beg = (width + 1) + shadow; 277 beg = (width + 1) + shadow;
266 end = term->szHint.height - beg - (2 * shadow); 278 end = term->szHint.height - beg;
267 update = &scrollBar_t::show_rxvt; 279 update = &scrollBar_t::show_rxvt;
268 } 280 }
269#endif 281#endif
270} 282}
271 283

Diff Legend

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