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.39 by root, Tue May 1 21:30:01 2007 UTC vs.
Revision 1.53 by ayin, Sun Feb 17 12:11:56 2008 UTC

… …
34int 34int
35rxvt_term::scrollbar_mapping (int map) 35rxvt_term::scrollbar_mapping (int map)
36{ 36{
37 int change = 0; 37 int change = 0;
38 38
39#ifdef HAVE_SCROLLBARS
40 if (map) 39 if (map)
41 { 40 {
42 scrollBar.setIdle (); 41 scrollBar.state = STATE_IDLE;
43 42
44 if (!scrollBar.win) 43 if (!scrollBar.win)
45 resize_scrollbar (); 44 resize_scrollbar ();
46 45
47 if (scrollBar.win) 46 if (scrollBar.win)
… …
54 { 53 {
55 scrollBar.state = 0; 54 scrollBar.state = 0;
56 XUnmapWindow (dpy, scrollBar.win); 55 XUnmapWindow (dpy, scrollBar.win);
57 change = 1; 56 change = 1;
58 } 57 }
59#endif
60 58
61 return change; 59 return change;
62} 60}
63 61
64void 62void
65rxvt_term::resize_scrollbar () 63rxvt_term::resize_scrollbar ()
66{ 64{
67#ifdef HAVE_SCROLLBARS
68 int delayed_init = 0; 65 int delayed_init = 0;
69 66
70#define R_SCROLLBEG_XTERM 0 67#define R_SCROLLBEG_XTERM 0
71#define R_SCROLLEND_XTERM szHint.height 68#define R_SCROLLEND_XTERM szHint.height
72#define R_SCROLLBEG_NEXT 0 69#define R_SCROLLBEG_NEXT 0
73#define R_SCROLLEND_NEXT szHint.height - (SB_BUTTON_TOTAL_HEIGHT + \ 70#define R_SCROLLEND_NEXT szHint.height - (SB_BUTTON_TOTAL_HEIGHT + \
74 SB_PADDING) 71 SB_PADDING)
75#define R_SCROLLBEG_RXVT (scrollBar.width + 1) + sb_shadow 72#define R_SCROLLBEG_RXVT (scrollBar.width + 1) + scrollBar.shadow
76#define R_SCROLLEND_RXVT szHint.height - R_SCROLLBEG_RXVT - \ 73#define R_SCROLLEND_RXVT szHint.height - R_SCROLLBEG_RXVT - \
77 (2 * sb_shadow) 74 (2 * scrollBar.shadow)
78 75
79#if defined(PLAIN_SCROLLBAR) 76#if defined(PLAIN_SCROLLBAR)
80 if (scrollBar.style == R_SB_PLAIN) 77 if (scrollBar.style == R_SB_PLAIN)
81 { 78 {
82 scrollBar.beg = R_SCROLLBEG_XTERM; 79 scrollBar.beg = R_SCROLLBEG_XTERM;
… …
113 { 110 {
114 /* create the scrollbar window */ 111 /* create the scrollbar window */
115 scrollBar.win = XCreateSimpleWindow (dpy, 112 scrollBar.win = XCreateSimpleWindow (dpy,
116 parent[0], 113 parent[0],
117 window_sb_x, 0, 114 window_sb_x, 0,
118 scrollbar_TotalWidth (), 115 scrollBar.total_width (),
119 szHint.height, 116 szHint.height,
120 0, 117 0,
121 pix_colors[Color_fg], 118 pix_colors[Color_fg],
122 pix_colors[Color_border]); 119 pix_colors[Color_border]);
123 XDefineCursor (dpy, scrollBar.win, leftptr_cursor); 120 XDefineCursor (dpy, scrollBar.win, scrollBar.leftptr_cursor);
124 121
125 XSelectInput (dpy, scrollBar.win, 122 XSelectInput (dpy, scrollBar.win,
126 ExposureMask | ButtonPressMask | ButtonReleaseMask 123 ExposureMask | ButtonPressMask | ButtonReleaseMask
127 | Button1MotionMask | Button2MotionMask 124 | Button1MotionMask | Button2MotionMask
128 | Button3MotionMask); 125 | Button3MotionMask);
… …
133 130
134 scrollbar_show (1); 131 scrollbar_show (1);
135 132
136 if (delayed_init) 133 if (delayed_init)
137 XMapWindow (dpy, scrollBar.win); 134 XMapWindow (dpy, scrollBar.win);
138#endif
139} 135}
140 136
141/* 137/*
142 * Update current scrollbar view w.r.t. slider heights, etc. 138 * Update current scrollbar view w.r.t. slider heights, etc.
143 */ 139 */
144int 140int
145rxvt_term::scrollbar_show (int update) 141rxvt_term::scrollbar_show (int update)
146{ 142{
147 int ret = 0; 143 int ret = 0;
148#ifdef HAVE_SCROLLBARS
149 int top, bot, len, adj; 144 int top, bot, len, adj;
150 145
151 if (!scrollBar.state) 146 if (!scrollBar.state)
152 return 0; 147 return 0;
153 148
154 if (update) 149 if (update)
155 { 150 {
156 top = view_start - top_row; 151 top = view_start - top_row;
157 bot = top + (nrow - 1); 152 bot = top + (nrow - 1);
158 len = max (nrow - 1 - top_row, 1); 153 len = max (nrow - 1 - top_row, 1);
159 adj = (((bot - top) * scrollbar_size ()) % len) > 0 ? 1 : 0; 154 adj = (((bot - top) * scrollBar.size ()) % len) > 0 ? 1 : 0;
160 155
161 scrollBar.top = (scrollBar.beg + (top * scrollbar_size ()) / len); 156 scrollBar.top = (scrollBar.beg + (top * scrollBar.size ()) / len);
162 scrollbar_len = ((bot - top) * scrollbar_size ()) / len + 157 scrollBar.len = ((bot - top) * scrollBar.size ()) / len +
163 scrollbar_minheight () + adj; 158 scrollBar.min_height () + adj;
164 scrollBar.bot = (scrollBar.top + scrollbar_len); 159 scrollBar.bot = (scrollBar.top + scrollBar.len);
165 /* no change */ 160 /* no change */
166 if (scrollBar.top == last_top 161 if (scrollBar.top == scrollBar.last_top
167 && scrollBar.bot == last_bot 162 && scrollBar.bot == scrollBar.last_bot
168 && (scrollBar.state == last_state || !scrollbar_isUpDn ())) 163 && (scrollBar.state == scrollBar.last_state
164 || !(scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)))
169 return 0; 165 return 0;
170 } 166 }
171 167
172 ret = (this->*scrollBar.update) (update, last_top, last_bot, scrollbar_len); 168 ret = (this->*scrollBar.update) (update, scrollBar.last_top, scrollBar.last_bot, scrollBar.len);
173 169
174 last_top = scrollBar.top; 170 scrollBar.last_top = scrollBar.top;
175 last_bot = scrollBar.bot; 171 scrollBar.last_bot = scrollBar.bot;
176 last_state = scrollBar.state; 172 scrollBar.last_state = scrollBar.state;
177#endif
178 173
179 return ret; 174 return ret;
180} 175}
181 176
182void 177void
183rxvt_term::setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness) 178scrollBar_t::setup (rxvt_term *term)
184{ 179{
185#ifdef HAVE_SCROLLBARS
186 int i; 180 int i;
187 short style, width; 181 short style, width;
182 const char *scrollalign, *scrollstyle, *thickness;
183
184 this->term = term;
185 scrollalign = term->rs[Rs_scrollBar_align];
186 scrollstyle = term->rs[Rs_scrollstyle];
187 thickness = term->rs[Rs_scrollBar_thickness];
188 188
189# if defined(RXVT_SCROLLBAR) 189# if defined(RXVT_SCROLLBAR)
190 style = R_SB_RXVT; 190 style = R_SB_RXVT;
191# elif defined(XTERM_SCROLLBAR) 191# elif defined(XTERM_SCROLLBAR)
192 style = R_SB_XTERM; 192 style = R_SB_XTERM;
… …
228 if (style != R_SB_NEXT) /* dishonour request - for now */ 228 if (style != R_SB_NEXT) /* dishonour request - for now */
229 if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM) 229 if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM)
230 width = min (i, SB_WIDTH_MAXIMUM); 230 width = min (i, SB_WIDTH_MAXIMUM);
231 231
232# ifdef RXVT_SCROLLBAR 232# ifdef RXVT_SCROLLBAR
233 if (! option (Opt_scrollBar_floating) && style == R_SB_RXVT) 233 if (! term->option (Opt_scrollBar_floating) && style == R_SB_RXVT)
234 sb_shadow = SHADOW_WIDTH; 234 shadow = SHADOW_WIDTH;
235# endif 235# endif
236 236
237 scrollBar.style = style; 237 this->style = style;
238 scrollBar.width = width; 238 this->width = width;
239 239
240 /* scrollbar_align = R_SB_ALIGN_CENTRE; */ 240 /* align = R_SB_ALIGN_CENTRE; */
241 if (scrollalign) 241 if (scrollalign)
242 { 242 {
243 if (strncasecmp (scrollalign, "top", 3) == 0) 243 if (strncasecmp (scrollalign, "top", 3) == 0)
244 scrollbar_align = R_SB_ALIGN_TOP; 244 align = R_SB_ALIGN_TOP;
245 else if (strncasecmp (scrollalign, "bottom", 6) == 0) 245 else if (strncasecmp (scrollalign, "bottom", 6) == 0)
246 scrollbar_align = R_SB_ALIGN_BOTTOM; 246 align = R_SB_ALIGN_BOTTOM;
247 } 247 }
248#endif 248 last_bot = last_state = -1;
249 /* cursor scrollBar: Black-on-White */
250 leftptr_cursor = XCreateFontCursor (term->dpy, XC_left_ptr);
249} 251}
250 252
251/*----------------------- end-of-file (C source) -----------------------*/ 253/*----------------------- end-of-file (C source) -----------------------*/
252 254

Diff Legend

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