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.54 by ayin, Sun Feb 17 12:21:45 2008 UTC vs.
Revision 1.59 by ayin, Mon Feb 18 15:14:32 2008 UTC

… …
61 61
62void 62void
63rxvt_term::resize_scrollbar () 63rxvt_term::resize_scrollbar ()
64{ 64{
65 int delayed_init = 0; 65 int delayed_init = 0;
66 int window_sb_x = 0;
66 67
67#define R_SCROLLBEG_XTERM 0 68 if (option (Opt_scrollBar_right))
68#define R_SCROLLEND_XTERM szHint.height 69 window_sb_x = szHint.width - scrollBar.total_width ();
69#define R_SCROLLBEG_NEXT 0
70#define R_SCROLLEND_NEXT szHint.height - (SB_BUTTON_TOTAL_HEIGHT + \
71 SB_PADDING)
72#define R_SCROLLBEG_RXVT (scrollBar.width + 1) + scrollBar.shadow
73#define R_SCROLLEND_RXVT szHint.height - R_SCROLLBEG_RXVT - \
74 (2 * scrollBar.shadow)
75 70
76#if defined(PLAIN_SCROLLBAR) 71 scrollBar.update_data ();
77 if (scrollBar.style == R_SB_PLAIN)
78 {
79 scrollBar.beg = R_SCROLLBEG_XTERM;
80 scrollBar.end = R_SCROLLEND_XTERM;
81 scrollBar.update = &rxvt_term::scrollbar_show_plain;
82 }
83#endif
84#if defined(XTERM_SCROLLBAR)
85 if (scrollBar.style == R_SB_XTERM)
86 {
87 scrollBar.beg = R_SCROLLBEG_XTERM;
88 scrollBar.end = R_SCROLLEND_XTERM;
89 scrollBar.update = &rxvt_term::scrollbar_show_xterm;
90 }
91#endif
92#if defined(NEXT_SCROLLBAR)
93 if (scrollBar.style == R_SB_NEXT)
94 {
95 scrollBar.beg = R_SCROLLBEG_NEXT;
96 scrollBar.end = R_SCROLLEND_NEXT;
97 scrollBar.update = &rxvt_term::scrollbar_show_next;
98 }
99#endif
100#if defined(RXVT_SCROLLBAR)
101 if (scrollBar.style == R_SB_RXVT)
102 {
103 scrollBar.beg = R_SCROLLBEG_RXVT;
104 scrollBar.end = R_SCROLLEND_RXVT;
105 scrollBar.update = &rxvt_term::scrollbar_show_rxvt;
106 }
107#endif
108 72
109 if (!scrollBar.win) 73 if (!scrollBar.win)
110 { 74 {
111 /* create the scrollbar window */ 75 /* create the scrollbar window */
112 scrollBar.win = XCreateSimpleWindow (dpy, 76 scrollBar.win = XCreateSimpleWindow (dpy,
… …
125 | Button3MotionMask); 89 | Button3MotionMask);
126 scrollbar_ev.start (display, scrollBar.win); 90 scrollbar_ev.start (display, scrollBar.win);
127 91
128 delayed_init = 1; 92 delayed_init = 1;
129 } 93 }
94 else
95 XMoveResizeWindow (dpy, scrollBar.win,
96 window_sb_x, 0,
97 scrollBar.total_width (), szHint.height);
130 98
131 scrollbar_show (1); 99 scrollbar_show (1);
132 100
133 if (delayed_init) 101 if (delayed_init)
134 XMapWindow (dpy, scrollBar.win); 102 XMapWindow (dpy, scrollBar.win);
… …
136 104
137/* 105/*
138 * Update current scrollbar view w.r.t. slider heights, etc. 106 * Update current scrollbar view w.r.t. slider heights, etc.
139 */ 107 */
140int 108int
141rxvt_term::scrollbar_show (int update) 109rxvt_term::scrollbar_show (int refresh)
142{ 110{
143 int ret = 0; 111 int ret;
144 112
145 if (!scrollBar.state) 113 if (!scrollBar.state)
146 return 0; 114 return 0;
147 115
148 if (update) 116 if (refresh)
149 { 117 {
150 int top = view_start - top_row; 118 int sb_top = view_start - top_row;
151 int bot = top + (nrow - 1); 119 int sb_bot = sb_top + (nrow - 1);
152 int len = max (nrow - 1 - top_row, 1); 120 int sb_len = max (nrow - 1 - top_row, 1);
153 int adj = (((bot - top) * scrollBar.size ()) % len) > 0 ? 1 : 0; 121 int sb_size = (sb_bot - sb_top) * scrollBar.size ();
154 122
155 scrollBar.top = (scrollBar.beg + (top * scrollBar.size ()) / len); 123 scrollBar.top = (scrollBar.beg + (sb_top * scrollBar.size ()) / sb_len);
156 scrollBar.len = ((bot - top) * scrollBar.size ()) / len + 124 scrollBar.len = sb_size / sb_len + scrollBar.min_height () + (sb_size % sb_len > 0);
157 scrollBar.min_height () + adj;
158 scrollBar.bot = (scrollBar.top + scrollBar.len); 125 scrollBar.bot = (scrollBar.top + scrollBar.len);
159 /* no change */ 126 /* no change */
160 if (scrollBar.top == scrollBar.last_top 127 if (scrollBar.top == scrollBar.last_top
161 && scrollBar.bot == scrollBar.last_bot 128 && scrollBar.bot == scrollBar.last_bot
162 && (scrollBar.state == scrollBar.last_state 129 && (scrollBar.state == scrollBar.last_state
163 || !(scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN))) 130 || !(scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)))
164 return 0; 131 return 0;
165 } 132 }
166 133
167 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);
168 135
169 scrollBar.last_top = scrollBar.top; 136 scrollBar.last_top = scrollBar.top;
170 scrollBar.last_bot = scrollBar.bot; 137 scrollBar.last_bot = scrollBar.bot;
171 scrollBar.last_state = scrollBar.state; 138 scrollBar.last_state = scrollBar.state;
172 139
… …
247 last_bot = last_state = -1; 214 last_bot = last_state = -1;
248 /* cursor scrollBar: Black-on-White */ 215 /* cursor scrollBar: Black-on-White */
249 leftptr_cursor = XCreateFontCursor (term->dpy, XC_left_ptr); 216 leftptr_cursor = XCreateFontCursor (term->dpy, XC_left_ptr);
250} 217}
251 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
252/*----------------------- end-of-file (C source) -----------------------*/ 256/*----------------------- end-of-file (C source) -----------------------*/
253 257

Diff Legend

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