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.11 by pcg, Sat Jan 31 04:16:15 2004 UTC vs.
Revision 1.12 by pcg, Sun Feb 1 01:34:41 2004 UTC

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

Diff Legend

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