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.16 by root, Fri Feb 4 11:41:23 2005 UTC vs.
Revision 1.31 by root, Mon Feb 21 07:41:03 2011 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 2 of the License, or
14 * (at your option) any later version. 14 * (at your option) any later version.
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, display->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 XColor xcol;
152 Pixmap stipple; 152 Pixmap stipple;
153 unsigned long light, dark; 153 unsigned long light, dark;
154 dDisp;
155 154
156 gcvalue.graphics_exposures = False; 155 gcvalue.graphics_exposures = False;
157 156
158 gcvalue.foreground = pix_colors_focused[Color_Black]; 157 gcvalue.foreground = term->pix_colors_focused[Color_Black];
159 blackGC = XCreateGC (disp, scrollBar.win, 158 blackGC = XCreateGC (term->dpy, win,
160 GCForeground | GCGraphicsExposures, &gcvalue); 159 GCForeground | GCGraphicsExposures, &gcvalue);
161 160
162 gcvalue.foreground = pix_colors_focused[Color_White]; 161 gcvalue.foreground = term->pix_colors_focused[Color_White];
163 whiteGC = XCreateGC (disp, scrollBar.win, 162 whiteGC = XCreateGC (term->dpy, win,
164 GCForeground | GCGraphicsExposures, &gcvalue); 163 GCForeground | GCGraphicsExposures, &gcvalue);
165 164
166 xcol.red = 0xaeba; 165 xcol.red = 0xaeba;
167 xcol.green = 0xaaaa; 166 xcol.green = 0xaaaa;
168 xcol.blue = 0xaeba; 167 xcol.blue = 0xaeba;
169 //if (!rXAllocColor (&xcol, "light gray"))//TODO//D//
170 xcol.pixel = pix_colors_focused[Color_AntiqueWhite]; 168 xcol.pixel = term->pix_colors_focused[Color_scroll];
171 light = gcvalue.foreground = xcol.pixel; 169 light = gcvalue.foreground = xcol.pixel;
172 grayGC = XCreateGC (disp, scrollBar.win, 170 grayGC = XCreateGC (term->dpy, win,
173 GCForeground | GCGraphicsExposures, &gcvalue); 171 GCForeground | GCGraphicsExposures, &gcvalue);
174 172
175 xcol.red = 0x51aa; 173 xcol.red = 0x51aa;
176 xcol.green = 0x5555; 174 xcol.green = 0x5555;
177 xcol.blue = 0x5144; 175 xcol.blue = 0x5144;
178 //if (!rXAllocColor (&xcol, "dark gray"))//TODO//D// 176 //if (!rXAllocColor (&xcol, "dark gray"))//TODO//D//
179 xcol.pixel = pix_colors_focused[Color_Grey25]; 177 xcol.pixel = term->pix_colors_focused[Color_Grey25];
180 dark = gcvalue.foreground = xcol.pixel; 178 dark = gcvalue.foreground = xcol.pixel;
181 darkGC = XCreateGC (disp, scrollBar.win, 179 darkGC = XCreateGC (term->dpy, win,
182 GCForeground | GCGraphicsExposures, &gcvalue); 180 GCForeground | GCGraphicsExposures, &gcvalue);
183 181
184 stipple = XCreateBitmapFromData (disp, scrollBar.win, 182 stipple = XCreateBitmapFromData (term->dpy, win,
185 (char *)n_stp_bits, n_stp_width, 183 (char *)n_stp_bits, n_stp_width,
186 n_stp_height); 184 n_stp_height);
187 185
188 gcvalue.foreground = dark; 186 gcvalue.foreground = dark;
189 gcvalue.background = light; 187 gcvalue.background = light;
190 gcvalue.fill_style = FillOpaqueStippled; 188 gcvalue.fill_style = FillOpaqueStippled;
191 gcvalue.stipple = stipple; 189 gcvalue.stipple = stipple;
192 190
193 /* XSetWindowBackground (disp, scrollBar.win, pix_colors_focused[Color_Red]); */ 191 /* XSetWindowBackground (dpy, scrollBar.win, pix_colors_focused[Color_Red]); */
194 192
195 stippleGC = XCreateGC (disp, scrollBar.win, 193 stippleGC = XCreateGC (term->dpy, win,
196 GCForeground | GCBackground | GCStipple 194 GCForeground | GCBackground | GCStipple
197 | GCFillStyle | GCGraphicsExposures, &gcvalue); 195 | GCFillStyle | GCGraphicsExposures, &gcvalue);
198 196
199 dimple = renderPixmap (SCROLLER_DIMPLE, SCROLLER_DIMPLE_WIDTH, 197 dimple = renderPixmap (this, SCROLLER_DIMPLE, SCROLLER_DIMPLE_WIDTH,
200 SCROLLER_DIMPLE_HEIGHT); 198 SCROLLER_DIMPLE_HEIGHT);
201 199
202 upArrow = renderPixmap (SCROLLER_ARROW_UP, ARROW_WIDTH, 200 upArrow = renderPixmap (this, SCROLLER_ARROW_UP, ARROW_WIDTH,
203 ARROW_HEIGHT); 201 ARROW_HEIGHT);
204 downArrow = renderPixmap (SCROLLER_ARROW_DOWN, ARROW_WIDTH, 202 downArrow = renderPixmap (this, SCROLLER_ARROW_DOWN, ARROW_WIDTH,
205 ARROW_HEIGHT); 203 ARROW_HEIGHT);
206 upArrowHi = renderPixmap (HI_SCROLLER_ARROW_UP, ARROW_WIDTH, 204 upArrowHi = renderPixmap (this, HI_SCROLLER_ARROW_UP, ARROW_WIDTH,
207 ARROW_HEIGHT); 205 ARROW_HEIGHT);
208 downArrowHi = renderPixmap (HI_SCROLLER_ARROW_DOWN, 206 downArrowHi = renderPixmap (this, HI_SCROLLER_ARROW_DOWN,
209 ARROW_WIDTH, ARROW_HEIGHT); 207 ARROW_WIDTH, ARROW_HEIGHT);
210} 208}
211 209
212/* Draw bevel & arrows */ 210/* Draw bevel & arrows */
213void 211static void
214rxvt_term::drawBevel (Drawable d, int x1, int y1, int w, int h) 212drawBevel (scrollBar_t *sb, int x1, int y1, int w, int h)
215{ 213{
216 int x2, y2; 214 int x2, y2;
217 dDisp; 215 Drawable d = sb->win;
216 Display *dpy = sb->term->dpy;
218 217
219 x2 = x1 + w - 1; /* right point */ 218 x2 = x1 + w - 1; /* right point */
220 y2 = y1 + h - 1; /* bottom point */ 219 y2 = y1 + h - 1; /* bottom point */
221 /* white top and left */ 220 /* white top and left */
222 XDrawLine (disp, d, whiteGC, x1, y1, x2, y1); 221 XDrawLine (dpy, d, sb->whiteGC, x1, y1, x2, y1);
223 XDrawLine (disp, d, whiteGC, x1, y1, x1, y2); 222 XDrawLine (dpy, d, sb->whiteGC, x1, y1, x1, y2);
224 /* black bottom and right */ 223 /* black bottom and right */
225 XDrawLine (disp, d, blackGC, x1, y2, x2, y2); 224 XDrawLine (dpy, d, sb->blackGC, x1, y2, x2, y2);
226 XDrawLine (disp, d, blackGC, x2, y1, x2, y2); 225 XDrawLine (dpy, d, sb->blackGC, x2, y1, x2, y2);
227 /* dark inside bottom and right */ 226 /* dark inside bottom and right */
228 x1++, y1++, x2--, y2--; /* move in one point */ 227 x1++, y1++, x2--, y2--; /* move in one point */
229 XDrawLine (disp, d, darkGC, x1, y2, x2, y2); 228 XDrawLine (dpy, d, sb->darkGC, x1, y2, x2, y2);
230 XDrawLine (disp, d, darkGC, x2, y1, x2, y2); 229 XDrawLine (dpy, d, sb->darkGC, x2, y1, x2, y2);
231} 230}
232 231
233int 232int
234rxvt_term::scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len) 233scrollBar_t::show_next (int update)
235{ 234{
236 int height = scrollBar.end + SB_BUTTON_TOTAL_HEIGHT + SB_PADDING; 235 int height = end + SB_BUTTON_TOTAL_HEIGHT + SB_PADDING;
237 Drawable s; 236 Drawable src;
238 dDisp;
239 237
240 if ((scrollBar.init & R_SB_NEXT) == 0) 238 if ((init & R_SB_NEXT) == 0)
241 { 239 {
242 scrollBar.init |= R_SB_NEXT; 240 init |= R_SB_NEXT;
243 init_scrollbar_stuff (); 241 init_next ();
244 } 242 }
245 243
246 if (TermWin.nscrolled == 0 || !update) 244 if (term->top_row == 0 || !update)
247 { 245 {
248 XFillRectangle (disp, scrollBar.win, grayGC, 0, 0, 246 XFillRectangle (term->dpy, win, grayGC, 0, 0,
249 SB_WIDTH_NEXT + 1, height); 247 SB_WIDTH_NEXT + 1, height);
250 XDrawRectangle (disp, scrollBar.win, blackGC, 0, 248 XDrawRectangle (term->dpy, win, blackGC, 0,
251 -SB_BORDER_WIDTH, SB_WIDTH_NEXT, 249 -SB_BORDER_WIDTH, SB_WIDTH_NEXT,
252 height + SB_BORDER_WIDTH); 250 height + SB_BORDER_WIDTH);
253 XFillRectangle (disp, scrollBar.win, stippleGC, 251 XFillRectangle (term->dpy, win, stippleGC,
254 SB_LEFT_PADDING, 0, SB_BUTTON_WIDTH, height); 252 SB_LEFT_PADDING, 0, SB_BUTTON_WIDTH, height);
255 } 253 }
256 254
257 if (TermWin.nscrolled) 255 if (term->top_row)
258 { 256 {
259 if (last_top < scrollBar.top || !update) 257 if (last_top < top || !update)
260 XFillRectangle (disp, scrollBar.win, stippleGC, 258 XFillRectangle (term->dpy, win, stippleGC,
261 SB_LEFT_PADDING, SB_PADDING + last_top, 259 SB_LEFT_PADDING, SB_PADDING + last_top,
262 SB_BUTTON_WIDTH, scrollBar.top - last_top); 260 SB_BUTTON_WIDTH, top - last_top);
263 261
264 if (scrollBar.bot < last_bot || !update) 262 if (bot < last_bot || !update)
265 XFillRectangle (disp, scrollBar.win, stippleGC, 263 XFillRectangle (term->dpy, win, stippleGC,
266 SB_LEFT_PADDING, scrollBar.bot + SB_PADDING, 264 SB_LEFT_PADDING, bot + SB_PADDING,
267 SB_BUTTON_WIDTH, (last_bot - scrollBar.bot)); 265 SB_BUTTON_WIDTH, (last_bot - bot));
268 266
269 XFillRectangle (disp, scrollBar.win, grayGC, 267 XFillRectangle (term->dpy, win, grayGC,
270 SB_LEFT_PADDING, scrollBar.top + SB_PADDING, 268 SB_LEFT_PADDING, top + SB_PADDING,
271 SB_BUTTON_WIDTH, scrollbar_len); 269 SB_BUTTON_WIDTH, bot - top);
272 270
273 XCopyArea (disp, dimple, scrollBar.win, whiteGC, 0, 0, 271 XCopyArea (term->dpy, dimple, win, whiteGC, 0, 0,
274 SCROLLER_DIMPLE_WIDTH, SCROLLER_DIMPLE_HEIGHT, 272 SCROLLER_DIMPLE_WIDTH, SCROLLER_DIMPLE_HEIGHT,
275 (SB_WIDTH_NEXT - SCROLLER_DIMPLE_WIDTH) / 2, 273 (SB_WIDTH_NEXT - SCROLLER_DIMPLE_WIDTH) / 2,
276 scrollBar.top + SB_BEVEL_WIDTH_UPPER_LEFT + 274 top + SB_BEVEL_WIDTH_UPPER_LEFT +
277 (scrollbar_len - SCROLLER_DIMPLE_HEIGHT) / 2); 275 (bot - top - SCROLLER_DIMPLE_HEIGHT) / 2);
278 276
279 drawBevel (scrollBar.win, SB_BUTTON_BEVEL_X, 277 drawBevel (this, SB_BUTTON_BEVEL_X,
280 scrollBar.top + SB_PADDING, SB_BUTTON_WIDTH, 278 top + SB_PADDING, SB_BUTTON_WIDTH,
281 scrollbar_len); 279 bot - top);
282 drawBevel (scrollBar.win, SB_BUTTON_BEVEL_X, 280 drawBevel (this, SB_BUTTON_BEVEL_X,
283 height - SB_BUTTON_BOTH_HEIGHT, SB_BUTTON_WIDTH, 281 height - SB_BUTTON_BOTH_HEIGHT, SB_BUTTON_WIDTH,
284 SB_BUTTON_HEIGHT); 282 SB_BUTTON_HEIGHT);
285 drawBevel (scrollBar.win, SB_BUTTON_BEVEL_X, 283 drawBevel (this, SB_BUTTON_BEVEL_X,
286 height - SB_BUTTON_SINGLE_HEIGHT, SB_BUTTON_WIDTH, 284 height - SB_BUTTON_SINGLE_HEIGHT, SB_BUTTON_WIDTH,
287 SB_BUTTON_HEIGHT); 285 SB_BUTTON_HEIGHT);
288 286
289 s = (scrollbar_isUp ()) ? upArrowHi : upArrow; 287 src = state == STATE_UP ? upArrowHi : upArrow;
290 XCopyArea (disp, s, scrollBar.win, whiteGC, 0, 0, 288 XCopyArea (term->dpy, src, win, whiteGC, 0, 0,
291 ARROW_WIDTH, ARROW_HEIGHT, SB_BUTTON_FACE_X, 289 ARROW_WIDTH, ARROW_HEIGHT, SB_BUTTON_FACE_X,
292 height - SB_BUTTON_BOTH_HEIGHT + SB_BEVEL_WIDTH_UPPER_LEFT); 290 height - SB_BUTTON_BOTH_HEIGHT + SB_BEVEL_WIDTH_UPPER_LEFT);
293 291
294 s = (scrollbar_isDn ()) ? downArrowHi : downArrow; 292 src = state == STATE_DOWN ? downArrowHi : downArrow;
295 XCopyArea (disp, s, scrollBar.win, whiteGC, 0, 0, 293 XCopyArea (term->dpy, src, win, whiteGC, 0, 0,
296 ARROW_WIDTH, ARROW_HEIGHT, SB_BUTTON_FACE_X, 294 ARROW_WIDTH, ARROW_HEIGHT, SB_BUTTON_FACE_X,
297 height - SB_BUTTON_SINGLE_HEIGHT + SB_BEVEL_WIDTH_UPPER_LEFT); 295 height - SB_BUTTON_SINGLE_HEIGHT + SB_BEVEL_WIDTH_UPPER_LEFT);
298 } 296 }
299 297
300 return 1; 298 return 1;
301} 299}
302#endif /* NEXT_SCROLLBAR */ 300#endif /* NEXT_SCROLLBAR */
303/*----------------------- end-of-file (C source) -----------------------*/ 301/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines