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.12 by pcg, Sun Feb 1 01:34:41 2004 UTC vs.
Revision 1.15 by pcg, Thu Apr 8 20:31:45 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
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 * 10 *
10 * 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
11 * 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
12 * the Free Software Foundation; either version 2 of the License, or 13 * the Free Software Foundation; either version 2 of the License, or
13 * (at your option) any later version. 14 * (at your option) any later version.
… …
35rxvt_term::scrollbar_mapping (int map) 36rxvt_term::scrollbar_mapping (int map)
36{ 37{
37 int change = 0; 38 int change = 0;
38 39
39#ifdef HAVE_SCROLLBARS 40#ifdef HAVE_SCROLLBARS
40 if (map && !scrollbar_visible()) 41 if (map && !scrollbar_visible ())
41 { 42 {
42 scrollBar.setIdle (); 43 scrollBar.setIdle ();
43 if (!scrollBar.win) 44 if (!scrollBar.win)
44 resize_scrollbar (); 45 resize_scrollbar ();
45 if (scrollBar.win) 46 if (scrollBar.win)
46 { 47 {
47 XMapWindow(Xdisplay, scrollBar.win); 48 XMapWindow (display->display, scrollBar.win);
48 change = 1; 49 change = 1;
49 } 50 }
50 } 51 }
51 else if (!map && scrollbar_visible()) 52 else if (!map && scrollbar_visible ())
52 { 53 {
53 scrollBar.state = 0; 54 scrollBar.state = 0;
54 XUnmapWindow(Xdisplay, scrollBar.win); 55 XUnmapWindow (display->display, scrollBar.win);
55 change = 1; 56 change = 1;
56 } 57 }
57#endif 58#endif
58 return change; 59 return change;
59} 60}
… …
107#endif 108#endif
108 109
109 if (!scrollBar.win) 110 if (!scrollBar.win)
110 { 111 {
111 /* create the scrollbar window */ 112 /* create the scrollbar window */
112 scrollBar.win = XCreateSimpleWindow(Xdisplay, 113 scrollBar.win = XCreateSimpleWindow (display->display,
113 TermWin.parent[0], 114 TermWin.parent[0],
114 window_sb_x, 0, 115 window_sb_x, 0,
115 scrollbar_TotalWidth(), 116 scrollbar_TotalWidth (),
116 szHint.height, 117 szHint.height,
117 0, 118 0,
118 PixColors[Color_fg], 119 PixColors[Color_fg],
119 PixColors[Color_bg]); 120 PixColors[Color_bg]);
120#ifdef DEBUG_X 121#ifdef DEBUG_X
121 XStoreName(Xdisplay, scrollBar.win, "scrollbar"); 122 XStoreName (display->display, scrollBar.win, "scrollbar");
122#endif 123#endif
123 XDefineCursor(Xdisplay, scrollBar.win, leftptr_cursor); 124 XDefineCursor (display->display, scrollBar.win, leftptr_cursor);
125
124 XSelectInput(Xdisplay, scrollBar.win, 126 XSelectInput (display->display, scrollBar.win,
125 (ExposureMask | ButtonPressMask | ButtonReleaseMask 127 ExposureMask | ButtonPressMask | ButtonReleaseMask
126 | Button1MotionMask | Button2MotionMask 128 | Button1MotionMask | Button2MotionMask
127 | Button3MotionMask)); 129 | Button3MotionMask);
130 scrollbar_ev.start (display, scrollBar.win);
131
128 delayed_init = 1; 132 delayed_init = 1;
129 } 133 }
134
130 scrollbar_show (1); 135 scrollbar_show (1);
136
131 if (delayed_init) 137 if (delayed_init)
132 XMapWindow (Xdisplay, scrollBar.win); 138 XMapWindow (display->display, scrollBar.win);
133#endif 139#endif
134} 140}
135 141
136/* 142/*
137 * Update current scrollbar view w.r.t. slider heights, etc. 143 * Update current scrollbar view w.r.t. slider heights, etc.
… …
141{ 147{
142 int ret = 0; 148 int ret = 0;
143#ifdef HAVE_SCROLLBARS 149#ifdef HAVE_SCROLLBARS
144 int top, bot, len, adj; 150 int top, bot, len, adj;
145 151
146 if (!scrollbar_visible()) 152 if (!scrollbar_visible ())
147 return 0; 153 return 0;
148 154
149 if (update) 155 if (update)
150 { 156 {
151 top = (TermWin.nscrolled - TermWin.view_start); 157 top = (TermWin.nscrolled - TermWin.view_start);
152 bot = top + (TermWin.nrow - 1); 158 bot = top + (TermWin.nrow - 1);
153 len = max((TermWin.nscrolled + (TermWin.nrow - 1)), 1); 159 len = max ((TermWin.nscrolled + (TermWin.nrow - 1)), 1);
154 adj = (((bot - top) * scrollbar_size()) % len) > 0 ? 1 : 0; 160 adj = (((bot - top) * scrollbar_size ()) % len) > 0 ? 1 : 0;
155 161
156 scrollBar.top = (scrollBar.beg + (top * scrollbar_size()) / len); 162 scrollBar.top = (scrollBar.beg + (top * scrollbar_size ()) / len);
157 scrollbar_len = ((bot - top) * scrollbar_size()) / len + 163 scrollbar_len = ((bot - top) * scrollbar_size ()) / len +
158 scrollbar_minheight() + adj; 164 scrollbar_minheight () + adj;
159 scrollBar.bot = (scrollBar.top + scrollbar_len); 165 scrollBar.bot = (scrollBar.top + scrollbar_len);
160 /* no change */ 166 /* no change */
161 if (scrollBar.top == last_top 167 if (scrollBar.top == last_top
162 && scrollBar.bot == last_bot 168 && scrollBar.bot == last_bot
163 && (scrollBar.state == last_state || !scrollbar_isUpDn())) 169 && (scrollBar.state == last_state || !scrollbar_isUpDn ()))
164 return 0; 170 return 0;
165 } 171 }
166 172
167 ret = (this->*scrollBar.update) (update, last_top, last_bot, scrollbar_len); 173 ret = (this->*scrollBar.update) (update, last_top, last_bot, scrollbar_len);
168 174
… …
195 201
196# if (defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)) 202# if (defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR))
197 if (scrollstyle) 203 if (scrollstyle)
198 { 204 {
199# ifdef NEXT_SCROLLBAR 205# ifdef NEXT_SCROLLBAR
200 if (STRNCASECMP(scrollstyle, "next", 4) == 0) 206 if (STRNCASECMP (scrollstyle, "next", 4) == 0)
201 style = R_SB_NEXT; 207 style = R_SB_NEXT;
202# endif 208# endif
203# ifdef XTERM_SCROLLBAR 209# ifdef XTERM_SCROLLBAR
204 if (STRNCASECMP(scrollstyle, "xterm", 5) == 0) 210 if (STRNCASECMP (scrollstyle, "xterm", 5) == 0)
205 style = R_SB_XTERM; 211 style = R_SB_XTERM;
206# endif 212# endif
207# ifdef PLAIN_SCROLLBAR 213# ifdef PLAIN_SCROLLBAR
208 if (STRNCASECMP(scrollstyle, "plain", 5) == 0) 214 if (STRNCASECMP (scrollstyle, "plain", 5) == 0)
209 style = R_SB_PLAIN; 215 style = R_SB_PLAIN;
210# endif 216# endif
211 217
212 } 218 }
213# endif 219# endif
… …
219 width = SB_WIDTH_PLAIN; 225 width = SB_WIDTH_PLAIN;
220 else /* if (style == R_SB_RXVT) */ 226 else /* if (style == R_SB_RXVT) */
221 width = SB_WIDTH_RXVT; 227 width = SB_WIDTH_RXVT;
222 228
223 if (style != R_SB_NEXT) /* dishonour request - for now */ 229 if (style != R_SB_NEXT) /* dishonour request - for now */
224 if (thickness && (i = atoi(thickness)) >= SB_WIDTH_MINIMUM) 230 if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM)
225 width = min(i, SB_WIDTH_MAXIMUM); 231 width = min (i, SB_WIDTH_MAXIMUM);
226 232
227# if defined(RXVT_SCROLLBAR) 233# if defined(RXVT_SCROLLBAR)
228 if (!(Options & Opt_scrollBar_floating) && style == R_SB_RXVT) 234 if (! (Options & Opt_scrollBar_floating) && style == R_SB_RXVT)
229 sb_shadow = SHADOW; 235 sb_shadow = SHADOW;
230# endif 236# endif
231 237
232 scrollBar.style = style; 238 scrollBar.style = style;
233 scrollBar.width = width; 239 scrollBar.width = width;
234 240
235 /* scrollbar_align = R_SB_ALIGN_CENTRE; */ 241 /* scrollbar_align = R_SB_ALIGN_CENTRE; */
236 if (scrollalign) 242 if (scrollalign)
237 { 243 {
238 if (STRNCASECMP(scrollalign, "top", 3) == 0) 244 if (STRNCASECMP (scrollalign, "top", 3) == 0)
239 scrollbar_align = R_SB_ALIGN_TOP; 245 scrollbar_align = R_SB_ALIGN_TOP;
240 else if (STRNCASECMP(scrollalign, "bottom", 6) == 0) 246 else if (STRNCASECMP (scrollalign, "bottom", 6) == 0)
241 scrollbar_align = R_SB_ALIGN_BOTTOM; 247 scrollbar_align = R_SB_ALIGN_BOTTOM;
242 } 248 }
243#endif 249#endif
244} 250}
245 251

Diff Legend

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