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.79 by root, Thu May 22 18:54:33 2014 UTC

… …
8 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com> 8 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com>
9 * Copyright (c) 2004-2006 Marc Lehmann <schmorp@schmorp.de> 9 * Copyright (c) 2004-2006 Marc Lehmann <schmorp@schmorp.de>
10 * 10 *
11 * This program is free software; you can redistribute it and/or modify 11 * This program is free software; you can redistribute it and/or modify
12 * it under the terms of the GNU General Public License as published by 12 * it under the terms of the GNU General Public License as published by
13 * the Free Software Foundation; either version 2 of the License, or 13 * the Free Software Foundation; either version 3 of the License, or
14 * (at your option) any later version. 14 * (at your option) any later version.
15 * 15 *
16 * This program is distributed in the hope that it will be useful, 16 * This program is distributed in the hope that it will be useful,
17 * but WITHOUT ANY WARRANTY; without even the implied warranty of 17 * but WITHOUT ANY WARRANTY; without even the implied warranty of
18 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 18 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
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{
… …
78 window_sb_x, 0, 71 window_sb_x, 0,
79 total_width (), 72 total_width (),
80 term->szHint.height, 73 term->szHint.height,
81 0, 74 0,
82 term->pix_colors[Color_fg], 75 term->pix_colors[Color_fg],
83 term->pix_colors[Color_border]); 76 term->pix_colors[color ()]);
84 XDefineCursor (term->dpy, win, leftptr_cursor); 77 XDefineCursor (term->dpy, win, leftptr_cursor);
85 78
86 XSelectInput (term->dpy, win, 79 XSelectInput (term->dpy, win,
87 ExposureMask | ButtonPressMask | ButtonReleaseMask 80 ExposureMask | ButtonPressMask | ButtonReleaseMask
88 | Button1MotionMask | Button2MotionMask 81 | Button1MotionMask | Button2MotionMask
… …
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 (); 114 int n = min (min_height (), size ());
122 115
123 top = beg + (sb_top * size ()) / sb_len; 116 top = beg + (sb_top * (size () - n)) / sb_len;
124 bot = top + sb_size / sb_len + min_height () + (sb_size % sb_len > 0); 117 bot = top + ecb_div_ru ((sb_bot - sb_top) * (size () - n), sb_len) + n;
125 /* no change */ 118 /* no change */
126 if (top == last_top 119 if (top == last_top
127 && bot == last_bot 120 && bot == last_bot
128 && (state == last_state 121 && (state == last_state
129 || !(state == STATE_UP || state == STATE_DOWN))) 122 || !(state == SB_STATE_UP || state == SB_STATE_DOWN)))
130 return 0; 123 return 0;
131 } 124 }
132 125
133 ret = (this->*update) (refresh); 126 ret = (this->*update) (refresh);
134 127
… …
140} 133}
141 134
142void 135void
143scrollBar_t::setup (rxvt_term *term) 136scrollBar_t::setup (rxvt_term *term)
144{ 137{
145 int i; 138 int i;
146 short width;
147 const char *scrollalign, *scrollstyle, *thickness; 139 const char *scrollalign, *scrollstyle, *thickness;
148 enum sb_style style;
149 140
150 this->term = term; 141 this->term = term;
151 scrollalign = term->rs[Rs_scrollBar_align]; 142 scrollalign = term->rs[Rs_scrollBar_align];
152 scrollstyle = term->rs[Rs_scrollstyle]; 143 scrollstyle = term->rs[Rs_scrollstyle];
153 thickness = term->rs[Rs_scrollBar_thickness]; 144 thickness = term->rs[Rs_scrollBar_thickness];
154 145
155# if defined(RXVT_SCROLLBAR) 146# if defined(RXVT_SCROLLBAR)
156 style = R_SB_RXVT; 147 style = SB_STYLE_RXVT;
157# elif defined(XTERM_SCROLLBAR) 148# elif defined(XTERM_SCROLLBAR)
158 style = R_SB_XTERM; 149 style = SB_STYLE_XTERM;
159# elif defined(NEXT_SCROLLBAR) 150# elif defined(NEXT_SCROLLBAR)
160 style = R_SB_NEXT; 151 style = SB_STYLE_NEXT;
161# elif defined(PLAIN_SCROLLBAR) 152# elif defined(PLAIN_SCROLLBAR)
162 style = R_SB_PLAIN; 153 style = SB_STYLE_PLAIN;
163#else 154#else
164 style = R_SB_RXVT; 155 style = SB_STYLE_RXVT;
165# endif 156# endif
166 157
167# if (defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)) 158# if (defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR))
168 if (scrollstyle) 159 if (scrollstyle)
169 { 160 {
170# ifdef NEXT_SCROLLBAR 161# ifdef NEXT_SCROLLBAR
171 if (strncasecmp (scrollstyle, "next", 4) == 0) 162 if (strncasecmp (scrollstyle, "next", 4) == 0)
172 style = R_SB_NEXT; 163 style = SB_STYLE_NEXT;
173# endif 164# endif
174# ifdef XTERM_SCROLLBAR 165# ifdef XTERM_SCROLLBAR
175 if (strncasecmp (scrollstyle, "xterm", 5) == 0) 166 if (strncasecmp (scrollstyle, "xterm", 5) == 0)
176 style = R_SB_XTERM; 167 style = SB_STYLE_XTERM;
177# endif 168# endif
178# ifdef PLAIN_SCROLLBAR 169# ifdef PLAIN_SCROLLBAR
179 if (strncasecmp (scrollstyle, "plain", 5) == 0) 170 if (strncasecmp (scrollstyle, "plain", 5) == 0)
180 style = R_SB_PLAIN; 171 style = SB_STYLE_PLAIN;
181# endif 172# endif
182 173
183 } 174 }
184# endif 175# endif
185 if (style == R_SB_NEXT) 176 if (style == SB_STYLE_NEXT)
186 width = SB_WIDTH_NEXT; 177 width = SB_WIDTH_NEXT;
187 else if (style == R_SB_XTERM) 178 else if (style == SB_STYLE_XTERM)
188 width = SB_WIDTH_XTERM; 179 width = SB_WIDTH_XTERM;
189 else if (style == R_SB_PLAIN) 180 else if (style == SB_STYLE_PLAIN)
190 width = SB_WIDTH_PLAIN; 181 width = SB_WIDTH_PLAIN;
191 else /* if (style == R_SB_RXVT) */ 182 else /* if (style == SB_STYLE_RXVT) */
192 width = SB_WIDTH_RXVT; 183 width = SB_WIDTH_RXVT;
193 184
194 if (style != R_SB_NEXT) /* dishonour request - for now */ 185 if (style != SB_STYLE_NEXT) /* dishonour request - for now */
195 if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM) 186 if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM)
196 width = min (i, SB_WIDTH_MAXIMUM); 187 width = min (i, SB_WIDTH_MAXIMUM);
197 188
198# ifdef RXVT_SCROLLBAR 189# ifdef RXVT_SCROLLBAR
199 if (! term->option (Opt_scrollBar_floating) && style == R_SB_RXVT) 190 if (! term->option (Opt_scrollBar_floating) && style == SB_STYLE_RXVT)
200 shadow = SHADOW_WIDTH; 191 shadow = SHADOW_WIDTH;
201# endif 192# endif
202 193
203 this->style = style;
204 this->width = width;
205
206 /* align = R_SB_ALIGN_CENTRE; */ 194 /* align = SB_ALIGN_CENTRE; */
207 if (scrollalign) 195 if (scrollalign)
208 { 196 {
209 if (strncasecmp (scrollalign, "top", 3) == 0) 197 if (strncasecmp (scrollalign, "top", 3) == 0)
210 align = R_SB_ALIGN_TOP; 198 align = SB_ALIGN_TOP;
211 else if (strncasecmp (scrollalign, "bottom", 6) == 0) 199 else if (strncasecmp (scrollalign, "bottom", 6) == 0)
212 align = R_SB_ALIGN_BOTTOM; 200 align = SB_ALIGN_BOTTOM;
213 } 201 }
214 last_state = STATE_OFF; 202 last_state = SB_STATE_OFF;
215 /* cursor scrollBar: Black-on-White */ 203 /* cursor scrollBar: Black-on-White */
216 leftptr_cursor = XCreateFontCursor (term->dpy, XC_left_ptr); 204 leftptr_cursor = XCreateFontCursor (term->dpy, XC_left_ptr);
217} 205}
218 206
219void 207void
… …
243 if (botShadowGC) XFreeGC (term->dpy, botShadowGC); 231 if (botShadowGC) XFreeGC (term->dpy, botShadowGC);
244 if (scrollbarGC) XFreeGC (term->dpy, scrollbarGC); 232 if (scrollbarGC) XFreeGC (term->dpy, scrollbarGC);
245#endif 233#endif
246} 234}
247 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
248void 247void
249scrollBar_t::update_data () 248scrollBar_t::update_data ()
250{ 249{
251#if defined(PLAIN_SCROLLBAR) 250#if defined(PLAIN_SCROLLBAR)
252 if (style == R_SB_PLAIN) 251 if (style == SB_STYLE_PLAIN)
253 { 252 {
254 beg = 0; 253 beg = 0;
255 end = term->szHint.height; 254 end = term->szHint.height;
256 update = &scrollBar_t::show_plain; 255 update = &scrollBar_t::show_plain;
257 } 256 }
258#endif 257#endif
259#if defined(XTERM_SCROLLBAR) 258#if defined(XTERM_SCROLLBAR)
260 if (style == R_SB_XTERM) 259 if (style == SB_STYLE_XTERM)
261 { 260 {
262 beg = 0; 261 beg = 0;
263 end = term->szHint.height; 262 end = term->szHint.height;
264 update = &scrollBar_t::show_xterm; 263 update = &scrollBar_t::show_xterm;
265 } 264 }
266#endif 265#endif
267#if defined(NEXT_SCROLLBAR) 266#if defined(NEXT_SCROLLBAR)
268 if (style == R_SB_NEXT) 267 if (style == SB_STYLE_NEXT)
269 { 268 {
270 beg = 0; 269 beg = 0;
271 end = term->szHint.height - (SB_BUTTON_TOTAL_HEIGHT + SB_PADDING); 270 end = term->szHint.height - (SB_BUTTON_TOTAL_HEIGHT + SB_PADDING);
272 update = &scrollBar_t::show_next; 271 update = &scrollBar_t::show_next;
273 } 272 }
274#endif 273#endif
275#if defined(RXVT_SCROLLBAR) 274#if defined(RXVT_SCROLLBAR)
276 if (style == R_SB_RXVT) 275 if (style == SB_STYLE_RXVT)
277 { 276 {
278 beg = (width + 1) + shadow; 277 beg = (width + 1) + shadow;
279 end = term->szHint.height - beg - (2 * shadow); 278 end = term->szHint.height - beg;
280 update = &scrollBar_t::show_rxvt; 279 update = &scrollBar_t::show_rxvt;
281 } 280 }
282#endif 281#endif
283} 282}
284 283

Diff Legend

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