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.55 by ayin, Mon Feb 18 09:58:05 2008 UTC vs.
Revision 1.59 by ayin, Mon Feb 18 15:14:32 2008 UTC

… …
66 int window_sb_x = 0; 66 int window_sb_x = 0;
67 67
68 if (option (Opt_scrollBar_right)) 68 if (option (Opt_scrollBar_right))
69 window_sb_x = szHint.width - scrollBar.total_width (); 69 window_sb_x = szHint.width - scrollBar.total_width ();
70 70
71#define R_SCROLLBEG_XTERM 0 71 scrollBar.update_data ();
72#define R_SCROLLEND_XTERM szHint.height
73#define R_SCROLLBEG_NEXT 0
74#define R_SCROLLEND_NEXT szHint.height - (SB_BUTTON_TOTAL_HEIGHT + \
75 SB_PADDING)
76#define R_SCROLLBEG_RXVT (scrollBar.width + 1) + scrollBar.shadow
77#define R_SCROLLEND_RXVT szHint.height - R_SCROLLBEG_RXVT - \
78 (2 * scrollBar.shadow)
79
80#if defined(PLAIN_SCROLLBAR)
81 if (scrollBar.style == R_SB_PLAIN)
82 {
83 scrollBar.beg = R_SCROLLBEG_XTERM;
84 scrollBar.end = R_SCROLLEND_XTERM;
85 scrollBar.update = &rxvt_term::scrollbar_show_plain;
86 }
87#endif
88#if defined(XTERM_SCROLLBAR)
89 if (scrollBar.style == R_SB_XTERM)
90 {
91 scrollBar.beg = R_SCROLLBEG_XTERM;
92 scrollBar.end = R_SCROLLEND_XTERM;
93 scrollBar.update = &rxvt_term::scrollbar_show_xterm;
94 }
95#endif
96#if defined(NEXT_SCROLLBAR)
97 if (scrollBar.style == R_SB_NEXT)
98 {
99 scrollBar.beg = R_SCROLLBEG_NEXT;
100 scrollBar.end = R_SCROLLEND_NEXT;
101 scrollBar.update = &rxvt_term::scrollbar_show_next;
102 }
103#endif
104#if defined(RXVT_SCROLLBAR)
105 if (scrollBar.style == R_SB_RXVT)
106 {
107 scrollBar.beg = R_SCROLLBEG_RXVT;
108 scrollBar.end = R_SCROLLEND_RXVT;
109 scrollBar.update = &rxvt_term::scrollbar_show_rxvt;
110 }
111#endif
112 72
113 if (!scrollBar.win) 73 if (!scrollBar.win)
114 { 74 {
115 /* create the scrollbar window */ 75 /* create the scrollbar window */
116 scrollBar.win = XCreateSimpleWindow (dpy, 76 scrollBar.win = XCreateSimpleWindow (dpy,
… …
144 104
145/* 105/*
146 * Update current scrollbar view w.r.t. slider heights, etc. 106 * Update current scrollbar view w.r.t. slider heights, etc.
147 */ 107 */
148int 108int
149rxvt_term::scrollbar_show (int update) 109rxvt_term::scrollbar_show (int refresh)
150{ 110{
151 int ret = 0; 111 int ret;
152 112
153 if (!scrollBar.state) 113 if (!scrollBar.state)
154 return 0; 114 return 0;
155 115
156 if (update) 116 if (refresh)
157 { 117 {
158 int top = view_start - top_row; 118 int sb_top = view_start - top_row;
159 int bot = top + (nrow - 1); 119 int sb_bot = sb_top + (nrow - 1);
160 int len = max (nrow - 1 - top_row, 1); 120 int sb_len = max (nrow - 1 - top_row, 1);
161 int adj = (((bot - top) * scrollBar.size ()) % len) > 0 ? 1 : 0; 121 int sb_size = (sb_bot - sb_top) * scrollBar.size ();
162 122
163 scrollBar.top = (scrollBar.beg + (top * scrollBar.size ()) / len); 123 scrollBar.top = (scrollBar.beg + (sb_top * scrollBar.size ()) / sb_len);
164 scrollBar.len = ((bot - top) * scrollBar.size ()) / len + 124 scrollBar.len = sb_size / sb_len + scrollBar.min_height () + (sb_size % sb_len > 0);
165 scrollBar.min_height () + adj;
166 scrollBar.bot = (scrollBar.top + scrollBar.len); 125 scrollBar.bot = (scrollBar.top + scrollBar.len);
167 /* no change */ 126 /* no change */
168 if (scrollBar.top == scrollBar.last_top 127 if (scrollBar.top == scrollBar.last_top
169 && scrollBar.bot == scrollBar.last_bot 128 && scrollBar.bot == scrollBar.last_bot
170 && (scrollBar.state == scrollBar.last_state 129 && (scrollBar.state == scrollBar.last_state
171 || !(scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN))) 130 || !(scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)))
172 return 0; 131 return 0;
173 } 132 }
174 133
175 ret = (this->*scrollBar.update) (update, scrollBar.last_top, scrollBar.last_bot, scrollBar.len); 134 ret = (this->*scrollBar.update) (refresh, scrollBar.last_top, scrollBar.last_bot, scrollBar.len);
176 135
177 scrollBar.last_top = scrollBar.top; 136 scrollBar.last_top = scrollBar.top;
178 scrollBar.last_bot = scrollBar.bot; 137 scrollBar.last_bot = scrollBar.bot;
179 scrollBar.last_state = scrollBar.state; 138 scrollBar.last_state = scrollBar.state;
180 139
… …
255 last_bot = last_state = -1; 214 last_bot = last_state = -1;
256 /* cursor scrollBar: Black-on-White */ 215 /* cursor scrollBar: Black-on-White */
257 leftptr_cursor = XCreateFontCursor (term->dpy, XC_left_ptr); 216 leftptr_cursor = XCreateFontCursor (term->dpy, XC_left_ptr);
258} 217}
259 218
219void
220scrollBar_t::update_data ()
221{
222#if defined(PLAIN_SCROLLBAR)
223 if (style == R_SB_PLAIN)
224 {
225 beg = 0;
226 end = term->szHint.height;
227 update = &rxvt_term::scrollbar_show_plain;
228 }
229#endif
230#if defined(XTERM_SCROLLBAR)
231 if (style == R_SB_XTERM)
232 {
233 beg = 0;
234 end = term->szHint.height;
235 update = &rxvt_term::scrollbar_show_xterm;
236 }
237#endif
238#if defined(NEXT_SCROLLBAR)
239 if (style == R_SB_NEXT)
240 {
241 beg = 0;
242 end = term->szHint.height - (SB_BUTTON_TOTAL_HEIGHT + SB_PADDING);
243 update = &rxvt_term::scrollbar_show_next;
244 }
245#endif
246#if defined(RXVT_SCROLLBAR)
247 if (style == R_SB_RXVT)
248 {
249 beg = (width + 1) + shadow;
250 end = term->szHint.height - beg - (2 * shadow);
251 update = &rxvt_term::scrollbar_show_rxvt;
252 }
253#endif
254}
255
260/*----------------------- end-of-file (C source) -----------------------*/ 256/*----------------------- end-of-file (C source) -----------------------*/
261 257

Diff Legend

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