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.64 by root, Mon Feb 21 07:41:04 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 = 0;
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{
… …
72 65
73 if (!win) 66 if (!win)
74 { 67 {
75 /* create the scrollbar window */ 68 /* create the scrollbar window */
76 win = XCreateSimpleWindow (term->dpy, 69 win = XCreateSimpleWindow (term->dpy,
77 term->parent[0], 70 term->parent,
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 style, width;
147 const char *scrollalign, *scrollstyle, *thickness; 139 const char *scrollalign, *scrollstyle, *thickness;
148 140
149 this->term = term; 141 this->term = term;
150 scrollalign = term->rs[Rs_scrollBar_align]; 142 scrollalign = term->rs[Rs_scrollBar_align];
151 scrollstyle = term->rs[Rs_scrollstyle]; 143 scrollstyle = term->rs[Rs_scrollstyle];
152 thickness = term->rs[Rs_scrollBar_thickness]; 144 thickness = term->rs[Rs_scrollBar_thickness];
153 145
154# if defined(RXVT_SCROLLBAR) 146# if defined(RXVT_SCROLLBAR)
155 style = R_SB_RXVT; 147 style = SB_STYLE_RXVT;
156# elif defined(XTERM_SCROLLBAR) 148# elif defined(XTERM_SCROLLBAR)
157 style = R_SB_XTERM; 149 style = SB_STYLE_XTERM;
158# elif defined(NEXT_SCROLLBAR) 150# elif defined(NEXT_SCROLLBAR)
159 style = R_SB_NEXT; 151 style = SB_STYLE_NEXT;
160# elif defined(PLAIN_SCROLLBAR) 152# elif defined(PLAIN_SCROLLBAR)
161 style = R_SB_PLAIN; 153 style = SB_STYLE_PLAIN;
162#else 154#else
163 style = R_SB_RXVT; 155 style = SB_STYLE_RXVT;
164# endif 156# endif
165 157
166# if (defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)) 158# if (defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR))
167 if (scrollstyle) 159 if (scrollstyle)
168 { 160 {
169# ifdef NEXT_SCROLLBAR 161# ifdef NEXT_SCROLLBAR
170 if (strncasecmp (scrollstyle, "next", 4) == 0) 162 if (strncasecmp (scrollstyle, "next", 4) == 0)
171 style = R_SB_NEXT; 163 style = SB_STYLE_NEXT;
172# endif 164# endif
173# ifdef XTERM_SCROLLBAR 165# ifdef XTERM_SCROLLBAR
174 if (strncasecmp (scrollstyle, "xterm", 5) == 0) 166 if (strncasecmp (scrollstyle, "xterm", 5) == 0)
175 style = R_SB_XTERM; 167 style = SB_STYLE_XTERM;
176# endif 168# endif
177# ifdef PLAIN_SCROLLBAR 169# ifdef PLAIN_SCROLLBAR
178 if (strncasecmp (scrollstyle, "plain", 5) == 0) 170 if (strncasecmp (scrollstyle, "plain", 5) == 0)
179 style = R_SB_PLAIN; 171 style = SB_STYLE_PLAIN;
180# endif 172# endif
181 173
182 } 174 }
183# endif 175# endif
184 if (style == R_SB_NEXT) 176 if (style == SB_STYLE_NEXT)
185 width = SB_WIDTH_NEXT; 177 width = SB_WIDTH_NEXT;
186 else if (style == R_SB_XTERM) 178 else if (style == SB_STYLE_XTERM)
187 width = SB_WIDTH_XTERM; 179 width = SB_WIDTH_XTERM;
188 else if (style == R_SB_PLAIN) 180 else if (style == SB_STYLE_PLAIN)
189 width = SB_WIDTH_PLAIN; 181 width = SB_WIDTH_PLAIN;
190 else /* if (style == R_SB_RXVT) */ 182 else /* if (style == SB_STYLE_RXVT) */
191 width = SB_WIDTH_RXVT; 183 width = SB_WIDTH_RXVT;
192 184
193 if (style != R_SB_NEXT) /* dishonour request - for now */ 185 if (style != SB_STYLE_NEXT) /* dishonour request - for now */
194 if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM) 186 if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM)
195 width = min (i, SB_WIDTH_MAXIMUM); 187 width = min (i, SB_WIDTH_MAXIMUM);
196 188
197 this->style = style; 189# ifdef RXVT_SCROLLBAR
198 this->width = width; 190 if (! term->option (Opt_scrollBar_floating) && style == SB_STYLE_RXVT)
191 shadow = SHADOW_WIDTH;
192# endif
199 193
200 /* align = R_SB_ALIGN_CENTRE; */ 194 /* align = SB_ALIGN_CENTRE; */
201 if (scrollalign) 195 if (scrollalign)
202 { 196 {
203 if (strncasecmp (scrollalign, "top", 3) == 0) 197 if (strncasecmp (scrollalign, "top", 3) == 0)
204 align = R_SB_ALIGN_TOP; 198 align = SB_ALIGN_TOP;
205 else if (strncasecmp (scrollalign, "bottom", 6) == 0) 199 else if (strncasecmp (scrollalign, "bottom", 6) == 0)
206 align = R_SB_ALIGN_BOTTOM; 200 align = SB_ALIGN_BOTTOM;
207 } 201 }
208 last_bot = last_state = -1; 202 last_state = SB_STATE_OFF;
209 /* cursor scrollBar: Black-on-White */ 203 /* cursor scrollBar: Black-on-White */
210 leftptr_cursor = XCreateFontCursor (term->dpy, XC_left_ptr); 204 leftptr_cursor = XCreateFontCursor (term->dpy, XC_left_ptr);
211} 205}
212 206
213void 207void
… …
237 if (botShadowGC) XFreeGC (term->dpy, botShadowGC); 231 if (botShadowGC) XFreeGC (term->dpy, botShadowGC);
238 if (scrollbarGC) XFreeGC (term->dpy, scrollbarGC); 232 if (scrollbarGC) XFreeGC (term->dpy, scrollbarGC);
239#endif 233#endif
240} 234}
241 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
242void 247void
243scrollBar_t::update_data () 248scrollBar_t::update_data ()
244{ 249{
245#if defined(PLAIN_SCROLLBAR) 250#if defined(PLAIN_SCROLLBAR)
246 if (style == R_SB_PLAIN) 251 if (style == SB_STYLE_PLAIN)
247 { 252 {
248 beg = 0; 253 beg = 0;
249 end = term->szHint.height; 254 end = term->szHint.height;
250 update = &scrollBar_t::show_plain; 255 update = &scrollBar_t::show_plain;
251 } 256 }
252#endif 257#endif
253#if defined(XTERM_SCROLLBAR) 258#if defined(XTERM_SCROLLBAR)
254 if (style == R_SB_XTERM) 259 if (style == SB_STYLE_XTERM)
255 { 260 {
256 beg = 0; 261 beg = 0;
257 end = term->szHint.height; 262 end = term->szHint.height;
258 update = &scrollBar_t::show_xterm; 263 update = &scrollBar_t::show_xterm;
259 } 264 }
260#endif 265#endif
261#if defined(NEXT_SCROLLBAR) 266#if defined(NEXT_SCROLLBAR)
262 if (style == R_SB_NEXT) 267 if (style == SB_STYLE_NEXT)
263 { 268 {
264 beg = 0; 269 beg = 0;
265 end = term->szHint.height - (SB_BUTTON_TOTAL_HEIGHT + SB_PADDING); 270 end = term->szHint.height - (SB_BUTTON_TOTAL_HEIGHT + SB_PADDING);
266 update = &scrollBar_t::show_next; 271 update = &scrollBar_t::show_next;
267 } 272 }
268#endif 273#endif
269#if defined(RXVT_SCROLLBAR) 274#if defined(RXVT_SCROLLBAR)
270 if (style == R_SB_RXVT) 275 if (style == SB_STYLE_RXVT)
271 { 276 {
272 beg = (width + 1) + shadow; 277 beg = (width + 1) + shadow;
273 end = term->szHint.height - beg - (2 * shadow); 278 end = term->szHint.height - beg;
274 update = &scrollBar_t::show_rxvt; 279 update = &scrollBar_t::show_rxvt;
275 } 280 }
276#endif 281#endif
277} 282}
278 283

Diff Legend

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