ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/scrollbar-next.C
(Generate patch)

Comparing rxvt-unicode/src/scrollbar-next.C (file contents):
Revision 1.21 by root, Wed Jan 25 21:03:04 2006 UTC vs.
Revision 1.34 by sf-exg, Fri May 30 19:40:23 2014 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: scrollbar-next.C 2 * File: scrollbar-next.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 <schmorp@schmorp.de>
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 3 of the License, or
14 * (at your option) any later version. 14 * (at your option) any later version.
15 * 15 *
16 * This program is distributed in the hope that it will be useful, 16 * This program is distributed in the hope that it will be useful,
17 * but WITHOUT ANY WARRANTY; without even the implied warranty of 17 * but WITHOUT ANY WARRANTY; without even the implied warranty of
18 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 18 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
113 " % ", 113 " % ",
114 " ", 114 " ",
115 " " 115 " "
116 }; 116 };
117 117
118Pixmap 118static Pixmap
119rxvt_term::renderPixmap (const char *const *data, int width, int height) 119renderPixmap (scrollBar_t *sb, const char *const *data, int width, int height)
120{ 120{
121 char a; 121 char a;
122 int x, y; 122 int x, y;
123 Pixmap d; 123 Pixmap d;
124 GC pointcolour; 124 GC pointcolour;
125 125
126 d = XCreatePixmap (display->display, scrollBar.win, width, height, depth); 126 d = XCreatePixmap (sb->term->dpy, sb->win, width, height, sb->term->depth);
127 127
128 for (y = 0; y < height; y++) 128 for (y = 0; y < height; y++)
129 { 129 {
130 for (x = 0; x < width; x++) 130 for (x = 0; x < width; x++)
131 { 131 {
132 if ((a = data[y][x]) == ' ' || a == 'w') 132 if ((a = data[y][x]) == ' ' || a == 'w')
133 pointcolour = whiteGC; 133 pointcolour = sb->whiteGC;
134 else if (a == '.' || a == 'l') 134 else if (a == '.' || a == 'l')
135 pointcolour = grayGC; 135 pointcolour = sb->grayGC;
136 else if (a == '%' || a == 'd') 136 else if (a == '%' || a == 'd')
137 pointcolour = darkGC; 137 pointcolour = sb->darkGC;
138 else /* if (a == '#' || a == 'b' || a) */ 138 else /* if (a == '#' || a == 'b' || a) */
139 pointcolour = blackGC; 139 pointcolour = sb->blackGC;
140 140
141 XDrawPoint (display->display, d, pointcolour, x, y); 141 XDrawPoint (sb->term->dpy, d, pointcolour, x, y);
142 } 142 }
143 } 143 }
144 return d; 144 return d;
145} 145}
146 146
147void 147void
148rxvt_term::init_scrollbar_stuff () 148scrollBar_t::init_next ()
149{ 149{
150 XGCValues gcvalue; 150 XGCValues gcvalue;
151 XColor xcol; 151 rxvt_color color;
152 Pixmap stipple; 152 Pixmap stipple;
153 unsigned long light, dark; 153 unsigned long light, dark;
154 154
155 gcvalue.graphics_exposures = False; 155 gcvalue.graphics_exposures = False;
156 156
157 gcvalue.foreground = pix_colors_focused[Color_Black]; 157 gcvalue.foreground = term->pix_colors_focused[Color_Black];
158 blackGC = XCreateGC (xdisp, scrollBar.win, 158 blackGC = XCreateGC (term->dpy, win,
159 GCForeground | GCGraphicsExposures, &gcvalue); 159 GCForeground | GCGraphicsExposures, &gcvalue);
160 160
161 gcvalue.foreground = pix_colors_focused[Color_White]; 161 gcvalue.foreground = term->pix_colors_focused[Color_White];
162 whiteGC = XCreateGC (xdisp, scrollBar.win, 162 whiteGC = XCreateGC (term->dpy, win,
163 GCForeground | GCGraphicsExposures, &gcvalue); 163 GCForeground | GCGraphicsExposures, &gcvalue);
164 164
165 xcol.red = 0xaeba;
166 xcol.green = 0xaaaa;
167 xcol.blue = 0xaeba;
168 xcol.pixel = pix_colors_focused[Color_scroll]; 165 light = term->pix_colors_focused[Color_scroll];
169 light = gcvalue.foreground = xcol.pixel; 166#if 0
167 //color used by rxvt
168 if (color.set (term, rgba (0xaeba, 0xaaaa, 0xaeba)))
169 light = color;
170#endif
171 gcvalue.foreground = light;
170 grayGC = XCreateGC (xdisp, scrollBar.win, 172 grayGC = XCreateGC (term->dpy, win,
171 GCForeground | GCGraphicsExposures, &gcvalue); 173 GCForeground | GCGraphicsExposures, &gcvalue);
172 174
173 xcol.red = 0x51aa;
174 xcol.green = 0x5555;
175 xcol.blue = 0x5144;
176 //if (!rXAllocColor (&xcol, "dark gray"))//TODO//D//
177 xcol.pixel = pix_colors_focused[Color_Grey25]; 175 dark = term->pix_colors_focused[Color_Grey25];
178 dark = gcvalue.foreground = xcol.pixel; 176#if 0
177 //color used by rxvt
178 if (color.set (term, rgba (0x51aa, 0x5555, 0x5144)))
179 dark = color;
180#endif
181 gcvalue.foreground = dark;
179 darkGC = XCreateGC (xdisp, scrollBar.win, 182 darkGC = XCreateGC (term->dpy, win,
180 GCForeground | GCGraphicsExposures, &gcvalue); 183 GCForeground | GCGraphicsExposures, &gcvalue);
181 184
182 stipple = XCreateBitmapFromData (xdisp, scrollBar.win, 185 stipple = XCreateBitmapFromData (term->dpy, win,
183 (char *)n_stp_bits, n_stp_width, 186 (char *)n_stp_bits, n_stp_width,
184 n_stp_height); 187 n_stp_height);
185 188
186 gcvalue.foreground = dark; 189 gcvalue.foreground = dark;
187 gcvalue.background = light; 190 gcvalue.background = light;
188 gcvalue.fill_style = FillOpaqueStippled; 191 gcvalue.fill_style = FillOpaqueStippled;
189 gcvalue.stipple = stipple; 192 gcvalue.stipple = stipple;
190 193
191 /* XSetWindowBackground (xdisp, scrollBar.win, pix_colors_focused[Color_Red]); */
192
193 stippleGC = XCreateGC (xdisp, scrollBar.win, 194 stippleGC = XCreateGC (term->dpy, win,
194 GCForeground | GCBackground | GCStipple 195 GCForeground | GCBackground | GCStipple
195 | GCFillStyle | GCGraphicsExposures, &gcvalue); 196 | GCFillStyle | GCGraphicsExposures, &gcvalue);
196 197
197 dimple = renderPixmap (SCROLLER_DIMPLE, SCROLLER_DIMPLE_WIDTH, 198 dimple = renderPixmap (this, SCROLLER_DIMPLE, SCROLLER_DIMPLE_WIDTH,
198 SCROLLER_DIMPLE_HEIGHT); 199 SCROLLER_DIMPLE_HEIGHT);
199 200
200 upArrow = renderPixmap (SCROLLER_ARROW_UP, ARROW_WIDTH, 201 upArrow = renderPixmap (this, SCROLLER_ARROW_UP, ARROW_WIDTH,
201 ARROW_HEIGHT); 202 ARROW_HEIGHT);
202 downArrow = renderPixmap (SCROLLER_ARROW_DOWN, ARROW_WIDTH, 203 downArrow = renderPixmap (this, SCROLLER_ARROW_DOWN, ARROW_WIDTH,
203 ARROW_HEIGHT); 204 ARROW_HEIGHT);
204 upArrowHi = renderPixmap (HI_SCROLLER_ARROW_UP, ARROW_WIDTH, 205 upArrowHi = renderPixmap (this, HI_SCROLLER_ARROW_UP, ARROW_WIDTH,
205 ARROW_HEIGHT); 206 ARROW_HEIGHT);
206 downArrowHi = renderPixmap (HI_SCROLLER_ARROW_DOWN, 207 downArrowHi = renderPixmap (this, HI_SCROLLER_ARROW_DOWN,
207 ARROW_WIDTH, ARROW_HEIGHT); 208 ARROW_WIDTH, ARROW_HEIGHT);
208} 209}
209 210
210/* Draw bevel & arrows */ 211/* Draw bevel & arrows */
211void 212static void
212rxvt_term::drawBevel (Drawable d, int x1, int y1, int w, int h) 213drawBevel (scrollBar_t *sb, int x1, int y1, int w, int h)
213{ 214{
214 int x2, y2; 215 int x2, y2;
216 Drawable d = sb->win;
217 Display *dpy = sb->term->dpy;
215 218
216 x2 = x1 + w - 1; /* right point */ 219 x2 = x1 + w - 1; /* right point */
217 y2 = y1 + h - 1; /* bottom point */ 220 y2 = y1 + h - 1; /* bottom point */
218 /* white top and left */ 221 /* white top and left */
219 XDrawLine (xdisp, d, whiteGC, x1, y1, x2, y1); 222 XDrawLine (dpy, d, sb->whiteGC, x1, y1, x2, y1);
220 XDrawLine (xdisp, d, whiteGC, x1, y1, x1, y2); 223 XDrawLine (dpy, d, sb->whiteGC, x1, y1, x1, y2);
221 /* black bottom and right */ 224 /* black bottom and right */
222 XDrawLine (xdisp, d, blackGC, x1, y2, x2, y2); 225 XDrawLine (dpy, d, sb->blackGC, x1, y2, x2, y2);
223 XDrawLine (xdisp, d, blackGC, x2, y1, x2, y2); 226 XDrawLine (dpy, d, sb->blackGC, x2, y1, x2, y2);
224 /* dark inside bottom and right */ 227 /* dark inside bottom and right */
225 x1++, y1++, x2--, y2--; /* move in one point */ 228 x1++, y1++, x2--, y2--; /* move in one point */
226 XDrawLine (xdisp, d, darkGC, x1, y2, x2, y2); 229 XDrawLine (dpy, d, sb->darkGC, x1, y2, x2, y2);
227 XDrawLine (xdisp, d, darkGC, x2, y1, x2, y2); 230 XDrawLine (dpy, d, sb->darkGC, x2, y1, x2, y2);
228} 231}
229 232
230int 233int
231rxvt_term::scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len) 234scrollBar_t::show_next (int update)
232{ 235{
233 int height = scrollBar.end + SB_BUTTON_TOTAL_HEIGHT + SB_PADDING; 236 int height = end + SB_BUTTON_TOTAL_HEIGHT + SB_PADDING;
234 Drawable s; 237 Drawable src;
235 238
236 if ((scrollBar.init & R_SB_NEXT) == 0) 239 if ((init & SB_STYLE_NEXT) == 0)
237 { 240 {
238 scrollBar.init |= R_SB_NEXT; 241 init |= SB_STYLE_NEXT;
239 init_scrollbar_stuff (); 242 init_next ();
240 } 243 }
241 244
242 if (top_row == 0 || !update) 245 if (term->top_row == 0 || !update)
243 { 246 {
244 XFillRectangle (xdisp, scrollBar.win, grayGC, 0, 0, 247 XFillRectangle (term->dpy, win, grayGC, 0, 0,
245 SB_WIDTH_NEXT + 1, height); 248 SB_WIDTH_NEXT + 1, height);
246 XDrawRectangle (xdisp, scrollBar.win, blackGC, 0, 249 XDrawRectangle (term->dpy, win, blackGC, 0,
247 -SB_BORDER_WIDTH, SB_WIDTH_NEXT, 250 -SB_BORDER_WIDTH, SB_WIDTH_NEXT,
248 height + SB_BORDER_WIDTH); 251 height + SB_BORDER_WIDTH);
249 XFillRectangle (xdisp, scrollBar.win, stippleGC, 252 XFillRectangle (term->dpy, win, stippleGC,
250 SB_LEFT_PADDING, 0, SB_BUTTON_WIDTH, height); 253 SB_LEFT_PADDING, 0, SB_BUTTON_WIDTH, height);
251 } 254 }
252 255
253 if (top_row) 256 if (term->top_row)
254 { 257 {
255 if (last_top < scrollBar.top || !update) 258 if (last_top < top || !update)
256 XFillRectangle (xdisp, scrollBar.win, stippleGC, 259 XFillRectangle (term->dpy, win, stippleGC,
257 SB_LEFT_PADDING, SB_PADDING + last_top, 260 SB_LEFT_PADDING, SB_PADDING + last_top,
258 SB_BUTTON_WIDTH, scrollBar.top - last_top); 261 SB_BUTTON_WIDTH, top - last_top);
259 262
260 if (scrollBar.bot < last_bot || !update) 263 if (bot < last_bot || !update)
261 XFillRectangle (xdisp, scrollBar.win, stippleGC, 264 XFillRectangle (term->dpy, win, stippleGC,
262 SB_LEFT_PADDING, scrollBar.bot + SB_PADDING, 265 SB_LEFT_PADDING, bot + SB_PADDING,
263 SB_BUTTON_WIDTH, (last_bot - scrollBar.bot)); 266 SB_BUTTON_WIDTH, (last_bot - bot));
264 267
265 XFillRectangle (xdisp, scrollBar.win, grayGC, 268 XFillRectangle (term->dpy, win, grayGC,
266 SB_LEFT_PADDING, scrollBar.top + SB_PADDING, 269 SB_LEFT_PADDING, top + SB_PADDING,
267 SB_BUTTON_WIDTH, scrollbar_len); 270 SB_BUTTON_WIDTH, bot - top);
268 271
269 XCopyArea (xdisp, dimple, scrollBar.win, whiteGC, 0, 0, 272 XCopyArea (term->dpy, dimple, win, whiteGC, 0, 0,
270 SCROLLER_DIMPLE_WIDTH, SCROLLER_DIMPLE_HEIGHT, 273 SCROLLER_DIMPLE_WIDTH, SCROLLER_DIMPLE_HEIGHT,
271 (SB_WIDTH_NEXT - SCROLLER_DIMPLE_WIDTH) / 2, 274 (SB_WIDTH_NEXT - SCROLLER_DIMPLE_WIDTH) / 2,
272 scrollBar.top + SB_BEVEL_WIDTH_UPPER_LEFT + 275 top + SB_BEVEL_WIDTH_UPPER_LEFT +
273 (scrollbar_len - SCROLLER_DIMPLE_HEIGHT) / 2); 276 (bot - top - SCROLLER_DIMPLE_HEIGHT) / 2);
274 277
275 drawBevel (scrollBar.win, SB_BUTTON_BEVEL_X, 278 drawBevel (this, SB_BUTTON_BEVEL_X,
276 scrollBar.top + SB_PADDING, SB_BUTTON_WIDTH, 279 top + SB_PADDING, SB_BUTTON_WIDTH,
277 scrollbar_len); 280 bot - top);
278 drawBevel (scrollBar.win, SB_BUTTON_BEVEL_X, 281 drawBevel (this, SB_BUTTON_BEVEL_X,
279 height - SB_BUTTON_BOTH_HEIGHT, SB_BUTTON_WIDTH, 282 height - SB_BUTTON_BOTH_HEIGHT, SB_BUTTON_WIDTH,
280 SB_BUTTON_HEIGHT); 283 SB_BUTTON_HEIGHT);
281 drawBevel (scrollBar.win, SB_BUTTON_BEVEL_X, 284 drawBevel (this, SB_BUTTON_BEVEL_X,
282 height - SB_BUTTON_SINGLE_HEIGHT, SB_BUTTON_WIDTH, 285 height - SB_BUTTON_SINGLE_HEIGHT, SB_BUTTON_WIDTH,
283 SB_BUTTON_HEIGHT); 286 SB_BUTTON_HEIGHT);
284 287
285 s = (scrollbar_isUp ()) ? upArrowHi : upArrow; 288 src = state == SB_STATE_UP ? upArrowHi : upArrow;
286 XCopyArea (xdisp, s, scrollBar.win, whiteGC, 0, 0, 289 XCopyArea (term->dpy, src, win, whiteGC, 0, 0,
287 ARROW_WIDTH, ARROW_HEIGHT, SB_BUTTON_FACE_X, 290 ARROW_WIDTH, ARROW_HEIGHT, SB_BUTTON_FACE_X,
288 height - SB_BUTTON_BOTH_HEIGHT + SB_BEVEL_WIDTH_UPPER_LEFT); 291 height - SB_BUTTON_BOTH_HEIGHT + SB_BEVEL_WIDTH_UPPER_LEFT);
289 292
290 s = (scrollbar_isDn ()) ? downArrowHi : downArrow; 293 src = state == SB_STATE_DOWN ? downArrowHi : downArrow;
291 XCopyArea (xdisp, s, scrollBar.win, whiteGC, 0, 0, 294 XCopyArea (term->dpy, src, win, whiteGC, 0, 0,
292 ARROW_WIDTH, ARROW_HEIGHT, SB_BUTTON_FACE_X, 295 ARROW_WIDTH, ARROW_HEIGHT, SB_BUTTON_FACE_X,
293 height - SB_BUTTON_SINGLE_HEIGHT + SB_BEVEL_WIDTH_UPPER_LEFT); 296 height - SB_BUTTON_SINGLE_HEIGHT + SB_BEVEL_WIDTH_UPPER_LEFT);
294 } 297 }
295 298
296 return 1; 299 return 1;
297} 300}
298#endif /* NEXT_SCROLLBAR */ 301#endif /* NEXT_SCROLLBAR */
299/*----------------------- end-of-file (C source) -----------------------*/ 302/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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