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

Diff Legend

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