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.47 by ayin, Fri Jan 4 17:57:28 2008 UTC vs.
Revision 1.49 by ayin, Tue Jan 29 13:57:23 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
… …
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
… …
163 scrollbar_minheight () + adj; 158 scrollbar_minheight () + 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 == scrollBar.last_top 161 if (scrollBar.top == scrollBar.last_top
167 && scrollBar.bot == scrollBar.last_bot 162 && scrollBar.bot == scrollBar.last_bot
168 && (scrollBar.state == scrollBar.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, scrollBar.last_top, scrollBar.last_bot, scrollBar.len); 168 ret = (this->*scrollBar.update) (update, scrollBar.last_top, scrollBar.last_bot, scrollBar.len);
173 169
174 scrollBar.last_top = scrollBar.top; 170 scrollBar.last_top = scrollBar.top;
175 scrollBar.last_bot = scrollBar.bot; 171 scrollBar.last_bot = scrollBar.bot;
176 scrollBar.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) 178rxvt_term::setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness)
184{ 179{
185#ifdef HAVE_SCROLLBARS
186 int i; 180 int i;
187 short style, width; 181 short style, width;
188 182
189# if defined(RXVT_SCROLLBAR) 183# if defined(RXVT_SCROLLBAR)
190 style = R_SB_RXVT; 184 style = R_SB_RXVT;
… …
246 scrollBar.align = R_SB_ALIGN_BOTTOM; 240 scrollBar.align = R_SB_ALIGN_BOTTOM;
247 } 241 }
248 scrollBar.last_bot = scrollBar.last_state = -1; 242 scrollBar.last_bot = scrollBar.last_state = -1;
249 /* cursor scrollBar: Black-on-White */ 243 /* cursor scrollBar: Black-on-White */
250 scrollBar.leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr); 244 scrollBar.leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
251#endif
252} 245}
253 246
254/*----------------------- end-of-file (C source) -----------------------*/ 247/*----------------------- end-of-file (C source) -----------------------*/
255 248

Diff Legend

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