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.4 by pcg, Tue Nov 25 17:11:33 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.4 2003/11/25 17:11:33 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#ifdef HAVE_SCROLLBARS
41 38
39#ifdef HAVE_SCROLLBARS
42 if (map && !scrollbar_visible(R)) { 40 if (map && !scrollbar_visible()) {
43 scrollbar_setIdle(); 41 scrollBar.setIdle ();
44 if (!R->scrollBar.win) 42 if (!scrollBar.win)
45 rxvt_Resize_scrollBar(aR); 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}
58 56
59/* EXTPROTO */
60void 57void
61rxvt_Resize_scrollBar(pR) 58rxvt_term::resize_scrollbar ()
62{ 59{
63#ifdef HAVE_SCROLLBARS 60#ifdef HAVE_SCROLLBARS
64 int delayed_init = 0; 61 int delayed_init = 0;
65 62
66#define R_SCROLLBEG_XTERM 0 63#define R_SCROLLBEG_XTERM 0
67#define R_SCROLLEND_XTERM R->szHint.height 64#define R_SCROLLEND_XTERM szHint.height
68#define R_SCROLLBEG_NEXT 0 65#define R_SCROLLBEG_NEXT 0
69#define R_SCROLLEND_NEXT R->szHint.height - (SB_BUTTON_TOTAL_HEIGHT + \ 66#define R_SCROLLEND_NEXT szHint.height - (SB_BUTTON_TOTAL_HEIGHT + \
70 SB_PADDING) 67 SB_PADDING)
71#define R_SCROLLBEG_RXVT (R->scrollBar.width + 1) + R->sb_shadow 68#define R_SCROLLBEG_RXVT (scrollBar.width + 1) + sb_shadow
72#define R_SCROLLEND_RXVT R->szHint.height - R_SCROLLBEG_RXVT - \ 69#define R_SCROLLEND_RXVT szHint.height - R_SCROLLBEG_RXVT - \
73 (2 * R->sb_shadow) 70 (2 * sb_shadow)
74 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
75#if defined(XTERM_SCROLLBAR) 79#if defined(XTERM_SCROLLBAR)
76 if (R->scrollBar.style == R_SB_XTERM) { 80 if (scrollBar.style == R_SB_XTERM) {
77 R->scrollBar.beg = R_SCROLLBEG_XTERM; 81 scrollBar.beg = R_SCROLLBEG_XTERM;
78 R->scrollBar.end = R_SCROLLEND_XTERM; 82 scrollBar.end = R_SCROLLEND_XTERM;
79 R->scrollBar.update = rxvt_scrollbar_show_xterm; 83 scrollBar.update = &rxvt_term::scrollbar_show_xterm;
80 } 84 }
81#endif 85#endif
82#if defined(NEXT_SCROLLBAR) 86#if defined(NEXT_SCROLLBAR)
83 if (R->scrollBar.style == R_SB_NEXT) { 87 if (scrollBar.style == R_SB_NEXT) {
84 R->scrollBar.beg = R_SCROLLBEG_NEXT; 88 scrollBar.beg = R_SCROLLBEG_NEXT;
85 R->scrollBar.end = R_SCROLLEND_NEXT; 89 scrollBar.end = R_SCROLLEND_NEXT;
86 R->scrollBar.update = rxvt_scrollbar_show_next; 90 scrollBar.update = &rxvt_term::scrollbar_show_next;
87 } 91 }
88#endif 92#endif
89#if defined(RXVT_SCROLLBAR) 93#if defined(RXVT_SCROLLBAR)
90 if (R->scrollBar.style == R_SB_RXVT) { 94 if (scrollBar.style == R_SB_RXVT) {
91 R->scrollBar.beg = R_SCROLLBEG_RXVT; 95 scrollBar.beg = R_SCROLLBEG_RXVT;
92 R->scrollBar.end = R_SCROLLEND_RXVT; 96 scrollBar.end = R_SCROLLEND_RXVT;
93 R->scrollBar.update = rxvt_scrollbar_show_rxvt; 97 scrollBar.update = &rxvt_term::scrollbar_show_rxvt;
94 } 98 }
95#endif 99#endif
96 100
97 if (!R->scrollBar.win) { 101 if (!scrollBar.win) {
98/* create the scrollbar window */ 102/* create the scrollbar window */
99 R->scrollBar.win = XCreateSimpleWindow(R->Xdisplay, 103 scrollBar.win = XCreateSimpleWindow(Xdisplay,
100 R->TermWin.parent[0], 104 TermWin.parent[0],
101 R->window_sb_x, 0, 105 window_sb_x, 0,
102 scrollbar_TotalWidth(), 106 scrollbar_TotalWidth(),
103 R->szHint.height, 107 szHint.height,
104 0, 108 0,
105 R->PixColors[Color_fg], 109 PixColors[Color_fg],
106 R->PixColors[Color_bg]); 110 PixColors[Color_bg]);
107#ifdef DEBUG_X 111#ifdef DEBUG_X
108 XStoreName(R->Xdisplay, R->scrollBar.win, "scrollbar"); 112 XStoreName(Xdisplay, scrollBar.win, "scrollbar");
109#endif 113#endif
110 XDefineCursor(R->Xdisplay, R->scrollBar.win, R->leftptr_cursor); 114 XDefineCursor(Xdisplay, scrollBar.win, leftptr_cursor);
111 XSelectInput(R->Xdisplay, R->scrollBar.win, 115 XSelectInput(Xdisplay, scrollBar.win,
112 (ExposureMask | ButtonPressMask | ButtonReleaseMask 116 (ExposureMask | ButtonPressMask | ButtonReleaseMask
113 | Button1MotionMask | Button2MotionMask 117 | Button1MotionMask | Button2MotionMask
114 | Button3MotionMask)); 118 | Button3MotionMask));
115 delayed_init = 1; 119 delayed_init = 1;
116 } 120 }
117 rxvt_scrollbar_show(aR_ 1); 121 scrollbar_show (1);
118 if (delayed_init) 122 if (delayed_init)
119 XMapWindow(R->Xdisplay, R->scrollBar.win); 123 XMapWindow (Xdisplay, scrollBar.win);
120#endif 124#endif
121} 125}
122 126
123/* 127/*
124 * Update current scrollbar view w.r.t. slider heights, etc. 128 * Update current scrollbar view w.r.t. slider heights, etc.
125 */ 129 */
126/* EXTPROTO */
127int 130int
128rxvt_scrollbar_show(pR_ int update) 131rxvt_term::scrollbar_show (int update)
129{ 132{
130 int ret = 0; 133 int ret = 0;
131#ifdef HAVE_SCROLLBARS 134#ifdef HAVE_SCROLLBARS
132 int top, bot, len, adj; 135 int top, bot, len, adj;
133 136
134 if (!scrollbar_visible(R)) 137 if (!scrollbar_visible())
135 return 0; 138 return 0;
136 139
137 if (update) { 140 if (update) {
138 top = (R->TermWin.nscrolled - R->TermWin.view_start); 141 top = (TermWin.nscrolled - TermWin.view_start);
139 bot = top + (R->TermWin.nrow - 1); 142 bot = top + (TermWin.nrow - 1);
140 len = max((R->TermWin.nscrolled + (R->TermWin.nrow - 1)), 1); 143 len = max((TermWin.nscrolled + (TermWin.nrow - 1)), 1);
141 adj = (((bot - top) * scrollbar_size()) % len) > 0 ? 1 : 0; 144 adj = (((bot - top) * scrollbar_size()) % len) > 0 ? 1 : 0;
142 145
143 R->scrollBar.top = (R->scrollBar.beg + (top * scrollbar_size()) / len); 146 scrollBar.top = (scrollBar.beg + (top * scrollbar_size()) / len);
144 R->scrollbar_len = ((bot - top) * scrollbar_size()) / len + 147 scrollbar_len = ((bot - top) * scrollbar_size()) / len +
145 scrollbar_minheight() + adj; 148 scrollbar_minheight() + adj;
146 R->scrollBar.bot = (R->scrollBar.top + R->scrollbar_len); 149 scrollBar.bot = (scrollBar.top + scrollbar_len);
147 /* no change */ 150 /* no change */
148 if (R->scrollBar.top == R->last_top 151 if (scrollBar.top == last_top
149 && R->scrollBar.bot == R->last_bot 152 && scrollBar.bot == last_bot
150 && (R->scrollBar.state == R->last_state || !scrollbar_isUpDn())) 153 && (scrollBar.state == last_state || !scrollbar_isUpDn()))
151 return 0; 154 return 0;
152 } 155 }
153 156
154 ret = R->scrollBar.update(aR_ update, R->last_top, R->last_bot, 157 ret = (this->*scrollBar.update) (update, last_top, last_bot, scrollbar_len);
155 R->scrollbar_len);
156 158
157 R->last_top = R->scrollBar.top; 159 last_top = scrollBar.top;
158 R->last_bot = R->scrollBar.bot; 160 last_bot = scrollBar.bot;
159 R->last_state = R->scrollBar.state; 161 last_state = scrollBar.state;
160
161#endif 162#endif
163
162 return ret; 164 return ret;
163} 165}
164 166
165/* EXTPROTO */
166void 167void
167rxvt_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)
168{ 169{
169#ifdef HAVE_SCROLLBARS 170#ifdef HAVE_SCROLLBARS
170 int i; 171 int i;
171 short style, width; 172 short style, width;
172 173
173# if defined(RXVT_SCROLLBAR) || !(defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)) 174# if defined(RXVT_SCROLLBAR)
174 style = R_SB_RXVT; 175 style = R_SB_RXVT;
175# else 176# elif defined(XTERM_SCROLLBAR)
177 style = R_SB_XTERM;
176# ifdef NEXT_SCROLLBAR 178# elif defined(NEXT_SCROLLBAR)
177 style = R_SB_NEXT; 179 style = R_SB_NEXT;
178# elif defined(XTERM_SCROLLBAR) 180# elif defined(PLAIN_SCROLLBAR)
181 style = R_SB_PLAIN;
182#else
179 style = R_SB_XTERM; 183 style = R_SB_RXVT;
180# endif
181# endif 184# endif
182 185
183# if (defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)) 186# if (defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR))
184 if (scrollstyle) { 187 if (scrollstyle) {
185# ifdef NEXT_SCROLLBAR 188# ifdef NEXT_SCROLLBAR
186 if (STRNCASECMP(scrollstyle, "next", 4) == 0) 189 if (STRNCASECMP(scrollstyle, "next", 4) == 0)
187 style = R_SB_NEXT; 190 style = R_SB_NEXT;
188# endif 191# endif
189# ifdef XTERM_SCROLLBAR 192# ifdef XTERM_SCROLLBAR
190 if (STRNCASECMP(scrollstyle, "xterm", 5) == 0) 193 if (STRNCASECMP(scrollstyle, "xterm", 5) == 0)
191 style = R_SB_XTERM; 194 style = R_SB_XTERM;
192# endif 195# endif
196# ifdef PLAIN_SCROLLBAR
197 if (STRNCASECMP(scrollstyle, "plain", 5) == 0)
198 style = R_SB_PLAIN;
199# endif
193 } 200 }
194# endif 201# endif
195 if (style == R_SB_NEXT) 202 if (style == R_SB_NEXT)
196 width = SB_WIDTH_NEXT; 203 width = SB_WIDTH_NEXT;
197 else if (style == R_SB_XTERM) 204 else if (style == R_SB_XTERM)
198 width = SB_WIDTH_XTERM; 205 width = SB_WIDTH_XTERM;
206 else if (style == R_SB_PLAIN)
207 width = SB_WIDTH_PLAIN;
199 else /* if (style == R_SB_RXVT) */ 208 else /* if (style == R_SB_RXVT) */
200 width = SB_WIDTH_RXVT; 209 width = SB_WIDTH_RXVT;
201 210
202 if (style != R_SB_NEXT) /* dishonour request - for now */ 211 if (style != R_SB_NEXT) /* dishonour request - for now */
203 if (thickness && (i = atoi(thickness)) >= SB_WIDTH_MINIMUM) 212 if (thickness && (i = atoi(thickness)) >= SB_WIDTH_MINIMUM)
204 width = min(i, SB_WIDTH_MAXIMUM); 213 width = min(i, SB_WIDTH_MAXIMUM);
205 214
206# if defined(RXVT_SCROLLBAR) 215# if defined(RXVT_SCROLLBAR)
207 if (!(R->Options & Opt_scrollBar_floating) && style == R_SB_RXVT) 216 if (!(Options & Opt_scrollBar_floating) && style == R_SB_RXVT)
208 R->sb_shadow = SHADOW; 217 sb_shadow = SHADOW;
209# endif 218# endif
210 219
211 R->scrollBar.style = style; 220 scrollBar.style = style;
212 R->scrollBar.width = width; 221 scrollBar.width = width;
213 222
214 /* R->scrollbar_align = R_SB_ALIGN_CENTRE; */ 223 /* scrollbar_align = R_SB_ALIGN_CENTRE; */
215 if (scrollalign) { 224 if (scrollalign) {
216 if (STRNCASECMP(scrollalign, "top", 3) == 0) 225 if (STRNCASECMP(scrollalign, "top", 3) == 0)
217 R->scrollbar_align = R_SB_ALIGN_TOP; 226 scrollbar_align = R_SB_ALIGN_TOP;
218 else if (STRNCASECMP(scrollalign, "bottom", 6) == 0) 227 else if (STRNCASECMP(scrollalign, "bottom", 6) == 0)
219 R->scrollbar_align = R_SB_ALIGN_BOTTOM; 228 scrollbar_align = R_SB_ALIGN_BOTTOM;
220 } 229 }
221#endif 230#endif
222} 231}
223 232
224/*----------------------- end-of-file (C source) -----------------------*/ 233/*----------------------- end-of-file (C source) -----------------------*/
234

Diff Legend

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