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.41 by ayin, Sat Dec 29 14:40:09 2007 UTC vs.
Revision 1.54 by ayin, Sun Feb 17 12:21:45 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) + scrollBar.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 * scrollBar.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;
150 int scrollbar_len = 0;
151 144
152 if (!scrollBar.state) 145 if (!scrollBar.state)
153 return 0; 146 return 0;
154 147
155 if (update) 148 if (update)
156 { 149 {
157 top = view_start - top_row; 150 int top = view_start - top_row;
158 bot = top + (nrow - 1); 151 int bot = top + (nrow - 1);
159 len = max (nrow - 1 - top_row, 1); 152 int len = max (nrow - 1 - top_row, 1);
160 adj = (((bot - top) * scrollbar_size ()) % len) > 0 ? 1 : 0; 153 int adj = (((bot - top) * scrollBar.size ()) % len) > 0 ? 1 : 0;
161 154
162 scrollBar.top = (scrollBar.beg + (top * scrollbar_size ()) / len); 155 scrollBar.top = (scrollBar.beg + (top * scrollBar.size ()) / len);
163 scrollbar_len = ((bot - top) * scrollbar_size ()) / len + 156 scrollBar.len = ((bot - top) * scrollBar.size ()) / len +
164 scrollbar_minheight () + adj; 157 scrollBar.min_height () + adj;
165 scrollBar.bot = (scrollBar.top + scrollbar_len); 158 scrollBar.bot = (scrollBar.top + scrollBar.len);
166 /* no change */ 159 /* no change */
167 if (scrollBar.top == last_top 160 if (scrollBar.top == scrollBar.last_top
168 && scrollBar.bot == last_bot 161 && scrollBar.bot == scrollBar.last_bot
169 && (scrollBar.state == last_state || !scrollbar_isUpDn ())) 162 && (scrollBar.state == scrollBar.last_state
163 || !(scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)))
170 return 0; 164 return 0;
171 } 165 }
172 166
173 ret = (this->*scrollBar.update) (update, last_top, last_bot, scrollbar_len); 167 ret = (this->*scrollBar.update) (update, scrollBar.last_top, scrollBar.last_bot, scrollBar.len);
174 168
175 last_top = scrollBar.top; 169 scrollBar.last_top = scrollBar.top;
176 last_bot = scrollBar.bot; 170 scrollBar.last_bot = scrollBar.bot;
177 last_state = scrollBar.state; 171 scrollBar.last_state = scrollBar.state;
178#endif
179 172
180 return ret; 173 return ret;
181} 174}
182 175
183void 176void
184rxvt_term::setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness) 177scrollBar_t::setup (rxvt_term *term)
185{ 178{
186#ifdef HAVE_SCROLLBARS
187 int i; 179 int i;
188 short style, width; 180 short style, width;
181 const char *scrollalign, *scrollstyle, *thickness;
182
183 this->term = term;
184 scrollalign = term->rs[Rs_scrollBar_align];
185 scrollstyle = term->rs[Rs_scrollstyle];
186 thickness = term->rs[Rs_scrollBar_thickness];
189 187
190# if defined(RXVT_SCROLLBAR) 188# if defined(RXVT_SCROLLBAR)
191 style = R_SB_RXVT; 189 style = R_SB_RXVT;
192# elif defined(XTERM_SCROLLBAR) 190# elif defined(XTERM_SCROLLBAR)
193 style = R_SB_XTERM; 191 style = R_SB_XTERM;
… …
229 if (style != R_SB_NEXT) /* dishonour request - for now */ 227 if (style != R_SB_NEXT) /* dishonour request - for now */
230 if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM) 228 if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM)
231 width = min (i, SB_WIDTH_MAXIMUM); 229 width = min (i, SB_WIDTH_MAXIMUM);
232 230
233# ifdef RXVT_SCROLLBAR 231# ifdef RXVT_SCROLLBAR
234 if (! option (Opt_scrollBar_floating) && style == R_SB_RXVT) 232 if (! term->option (Opt_scrollBar_floating) && style == R_SB_RXVT)
235 scrollBar.sb_shadow = SHADOW_WIDTH; 233 shadow = SHADOW_WIDTH;
236# endif 234# endif
237 235
238 scrollBar.style = style; 236 this->style = style;
239 scrollBar.width = width; 237 this->width = width;
240 238
241 /* scrollbar_align = R_SB_ALIGN_CENTRE; */ 239 /* align = R_SB_ALIGN_CENTRE; */
242 if (scrollalign) 240 if (scrollalign)
243 { 241 {
244 if (strncasecmp (scrollalign, "top", 3) == 0) 242 if (strncasecmp (scrollalign, "top", 3) == 0)
245 scrollbar_align = R_SB_ALIGN_TOP; 243 align = R_SB_ALIGN_TOP;
246 else if (strncasecmp (scrollalign, "bottom", 6) == 0) 244 else if (strncasecmp (scrollalign, "bottom", 6) == 0)
247 scrollbar_align = R_SB_ALIGN_BOTTOM; 245 align = R_SB_ALIGN_BOTTOM;
248 } 246 }
249#endif 247 last_bot = last_state = -1;
248 /* cursor scrollBar: Black-on-White */
249 leftptr_cursor = XCreateFontCursor (term->dpy, XC_left_ptr);
250} 250}
251 251
252/*----------------------- end-of-file (C source) -----------------------*/ 252/*----------------------- end-of-file (C source) -----------------------*/
253 253

Diff Legend

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