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.7 by pcg, Thu Dec 18 14:11:47 2003 UTC vs.
Revision 1.11 by pcg, Sat Jan 31 04:16:15 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: scrollbar.c 2 * File: scrollbar.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: scrollbar.C,v 1.7 2003/12/18 14:11:47 pcg Exp $
5 * 4 *
6 * Copyright (c) 1997,1998 mj olesen <olesen@me.QueensU.CA> 5 * Copyright (c) 1997,1998 mj olesen <olesen@me.QueensU.CA>
7 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 6 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
8 * - N*XTstep like scrollbars 7 * - N*XTstep like scrollbars
9 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com> 8 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com>
… …
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 */
35/* EXTPROTO */
36int 34int
37rxvt_scrollbar_mapping(pR_ int map) 35rxvt_term::scrollbar_mapping (int map)
38{ 36{
39 int change = 0; 37 int change = 0;
40 38
41#ifdef HAVE_SCROLLBARS 39#ifdef HAVE_SCROLLBARS
42 if (map && !scrollbar_visible(R)) { 40 if (map && !scrollbar_visible()) {
43 R->scrollBar.setIdle (); 41 scrollBar.setIdle ();
44 if (!R->scrollBar.win) 42 if (!scrollBar.win)
45 R->resize_scrollbar (); 43 resize_scrollbar ();
46 if (R->scrollBar.win) { 44 if (scrollBar.win) {
47 XMapWindow(R->Xdisplay, R->scrollBar.win); 45 XMapWindow(Xdisplay, scrollBar.win);
48 change = 1; 46 change = 1;
49 } 47 }
50 } else if (!map && scrollbar_visible(R)) { 48 } else if (!map && scrollbar_visible()) {
51 R->scrollBar.state = 0; 49 scrollBar.state = 0;
52 XUnmapWindow(R->Xdisplay, R->scrollBar.win); 50 XUnmapWindow(Xdisplay, scrollBar.win);
53 change = 1; 51 change = 1;
54 } 52 }
55#endif 53#endif
56 return change; 54 return change;
57} 55}
… …
69 SB_PADDING) 67 SB_PADDING)
70#define R_SCROLLBEG_RXVT (scrollBar.width + 1) + sb_shadow 68#define R_SCROLLBEG_RXVT (scrollBar.width + 1) + sb_shadow
71#define R_SCROLLEND_RXVT szHint.height - R_SCROLLBEG_RXVT - \ 69#define R_SCROLLEND_RXVT szHint.height - R_SCROLLBEG_RXVT - \
72 (2 * sb_shadow) 70 (2 * sb_shadow)
73 71
72#if defined(PLAIN_SCROLLBAR)
73 if (scrollBar.style == R_SB_PLAIN) {
74 scrollBar.beg = R_SCROLLBEG_XTERM;
75 scrollBar.end = R_SCROLLEND_XTERM;
76 scrollBar.update = &rxvt_term::scrollbar_show_plain;
77 }
78#endif
74#if defined(XTERM_SCROLLBAR) 79#if defined(XTERM_SCROLLBAR)
75 if (scrollBar.style == R_SB_XTERM) { 80 if (scrollBar.style == R_SB_XTERM) {
76 scrollBar.beg = R_SCROLLBEG_XTERM; 81 scrollBar.beg = R_SCROLLBEG_XTERM;
77 scrollBar.end = R_SCROLLEND_XTERM; 82 scrollBar.end = R_SCROLLEND_XTERM;
78 scrollBar.update = rxvt_scrollbar_show_xterm; 83 scrollBar.update = &rxvt_term::scrollbar_show_xterm;
79 } 84 }
80#endif 85#endif
81#if defined(NEXT_SCROLLBAR) 86#if defined(NEXT_SCROLLBAR)
82 if (scrollBar.style == R_SB_NEXT) { 87 if (scrollBar.style == R_SB_NEXT) {
83 scrollBar.beg = R_SCROLLBEG_NEXT; 88 scrollBar.beg = R_SCROLLBEG_NEXT;
84 scrollBar.end = R_SCROLLEND_NEXT; 89 scrollBar.end = R_SCROLLEND_NEXT;
85 scrollBar.update = rxvt_scrollbar_show_next; 90 scrollBar.update = &rxvt_term::scrollbar_show_next;
86 } 91 }
87#endif 92#endif
88#if defined(RXVT_SCROLLBAR) 93#if defined(RXVT_SCROLLBAR)
89 if (scrollBar.style == R_SB_RXVT) { 94 if (scrollBar.style == R_SB_RXVT) {
90 scrollBar.beg = R_SCROLLBEG_RXVT; 95 scrollBar.beg = R_SCROLLBEG_RXVT;
91 scrollBar.end = R_SCROLLEND_RXVT; 96 scrollBar.end = R_SCROLLEND_RXVT;
92 scrollBar.update = rxvt_scrollbar_show_rxvt; 97 scrollBar.update = &rxvt_term::scrollbar_show_rxvt;
93 } 98 }
94#endif 99#endif
95 100
96 if (!scrollBar.win) { 101 if (!scrollBar.win) {
97/* create the scrollbar window */ 102/* create the scrollbar window */
… …
111 (ExposureMask | ButtonPressMask | ButtonReleaseMask 116 (ExposureMask | ButtonPressMask | ButtonReleaseMask
112 | Button1MotionMask | Button2MotionMask 117 | Button1MotionMask | Button2MotionMask
113 | Button3MotionMask)); 118 | Button3MotionMask));
114 delayed_init = 1; 119 delayed_init = 1;
115 } 120 }
116 rxvt_scrollbar_show (this, 1); 121 scrollbar_show (1);
117 if (delayed_init) 122 if (delayed_init)
118 XMapWindow (Xdisplay, scrollBar.win); 123 XMapWindow (Xdisplay, scrollBar.win);
119#endif 124#endif
120} 125}
121 126
122/* 127/*
123 * Update current scrollbar view w.r.t. slider heights, etc. 128 * Update current scrollbar view w.r.t. slider heights, etc.
124 */ 129 */
125/* EXTPROTO */
126int 130int
127rxvt_scrollbar_show(pR_ int update) 131rxvt_term::scrollbar_show (int update)
128{ 132{
129 int ret = 0; 133 int ret = 0;
130#ifdef HAVE_SCROLLBARS 134#ifdef HAVE_SCROLLBARS
131 int top, bot, len, adj; 135 int top, bot, len, adj;
132 136
133 if (!scrollbar_visible(R)) 137 if (!scrollbar_visible())
134 return 0; 138 return 0;
135 139
136 if (update) { 140 if (update) {
137 top = (R->TermWin.nscrolled - R->TermWin.view_start); 141 top = (TermWin.nscrolled - TermWin.view_start);
138 bot = top + (R->TermWin.nrow - 1); 142 bot = top + (TermWin.nrow - 1);
139 len = max((R->TermWin.nscrolled + (R->TermWin.nrow - 1)), 1); 143 len = max((TermWin.nscrolled + (TermWin.nrow - 1)), 1);
140 adj = (((bot - top) * scrollbar_size()) % len) > 0 ? 1 : 0; 144 adj = (((bot - top) * scrollbar_size()) % len) > 0 ? 1 : 0;
141 145
142 R->scrollBar.top = (R->scrollBar.beg + (top * scrollbar_size()) / len); 146 scrollBar.top = (scrollBar.beg + (top * scrollbar_size()) / len);
143 R->scrollbar_len = ((bot - top) * scrollbar_size()) / len + 147 scrollbar_len = ((bot - top) * scrollbar_size()) / len +
144 scrollbar_minheight() + adj; 148 scrollbar_minheight() + adj;
145 R->scrollBar.bot = (R->scrollBar.top + R->scrollbar_len); 149 scrollBar.bot = (scrollBar.top + scrollbar_len);
146 /* no change */ 150 /* no change */
147 if (R->scrollBar.top == R->last_top 151 if (scrollBar.top == last_top
148 && R->scrollBar.bot == R->last_bot 152 && scrollBar.bot == last_bot
149 && (R->scrollBar.state == R->last_state || !scrollbar_isUpDn())) 153 && (scrollBar.state == last_state || !scrollbar_isUpDn()))
150 return 0; 154 return 0;
151 } 155 }
152 156
153 ret = R->scrollBar.update(aR_ update, R->last_top, R->last_bot, 157 ret = (this->*scrollBar.update) (update, last_top, last_bot, scrollbar_len);
154 R->scrollbar_len);
155 158
156 R->last_top = R->scrollBar.top; 159 last_top = scrollBar.top;
157 R->last_bot = R->scrollBar.bot; 160 last_bot = scrollBar.bot;
158 R->last_state = R->scrollBar.state; 161 last_state = scrollBar.state;
159#endif 162#endif
160 163
161 return ret; 164 return ret;
162} 165}
163 166
164/* EXTPROTO */
165void 167void
166rxvt_setup_scrollbar(pR_ const char *scrollalign, const char *scrollstyle, const char *thickness) 168rxvt_term::setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness)
167{ 169{
168#ifdef HAVE_SCROLLBARS 170#ifdef HAVE_SCROLLBARS
169 int i; 171 int i;
170 short style, width; 172 short style, width;
171 173
172# if defined(RXVT_SCROLLBAR) || !(defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)) 174# if defined(RXVT_SCROLLBAR)
173 style = R_SB_RXVT; 175 style = R_SB_RXVT;
174# else 176# elif defined(XTERM_SCROLLBAR)
177 style = R_SB_XTERM;
175# ifdef NEXT_SCROLLBAR 178# elif defined(NEXT_SCROLLBAR)
176 style = R_SB_NEXT; 179 style = R_SB_NEXT;
177# elif defined(XTERM_SCROLLBAR) 180# elif defined(PLAIN_SCROLLBAR)
181 style = R_SB_PLAIN;
182#else
178 style = R_SB_XTERM; 183 style = R_SB_RXVT;
179# endif
180# endif 184# endif
181 185
182# if (defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)) 186# if (defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR))
183 if (scrollstyle) { 187 if (scrollstyle) {
184# ifdef NEXT_SCROLLBAR 188# ifdef NEXT_SCROLLBAR
185 if (STRNCASECMP(scrollstyle, "next", 4) == 0) 189 if (STRNCASECMP(scrollstyle, "next", 4) == 0)
186 style = R_SB_NEXT; 190 style = R_SB_NEXT;
187# endif 191# endif
188# ifdef XTERM_SCROLLBAR 192# ifdef XTERM_SCROLLBAR
189 if (STRNCASECMP(scrollstyle, "xterm", 5) == 0) 193 if (STRNCASECMP(scrollstyle, "xterm", 5) == 0)
190 style = R_SB_XTERM; 194 style = R_SB_XTERM;
191# endif 195# endif
196# ifdef PLAIN_SCROLLBAR
197 if (STRNCASECMP(scrollstyle, "plain", 5) == 0)
198 style = R_SB_PLAIN;
199# endif
192 } 200 }
193# endif 201# endif
194 if (style == R_SB_NEXT) 202 if (style == R_SB_NEXT)
195 width = SB_WIDTH_NEXT; 203 width = SB_WIDTH_NEXT;
196 else if (style == R_SB_XTERM) 204 else if (style == R_SB_XTERM)
197 width = SB_WIDTH_XTERM; 205 width = SB_WIDTH_XTERM;
206 else if (style == R_SB_PLAIN)
207 width = SB_WIDTH_PLAIN;
198 else /* if (style == R_SB_RXVT) */ 208 else /* if (style == R_SB_RXVT) */
199 width = SB_WIDTH_RXVT; 209 width = SB_WIDTH_RXVT;
200 210
201 if (style != R_SB_NEXT) /* dishonour request - for now */ 211 if (style != R_SB_NEXT) /* dishonour request - for now */
202 if (thickness && (i = atoi(thickness)) >= SB_WIDTH_MINIMUM) 212 if (thickness && (i = atoi(thickness)) >= SB_WIDTH_MINIMUM)
203 width = min(i, SB_WIDTH_MAXIMUM); 213 width = min(i, SB_WIDTH_MAXIMUM);
204 214
205# if defined(RXVT_SCROLLBAR) 215# if defined(RXVT_SCROLLBAR)
206 if (!(R->Options & Opt_scrollBar_floating) && style == R_SB_RXVT) 216 if (!(Options & Opt_scrollBar_floating) && style == R_SB_RXVT)
207 R->sb_shadow = SHADOW; 217 sb_shadow = SHADOW;
208# endif 218# endif
209 219
210 R->scrollBar.style = style; 220 scrollBar.style = style;
211 R->scrollBar.width = width; 221 scrollBar.width = width;
212 222
213 /* R->scrollbar_align = R_SB_ALIGN_CENTRE; */ 223 /* scrollbar_align = R_SB_ALIGN_CENTRE; */
214 if (scrollalign) { 224 if (scrollalign) {
215 if (STRNCASECMP(scrollalign, "top", 3) == 0) 225 if (STRNCASECMP(scrollalign, "top", 3) == 0)
216 R->scrollbar_align = R_SB_ALIGN_TOP; 226 scrollbar_align = R_SB_ALIGN_TOP;
217 else if (STRNCASECMP(scrollalign, "bottom", 6) == 0) 227 else if (STRNCASECMP(scrollalign, "bottom", 6) == 0)
218 R->scrollbar_align = R_SB_ALIGN_BOTTOM; 228 scrollbar_align = R_SB_ALIGN_BOTTOM;
219 } 229 }
220#endif 230#endif
221} 231}
222 232
223/*----------------------- end-of-file (C source) -----------------------*/ 233/*----------------------- end-of-file (C source) -----------------------*/
234

Diff Legend

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