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.15 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.48 by ayin, Sun Jan 27 22:48:33 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.
… …
23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
24 *----------------------------------------------------------------------*/ 24 *----------------------------------------------------------------------*/
25 25
26#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
27#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
28#include "scrollbar.intpro" /* PROTOS for internal routines */
29 28
30/*----------------------------------------------------------------------*/ 29/*----------------------------------------------------------------------*/
31 30
32/* 31/*
33 * 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
34 */ 33 */
35int 34int
36rxvt_term::scrollbar_mapping (int map) 35rxvt_term::scrollbar_mapping (int map)
37{ 36{
38 int change = 0; 37 int change = 0;
39 38
40#ifdef HAVE_SCROLLBARS 39 if (map)
41 if (map && !scrollbar_visible ())
42 { 40 {
43 scrollBar.setIdle (); 41 scrollBar.setIdle ();
42
44 if (!scrollBar.win) 43 if (!scrollBar.win)
45 resize_scrollbar (); 44 resize_scrollbar ();
45
46 if (scrollBar.win) 46 if (scrollBar.win)
47 { 47 {
48 XMapWindow (display->display, scrollBar.win); 48 XMapWindow (dpy, scrollBar.win);
49 change = 1; 49 change = 1;
50 } 50 }
51 } 51 }
52 else if (!map && scrollbar_visible ()) 52 else
53 { 53 {
54 scrollBar.state = 0; 54 scrollBar.state = 0;
55 XUnmapWindow (display->display, scrollBar.win); 55 XUnmapWindow (dpy, scrollBar.win);
56 change = 1; 56 change = 1;
57 } 57 }
58#endif 58
59 return change; 59 return change;
60} 60}
61 61
62void 62void
63rxvt_term::resize_scrollbar () 63rxvt_term::resize_scrollbar ()
64{ 64{
65#ifdef HAVE_SCROLLBARS
66 int delayed_init = 0; 65 int delayed_init = 0;
67 66
68#define R_SCROLLBEG_XTERM 0 67#define R_SCROLLBEG_XTERM 0
69#define R_SCROLLEND_XTERM szHint.height 68#define R_SCROLLEND_XTERM szHint.height
70#define R_SCROLLBEG_NEXT 0 69#define R_SCROLLBEG_NEXT 0
71#define R_SCROLLEND_NEXT szHint.height - (SB_BUTTON_TOTAL_HEIGHT + \ 70#define R_SCROLLEND_NEXT szHint.height - (SB_BUTTON_TOTAL_HEIGHT + \
72 SB_PADDING) 71 SB_PADDING)
73#define R_SCROLLBEG_RXVT (scrollBar.width + 1) + sb_shadow 72#define R_SCROLLBEG_RXVT (scrollBar.width + 1) + scrollBar.shadow
74#define R_SCROLLEND_RXVT szHint.height - R_SCROLLBEG_RXVT - \ 73#define R_SCROLLEND_RXVT szHint.height - R_SCROLLBEG_RXVT - \
75 (2 * sb_shadow) 74 (2 * scrollBar.shadow)
76 75
77#if defined(PLAIN_SCROLLBAR) 76#if defined(PLAIN_SCROLLBAR)
78 if (scrollBar.style == R_SB_PLAIN) 77 if (scrollBar.style == R_SB_PLAIN)
79 { 78 {
80 scrollBar.beg = R_SCROLLBEG_XTERM; 79 scrollBar.beg = R_SCROLLBEG_XTERM;
… …
108#endif 107#endif
109 108
110 if (!scrollBar.win) 109 if (!scrollBar.win)
111 { 110 {
112 /* create the scrollbar window */ 111 /* create the scrollbar window */
113 scrollBar.win = XCreateSimpleWindow (display->display, 112 scrollBar.win = XCreateSimpleWindow (dpy,
114 TermWin.parent[0], 113 parent[0],
115 window_sb_x, 0, 114 window_sb_x, 0,
116 scrollbar_TotalWidth (), 115 scrollbar_TotalWidth (),
117 szHint.height, 116 szHint.height,
118 0, 117 0,
119 PixColors[Color_fg], 118 pix_colors[Color_fg],
120 PixColors[Color_bg]); 119 pix_colors[Color_border]);
121#ifdef DEBUG_X
122 XStoreName (display->display, scrollBar.win, "scrollbar");
123#endif
124 XDefineCursor (display->display, scrollBar.win, leftptr_cursor); 120 XDefineCursor (dpy, scrollBar.win, scrollBar.leftptr_cursor);
125 121
126 XSelectInput (display->display, scrollBar.win, 122 XSelectInput (dpy, scrollBar.win,
127 ExposureMask | ButtonPressMask | ButtonReleaseMask 123 ExposureMask | ButtonPressMask | ButtonReleaseMask
128 | Button1MotionMask | Button2MotionMask 124 | Button1MotionMask | Button2MotionMask
129 | Button3MotionMask); 125 | Button3MotionMask);
130 scrollbar_ev.start (display, scrollBar.win); 126 scrollbar_ev.start (display, scrollBar.win);
131 127
… …
133 } 129 }
134 130
135 scrollbar_show (1); 131 scrollbar_show (1);
136 132
137 if (delayed_init) 133 if (delayed_init)
138 XMapWindow (display->display, scrollBar.win); 134 XMapWindow (dpy, scrollBar.win);
139#endif
140} 135}
141 136
142/* 137/*
143 * Update current scrollbar view w.r.t. slider heights, etc. 138 * Update current scrollbar view w.r.t. slider heights, etc.
144 */ 139 */
145int 140int
146rxvt_term::scrollbar_show (int update) 141rxvt_term::scrollbar_show (int update)
147{ 142{
148 int ret = 0; 143 int ret = 0;
149#ifdef HAVE_SCROLLBARS
150 int top, bot, len, adj; 144 int top, bot, len, adj;
151 145
152 if (!scrollbar_visible ()) 146 if (!scrollBar.state)
153 return 0; 147 return 0;
154 148
155 if (update) 149 if (update)
156 { 150 {
157 top = (TermWin.nscrolled - TermWin.view_start); 151 top = view_start - top_row;
158 bot = top + (TermWin.nrow - 1); 152 bot = top + (nrow - 1);
159 len = max ((TermWin.nscrolled + (TermWin.nrow - 1)), 1); 153 len = max (nrow - 1 - top_row, 1);
160 adj = (((bot - top) * scrollbar_size ()) % len) > 0 ? 1 : 0; 154 adj = (((bot - top) * scrollbar_size ()) % len) > 0 ? 1 : 0;
161 155
162 scrollBar.top = (scrollBar.beg + (top * scrollbar_size ()) / len); 156 scrollBar.top = (scrollBar.beg + (top * scrollbar_size ()) / len);
163 scrollbar_len = ((bot - top) * scrollbar_size ()) / len + 157 scrollBar.len = ((bot - top) * scrollbar_size ()) / len +
164 scrollbar_minheight () + adj; 158 scrollbar_minheight () + adj;
165 scrollBar.bot = (scrollBar.top + scrollbar_len); 159 scrollBar.bot = (scrollBar.top + scrollBar.len);
166 /* no change */ 160 /* no change */
167 if (scrollBar.top == last_top 161 if (scrollBar.top == scrollBar.last_top
168 && scrollBar.bot == last_bot 162 && scrollBar.bot == scrollBar.last_bot
169 && (scrollBar.state == last_state || !scrollbar_isUpDn ())) 163 && (scrollBar.state == scrollBar.last_state || !scrollbar_isUpDn ()))
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) 177rxvt_term::setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness)
185{ 178{
186#ifdef HAVE_SCROLLBARS
187 int i; 179 int i;
188 short style, width; 180 short style, width;
189 181
190# if defined(RXVT_SCROLLBAR) 182# if defined(RXVT_SCROLLBAR)
191 style = R_SB_RXVT; 183 style = R_SB_RXVT;
… …
201 193
202# if (defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)) 194# if (defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR))
203 if (scrollstyle) 195 if (scrollstyle)
204 { 196 {
205# ifdef NEXT_SCROLLBAR 197# ifdef NEXT_SCROLLBAR
206 if (STRNCASECMP (scrollstyle, "next", 4) == 0) 198 if (strncasecmp (scrollstyle, "next", 4) == 0)
207 style = R_SB_NEXT; 199 style = R_SB_NEXT;
208# endif 200# endif
209# ifdef XTERM_SCROLLBAR 201# ifdef XTERM_SCROLLBAR
210 if (STRNCASECMP (scrollstyle, "xterm", 5) == 0) 202 if (strncasecmp (scrollstyle, "xterm", 5) == 0)
211 style = R_SB_XTERM; 203 style = R_SB_XTERM;
212# endif 204# endif
213# ifdef PLAIN_SCROLLBAR 205# ifdef PLAIN_SCROLLBAR
214 if (STRNCASECMP (scrollstyle, "plain", 5) == 0) 206 if (strncasecmp (scrollstyle, "plain", 5) == 0)
215 style = R_SB_PLAIN; 207 style = R_SB_PLAIN;
216# endif 208# endif
217 209
218 } 210 }
219# endif 211# endif
… …
228 220
229 if (style != R_SB_NEXT) /* dishonour request - for now */ 221 if (style != R_SB_NEXT) /* dishonour request - for now */
230 if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM) 222 if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM)
231 width = min (i, SB_WIDTH_MAXIMUM); 223 width = min (i, SB_WIDTH_MAXIMUM);
232 224
233# if defined(RXVT_SCROLLBAR) 225# ifdef RXVT_SCROLLBAR
234 if (! (Options & Opt_scrollBar_floating) && style == R_SB_RXVT) 226 if (! option (Opt_scrollBar_floating) && style == R_SB_RXVT)
235 sb_shadow = SHADOW; 227 scrollBar.shadow = SHADOW_WIDTH;
236# endif 228# endif
237 229
238 scrollBar.style = style; 230 scrollBar.style = style;
239 scrollBar.width = width; 231 scrollBar.width = width;
240 232
241 /* scrollbar_align = R_SB_ALIGN_CENTRE; */ 233 /* scrollBar.align = R_SB_ALIGN_CENTRE; */
242 if (scrollalign) 234 if (scrollalign)
243 { 235 {
244 if (STRNCASECMP (scrollalign, "top", 3) == 0) 236 if (strncasecmp (scrollalign, "top", 3) == 0)
245 scrollbar_align = R_SB_ALIGN_TOP; 237 scrollBar.align = R_SB_ALIGN_TOP;
246 else if (STRNCASECMP (scrollalign, "bottom", 6) == 0) 238 else if (strncasecmp (scrollalign, "bottom", 6) == 0)
247 scrollbar_align = R_SB_ALIGN_BOTTOM; 239 scrollBar.align = R_SB_ALIGN_BOTTOM;
248 } 240 }
249#endif 241 scrollBar.last_bot = scrollBar.last_state = -1;
242 /* cursor scrollBar: Black-on-White */
243 scrollBar.leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
250} 244}
251 245
252/*----------------------- end-of-file (C source) -----------------------*/ 246/*----------------------- end-of-file (C source) -----------------------*/
253 247

Diff Legend

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