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.35 by root, Tue Jan 31 20:07:18 2006 UTC vs.
Revision 1.46 by ayin, Wed Jan 2 08:24:39 2008 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: scrollbar.C 2 * File: scrollbar.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997,1998 mj olesen <olesen@me.QueensU.CA> 5 * Copyright (c) 1997,1998 mj olesen <olesen@me.QueensU.CA>
6 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 6 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
7 * - N*XTstep like scrollbars 7 * - N*XTstep like scrollbars
8 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com> 8 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com>
9 * Copyright (c) 2004 Marc Lehmann <pcg@goof.com> 9 * Copyright (c) 2004-2006 Marc Lehmann <pcg@goof.com>
10 * 10 *
11 * This program is free software; you can redistribute it and/or modify 11 * This program is free software; you can redistribute it and/or modify
12 * it under the terms of the GNU General Public License as published by 12 * it under the terms of the GNU General Public License as published by
13 * the Free Software Foundation; either version 2 of the License, or 13 * the Free Software Foundation; either version 2 of the License, or
14 * (at your option) any later version. 14 * (at your option) any later version.
… …
44 if (!scrollBar.win) 44 if (!scrollBar.win)
45 resize_scrollbar (); 45 resize_scrollbar ();
46 46
47 if (scrollBar.win) 47 if (scrollBar.win)
48 { 48 {
49 XMapWindow (xdisp, scrollBar.win); 49 XMapWindow (dpy, scrollBar.win);
50 change = 1; 50 change = 1;
51 } 51 }
52 } 52 }
53 else 53 else
54 { 54 {
55 scrollBar.state = 0; 55 scrollBar.state = 0;
56 XUnmapWindow (xdisp, scrollBar.win); 56 XUnmapWindow (dpy, scrollBar.win);
57 change = 1; 57 change = 1;
58 } 58 }
59#endif 59#endif
60 60
61 return change; 61 return change;
… …
70#define R_SCROLLBEG_XTERM 0 70#define R_SCROLLBEG_XTERM 0
71#define R_SCROLLEND_XTERM szHint.height 71#define R_SCROLLEND_XTERM szHint.height
72#define R_SCROLLBEG_NEXT 0 72#define R_SCROLLBEG_NEXT 0
73#define R_SCROLLEND_NEXT szHint.height - (SB_BUTTON_TOTAL_HEIGHT + \ 73#define R_SCROLLEND_NEXT szHint.height - (SB_BUTTON_TOTAL_HEIGHT + \
74 SB_PADDING) 74 SB_PADDING)
75#define R_SCROLLBEG_RXVT (scrollBar.width + 1) + sb_shadow 75#define R_SCROLLBEG_RXVT (scrollBar.width + 1) + scrollBar.shadow
76#define R_SCROLLEND_RXVT szHint.height - R_SCROLLBEG_RXVT - \ 76#define R_SCROLLEND_RXVT szHint.height - R_SCROLLBEG_RXVT - \
77 (2 * sb_shadow) 77 (2 * scrollBar.shadow)
78 78
79#if defined(PLAIN_SCROLLBAR) 79#if defined(PLAIN_SCROLLBAR)
80 if (scrollBar.style == R_SB_PLAIN) 80 if (scrollBar.style == R_SB_PLAIN)
81 { 81 {
82 scrollBar.beg = R_SCROLLBEG_XTERM; 82 scrollBar.beg = R_SCROLLBEG_XTERM;
… …
110#endif 110#endif
111 111
112 if (!scrollBar.win) 112 if (!scrollBar.win)
113 { 113 {
114 /* create the scrollbar window */ 114 /* create the scrollbar window */
115 scrollBar.win = XCreateSimpleWindow (xdisp, 115 scrollBar.win = XCreateSimpleWindow (dpy,
116 parent[0], 116 parent[0],
117 window_sb_x, 0, 117 window_sb_x, 0,
118 scrollbar_TotalWidth (), 118 scrollbar_TotalWidth (),
119 szHint.height, 119 szHint.height,
120 0, 120 0,
121 pix_colors[Color_fg], 121 pix_colors[Color_fg],
122 pix_colors[Color_border]); 122 pix_colors[Color_border]);
123 XDefineCursor (xdisp, scrollBar.win, leftptr_cursor); 123 XDefineCursor (dpy, scrollBar.win, leftptr_cursor);
124 124
125 XSelectInput (xdisp, scrollBar.win, 125 XSelectInput (dpy, scrollBar.win,
126 ExposureMask | ButtonPressMask | ButtonReleaseMask 126 ExposureMask | ButtonPressMask | ButtonReleaseMask
127 | Button1MotionMask | Button2MotionMask 127 | Button1MotionMask | Button2MotionMask
128 | Button3MotionMask); 128 | Button3MotionMask);
129 scrollbar_ev.start (display, scrollBar.win); 129 scrollbar_ev.start (display, scrollBar.win);
130 130
… …
132 } 132 }
133 133
134 scrollbar_show (1); 134 scrollbar_show (1);
135 135
136 if (delayed_init) 136 if (delayed_init)
137 XMapWindow (xdisp, scrollBar.win); 137 XMapWindow (dpy, scrollBar.win);
138#endif 138#endif
139} 139}
140 140
141/* 141/*
142 * Update current scrollbar view w.r.t. slider heights, etc. 142 * Update current scrollbar view w.r.t. slider heights, etc.
… …
157 bot = top + (nrow - 1); 157 bot = top + (nrow - 1);
158 len = max (nrow - 1 - top_row, 1); 158 len = max (nrow - 1 - top_row, 1);
159 adj = (((bot - top) * scrollbar_size ()) % len) > 0 ? 1 : 0; 159 adj = (((bot - top) * scrollbar_size ()) % len) > 0 ? 1 : 0;
160 160
161 scrollBar.top = (scrollBar.beg + (top * scrollbar_size ()) / len); 161 scrollBar.top = (scrollBar.beg + (top * scrollbar_size ()) / len);
162 scrollbar_len = ((bot - top) * scrollbar_size ()) / len + 162 scrollBar.len = ((bot - top) * scrollbar_size ()) / len +
163 scrollbar_minheight () + adj; 163 scrollbar_minheight () + adj;
164 scrollBar.bot = (scrollBar.top + scrollbar_len); 164 scrollBar.bot = (scrollBar.top + scrollBar.len);
165 /* no change */ 165 /* no change */
166 if (scrollBar.top == last_top 166 if (scrollBar.top == scrollBar.last_top
167 && scrollBar.bot == last_bot 167 && scrollBar.bot == scrollBar.last_bot
168 && (scrollBar.state == last_state || !scrollbar_isUpDn ())) 168 && (scrollBar.state == scrollBar.last_state || !scrollbar_isUpDn ()))
169 return 0; 169 return 0;
170 } 170 }
171 171
172 ret = (this->*scrollBar.update) (update, last_top, last_bot, scrollbar_len); 172 ret = (this->*scrollBar.update) (update, scrollBar.last_top, scrollBar.last_bot, scrollBar.len);
173 173
174 last_top = scrollBar.top; 174 scrollBar.last_top = scrollBar.top;
175 last_bot = scrollBar.bot; 175 scrollBar.last_bot = scrollBar.bot;
176 last_state = scrollBar.state; 176 scrollBar.last_state = scrollBar.state;
177#endif 177#endif
178 178
179 return ret; 179 return ret;
180} 180}
181 181
… …
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 (! option (Opt_scrollBar_floating) && style == R_SB_RXVT)
234 sb_shadow = SHADOW_WIDTH; 234 scrollBar.shadow = SHADOW_WIDTH;
235# endif 235# endif
236 236
237 scrollBar.style = style; 237 scrollBar.style = style;
238 scrollBar.width = width; 238 scrollBar.width = width;
239 239
240 /* scrollbar_align = R_SB_ALIGN_CENTRE; */ 240 /* scrollBar.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 scrollBar.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 scrollBar.align = R_SB_ALIGN_BOTTOM;
247 } 247 }
248 scrollBar.last_bot = scrollBar.last_state = -1;
248#endif 249#endif
249} 250}
250 251
251/*----------------------- end-of-file (C source) -----------------------*/ 252/*----------------------- end-of-file (C source) -----------------------*/
252 253

Diff Legend

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