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.26 by root, Sun Dec 18 00:59:42 2005 UTC vs.
Revision 1.39 by root, Tue May 1 21:30:01 2007 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.
… …
32 * Map or unmap a scrollbar. Returns non-zero upon change of state 32 * Map or unmap a scrollbar. Returns non-zero upon change of state
33 */ 33 */
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 39#ifdef HAVE_SCROLLBARS
40 if (map) 40 if (map)
41 { 41 {
42 scrollBar.setIdle (); 42 scrollBar.setIdle ();
… …
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 (display->display, 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 (display->display, scrollBar.win); 56 XUnmapWindow (dpy, scrollBar.win);
57 change = 1; 57 change = 1;
58 } 58 }
59#endif 59#endif
60
60 return change; 61 return change;
61} 62}
62 63
63void 64void
64rxvt_term::resize_scrollbar () 65rxvt_term::resize_scrollbar ()
… …
109#endif 110#endif
110 111
111 if (!scrollBar.win) 112 if (!scrollBar.win)
112 { 113 {
113 /* create the scrollbar window */ 114 /* create the scrollbar window */
114 scrollBar.win = XCreateSimpleWindow (display->display, 115 scrollBar.win = XCreateSimpleWindow (dpy,
115 parent[0], 116 parent[0],
116 window_sb_x, 0, 117 window_sb_x, 0,
117 scrollbar_TotalWidth (), 118 scrollbar_TotalWidth (),
118 szHint.height, 119 szHint.height,
119 0, 120 0,
120 pix_colors[Color_fg], 121 pix_colors[Color_fg],
121 pix_colors[Color_border]); 122 pix_colors[Color_border]);
122#ifdef DEBUG_X
123 XStoreName (display->display, scrollBar.win, "scrollbar");
124#endif
125 XDefineCursor (display->display, scrollBar.win, leftptr_cursor); 123 XDefineCursor (dpy, scrollBar.win, leftptr_cursor);
126 124
127 XSelectInput (display->display, scrollBar.win, 125 XSelectInput (dpy, scrollBar.win,
128 ExposureMask | ButtonPressMask | ButtonReleaseMask 126 ExposureMask | ButtonPressMask | ButtonReleaseMask
129 | Button1MotionMask | Button2MotionMask 127 | Button1MotionMask | Button2MotionMask
130 | Button3MotionMask); 128 | Button3MotionMask);
131 scrollbar_ev.start (display, scrollBar.win); 129 scrollbar_ev.start (display, scrollBar.win);
132 130
… …
134 } 132 }
135 133
136 scrollbar_show (1); 134 scrollbar_show (1);
137 135
138 if (delayed_init) 136 if (delayed_init)
139 XMapWindow (display->display, scrollBar.win); 137 XMapWindow (dpy, scrollBar.win);
140#endif 138#endif
141} 139}
142 140
143/* 141/*
144 * Update current scrollbar view w.r.t. slider heights, etc. 142 * Update current scrollbar view w.r.t. slider heights, etc.
… …
148{ 146{
149 int ret = 0; 147 int ret = 0;
150#ifdef HAVE_SCROLLBARS 148#ifdef HAVE_SCROLLBARS
151 int top, bot, len, adj; 149 int top, bot, len, adj;
152 150
153 if (!scrollbar_visible ()) 151 if (!scrollBar.state)
154 return 0; 152 return 0;
155 153
156 if (update) 154 if (update)
157 { 155 {
158 top = nscrolled - view_start; 156 top = view_start - top_row;
159 bot = top + (nrow - 1); 157 bot = top + (nrow - 1);
160 len = max (nscrolled + (nrow - 1), 1); 158 len = max (nrow - 1 - top_row, 1);
161 adj = (((bot - top) * scrollbar_size ()) % len) > 0 ? 1 : 0; 159 adj = (((bot - top) * scrollbar_size ()) % len) > 0 ? 1 : 0;
162 160
163 scrollBar.top = (scrollBar.beg + (top * scrollbar_size ()) / len); 161 scrollBar.top = (scrollBar.beg + (top * scrollbar_size ()) / len);
164 scrollbar_len = ((bot - top) * scrollbar_size ()) / len + 162 scrollbar_len = ((bot - top) * scrollbar_size ()) / len +
165 scrollbar_minheight () + adj; 163 scrollbar_minheight () + adj;
… …
229 227
230 if (style != R_SB_NEXT) /* dishonour request - for now */ 228 if (style != R_SB_NEXT) /* dishonour request - for now */
231 if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM) 229 if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM)
232 width = min (i, SB_WIDTH_MAXIMUM); 230 width = min (i, SB_WIDTH_MAXIMUM);
233 231
234# if defined(RXVT_SCROLLBAR) 232# ifdef RXVT_SCROLLBAR
235 if (! (options & Opt_scrollBar_floating) && style == R_SB_RXVT) 233 if (! option (Opt_scrollBar_floating) && style == R_SB_RXVT)
236 sb_shadow = SHADOW; 234 sb_shadow = SHADOW_WIDTH;
237# endif 235# endif
238 236
239 scrollBar.style = style; 237 scrollBar.style = style;
240 scrollBar.width = width; 238 scrollBar.width = width;
241 239

Diff Legend

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