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.5 by pcg, Sat Jan 31 00:20:21 2004 UTC vs.
Revision 1.11 by root, Sat Jul 31 15:32:50 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: scrollbar-next.c 2 * File: scrollbar-next.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: scrollbar-next.C,v 1.5 2004/01/31 00:20:21 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>
9 * Copyright (c) 2004 Marc Lehmann <pcg@goof.com>
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.
… …
40#define SCROLLER_DIMPLE_WIDTH 6 40#define SCROLLER_DIMPLE_WIDTH 6
41#define SCROLLER_DIMPLE_HEIGHT 6 41#define SCROLLER_DIMPLE_HEIGHT 6
42#define ARROW_WIDTH 13 42#define ARROW_WIDTH 13
43#define ARROW_HEIGHT 13 43#define ARROW_HEIGHT 13
44 44
45const char *const SCROLLER_DIMPLE[] = { 45const char *const SCROLLER_DIMPLE[] =
46 {
46 ".%###.", 47 ".%###.",
47 "%#%%%%", 48 "%#%%%%",
48 "#%%...", 49 "#%%...",
49 "#%.. ", 50 "#%.. ",
50 "#%. ", 51 "#%. ",
51 ".%. ." 52 ".%. ."
52}; 53 };
53const char *const SCROLLER_ARROW_UP[] = { 54const char *const SCROLLER_ARROW_UP[] =
55 {
54 ".............", 56 ".............",
55 ".............", 57 ".............",
56 "......%......", 58 "......%......",
57 "......#......", 59 "......#......",
58 ".....%#%.....", 60 ".....%#%.....",
… …
62 "...%#####%...", 64 "...%#####%...",
63 "...#######...", 65 "...#######...",
64 "..%#######%..", 66 "..%#######%..",
65 ".............", 67 ".............",
66 "............." 68 "............."
67}; 69 };
68const char *const SCROLLER_ARROW_DOWN[] = { 70const char *const SCROLLER_ARROW_DOWN[] =
71 {
69 ".............", 72 ".............",
70 ".............", 73 ".............",
71 "..%#######%..", 74 "..%#######%..",
72 "...#######...", 75 "...#######...",
73 "...%#####%...", 76 "...%#####%...",
… …
77 ".....%#%.....", 80 ".....%#%.....",
78 "......#......", 81 "......#......",
79 "......%......", 82 "......%......",
80 ".............", 83 ".............",
81 "............." 84 "............."
82}; 85 };
83const char *const HI_SCROLLER_ARROW_UP[] = { 86const char *const HI_SCROLLER_ARROW_UP[] =
87 {
84 " ", 88 " ",
85 " ", 89 " ",
86 " % ", 90 " % ",
87 " % ", 91 " % ",
88 " %%% ", 92 " %%% ",
… …
92 " %%%%%%% ", 96 " %%%%%%% ",
93 " %%%%%%% ", 97 " %%%%%%% ",
94 " %%%%%%%%% ", 98 " %%%%%%%%% ",
95 " ", 99 " ",
96 " " 100 " "
97}; 101 };
98const char *const HI_SCROLLER_ARROW_DOWN[] = { 102const char *const HI_SCROLLER_ARROW_DOWN[] =
103 {
99 " ", 104 " ",
100 " ", 105 " ",
101 " %%%%%%%%% ", 106 " %%%%%%%%% ",
102 " %%%%%%% ", 107 " %%%%%%% ",
103 " %%%%%%% ", 108 " %%%%%%% ",
… …
107 " %%% ", 112 " %%% ",
108 " % ", 113 " % ",
109 " % ", 114 " % ",
110 " ", 115 " ",
111 " " 116 " "
112}; 117 };
113 118
114Pixmap 119Pixmap
115rxvt_term::renderPixmap (const char *const *data, int width, int height) 120rxvt_term::renderPixmap (const char *const *data, int width, int height)
116{ 121{
117 char a; 122 char a;
118 int x, y; 123 int x, y;
119 Pixmap d; 124 Pixmap d;
120 GC pointcolour; 125 GC pointcolour;
121 126
122 d = XCreatePixmap(Xdisplay, scrollBar.win, width, height, XDEPTH); 127 d = XCreatePixmap (display->display, scrollBar.win, width, height, display->depth);
123 128
124 for (y = 0; y < height; y++) { 129 for (y = 0; y < height; y++)
130 {
125 for (x = 0; x < width; x++) { 131 for (x = 0; x < width; x++)
132 {
126 if ((a = data[y][x]) == ' ' || a == 'w') 133 if ((a = data[y][x]) == ' ' || a == 'w')
127 pointcolour = whiteGC; 134 pointcolour = whiteGC;
128 else if (a == '.' || a == 'l') 135 else if (a == '.' || a == 'l')
129 pointcolour = grayGC; 136 pointcolour = grayGC;
130 else if (a == '%' || a == 'd') 137 else if (a == '%' || a == 'd')
131 pointcolour = darkGC; 138 pointcolour = darkGC;
132 else /* if (a == '#' || a == 'b' || a) */ 139 else /* if (a == '#' || a == 'b' || a) */
133 pointcolour = blackGC; 140 pointcolour = blackGC;
134 XDrawPoint(Xdisplay, d, pointcolour, x, y); 141 XDrawPoint (display->display, d, pointcolour, x, y);
135 } 142 }
136 } 143 }
137 return d; 144 return d;
138} 145}
139 146
140void 147void
141rxvt_term::init_scrollbar_stuff () 148rxvt_term::init_scrollbar_stuff ()
142{ 149{
143 XGCValues gcvalue; 150 XGCValues gcvalue;
144 XColor xcol; 151 XColor xcol;
145 Pixmap stipple; 152 Pixmap stipple;
146 unsigned long light, dark; 153 unsigned long light, dark;
147 154
148 gcvalue.graphics_exposures = False; 155 gcvalue.graphics_exposures = False;
149 156
150 gcvalue.foreground = PixColors[Color_Black]; 157 gcvalue.foreground = PixColors[Color_Black];
151 blackGC = XCreateGC(Xdisplay, scrollBar.win, 158 blackGC = XCreateGC (display->display, scrollBar.win,
152 GCForeground | GCGraphicsExposures, &gcvalue); 159 GCForeground | GCGraphicsExposures, &gcvalue);
153 160
154 gcvalue.foreground = PixColors[Color_White]; 161 gcvalue.foreground = PixColors[Color_White];
155 whiteGC = XCreateGC(Xdisplay, scrollBar.win, 162 whiteGC = XCreateGC (display->display, scrollBar.win,
156 GCForeground | GCGraphicsExposures, &gcvalue); 163 GCForeground | GCGraphicsExposures, &gcvalue);
157 164
158 xcol.red = 0xaeba; 165 xcol.red = 0xaeba;
159 xcol.green = 0xaaaa; 166 xcol.green = 0xaaaa;
160 xcol.blue = 0xaeba; 167 xcol.blue = 0xaeba;
161 //if (!rXAllocColor (&xcol, "light gray"))//TODO//D// 168 //if (!rXAllocColor (&xcol, "light gray"))//TODO//D//
162 xcol.pixel = PixColors[Color_AntiqueWhite]; 169 xcol.pixel = PixColors[Color_AntiqueWhite];
163 light = gcvalue.foreground = xcol.pixel; 170 light = gcvalue.foreground = xcol.pixel;
164 grayGC = XCreateGC(Xdisplay, scrollBar.win, 171 grayGC = XCreateGC (display->display, scrollBar.win,
165 GCForeground | GCGraphicsExposures, &gcvalue); 172 GCForeground | GCGraphicsExposures, &gcvalue);
166 173
167 xcol.red = 0x51aa; 174 xcol.red = 0x51aa;
168 xcol.green = 0x5555; 175 xcol.green = 0x5555;
169 xcol.blue = 0x5144; 176 xcol.blue = 0x5144;
170 //if (!rXAllocColor (&xcol, "dark gray"))//TODO//D// 177 //if (!rXAllocColor (&xcol, "dark gray"))//TODO//D//
171 xcol.pixel = PixColors[Color_Grey25]; 178 xcol.pixel = PixColors[Color_Grey25];
172 dark = gcvalue.foreground = xcol.pixel; 179 dark = gcvalue.foreground = xcol.pixel;
173 darkGC = XCreateGC(Xdisplay, scrollBar.win, 180 darkGC = XCreateGC (display->display, scrollBar.win,
174 GCForeground | GCGraphicsExposures, &gcvalue); 181 GCForeground | GCGraphicsExposures, &gcvalue);
175 182
176 stipple = XCreateBitmapFromData(Xdisplay, scrollBar.win, 183 stipple = XCreateBitmapFromData (display->display, scrollBar.win,
177 (char *)n_stp_bits, n_stp_width, 184 (char *)n_stp_bits, n_stp_width,
178 n_stp_height); 185 n_stp_height);
179 186
180 gcvalue.foreground = dark; 187 gcvalue.foreground = dark;
181 gcvalue.background = light; 188 gcvalue.background = light;
182 gcvalue.fill_style = FillOpaqueStippled; 189 gcvalue.fill_style = FillOpaqueStippled;
183 gcvalue.stipple = stipple; 190 gcvalue.stipple = stipple;
184 191
185/* XSetWindowBackground(Xdisplay, scrollBar.win, PixColors[Color_Red]); */ 192 /* XSetWindowBackground (display->display, scrollBar.win, PixColors[Color_Red]); */
186 193
187 stippleGC = XCreateGC(Xdisplay, scrollBar.win, 194 stippleGC = XCreateGC (display->display, scrollBar.win,
188 GCForeground | GCBackground | GCStipple 195 GCForeground | GCBackground | GCStipple
189 | GCFillStyle | GCGraphicsExposures, &gcvalue); 196 | GCFillStyle | GCGraphicsExposures, &gcvalue);
190 197
191 dimple = renderPixmap (SCROLLER_DIMPLE, SCROLLER_DIMPLE_WIDTH, 198 dimple = renderPixmap (SCROLLER_DIMPLE, SCROLLER_DIMPLE_WIDTH,
192 SCROLLER_DIMPLE_HEIGHT); 199 SCROLLER_DIMPLE_HEIGHT);
193 200
194 upArrow = renderPixmap (SCROLLER_ARROW_UP, ARROW_WIDTH, 201 upArrow = renderPixmap (SCROLLER_ARROW_UP, ARROW_WIDTH,
195 ARROW_HEIGHT); 202 ARROW_HEIGHT);
196 downArrow = renderPixmap (SCROLLER_ARROW_DOWN, ARROW_WIDTH, 203 downArrow = renderPixmap (SCROLLER_ARROW_DOWN, ARROW_WIDTH,
197 ARROW_HEIGHT); 204 ARROW_HEIGHT);
198 upArrowHi = renderPixmap (HI_SCROLLER_ARROW_UP, ARROW_WIDTH, 205 upArrowHi = renderPixmap (HI_SCROLLER_ARROW_UP, ARROW_WIDTH,
199 ARROW_HEIGHT); 206 ARROW_HEIGHT);
200 downArrowHi = renderPixmap (HI_SCROLLER_ARROW_DOWN, 207 downArrowHi = renderPixmap (HI_SCROLLER_ARROW_DOWN,
201 ARROW_WIDTH, ARROW_HEIGHT); 208 ARROW_WIDTH, ARROW_HEIGHT);
202} 209}
203 210
204/* Draw bevel & arrows */ 211/* Draw bevel & arrows */
205void 212void
206rxvt_term::drawBevel (Drawable d, int x1, int y1, int w, int h) 213rxvt_term::drawBevel (Drawable d, int x1, int y1, int w, int h)
207{ 214{
208 int x2, y2; 215 int x2, y2;
209 216
210 x2 = x1 + w - 1; /* right point */ 217 x2 = x1 + w - 1; /* right point */
211 y2 = y1 + h - 1; /* bottom point */ 218 y2 = y1 + h - 1; /* bottom point */
212/* white top and left */ 219 /* white top and left */
213 XDrawLine(Xdisplay, d, whiteGC, x1, y1, x2, y1); 220 XDrawLine (display->display, d, whiteGC, x1, y1, x2, y1);
214 XDrawLine(Xdisplay, d, whiteGC, x1, y1, x1, y2); 221 XDrawLine (display->display, d, whiteGC, x1, y1, x1, y2);
215/* black bottom and right */ 222 /* black bottom and right */
216 XDrawLine(Xdisplay, d, blackGC, x1, y2, x2, y2); 223 XDrawLine (display->display, d, blackGC, x1, y2, x2, y2);
217 XDrawLine(Xdisplay, d, blackGC, x2, y1, x2, y2); 224 XDrawLine (display->display, d, blackGC, x2, y1, x2, y2);
218/* dark inside bottom and right */ 225 /* dark inside bottom and right */
219 x1++, y1++, x2--, y2--; /* move in one point */ 226 x1++, y1++, x2--, y2--; /* move in one point */
220 XDrawLine(Xdisplay, d, darkGC, x1, y2, x2, y2); 227 XDrawLine (display->display, d, darkGC, x1, y2, x2, y2);
221 XDrawLine(Xdisplay, d, darkGC, x2, y1, x2, y2); 228 XDrawLine (display->display, d, darkGC, x2, y1, x2, y2);
222} 229}
223 230
224int 231int
225rxvt_term::scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len) 232rxvt_term::scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len)
226{ 233{
227 int height = scrollBar.end + SB_BUTTON_TOTAL_HEIGHT + SB_PADDING; 234 int height = scrollBar.end + SB_BUTTON_TOTAL_HEIGHT + SB_PADDING;
228 Drawable s; 235 Drawable s;
229 236
230 if ((scrollBar.init & R_SB_NEXT) == 0) { 237 if ((scrollBar.init & R_SB_NEXT) == 0)
238 {
231 scrollBar.init |= R_SB_NEXT; 239 scrollBar.init |= R_SB_NEXT;
232 init_scrollbar_stuff (); 240 init_scrollbar_stuff ();
233 } 241 }
234 242
235 if (TermWin.nscrolled == 0 || !update) { 243 if (TermWin.nscrolled == 0 || !update)
244 {
236 XFillRectangle(Xdisplay, scrollBar.win, grayGC, 0, 0, 245 XFillRectangle (display->display, scrollBar.win, grayGC, 0, 0,
237 SB_WIDTH_NEXT + 1, height); 246 SB_WIDTH_NEXT + 1, height);
238 XDrawRectangle(Xdisplay, scrollBar.win, blackGC, 0, 247 XDrawRectangle (display->display, scrollBar.win, blackGC, 0,
239 -SB_BORDER_WIDTH, SB_WIDTH_NEXT, 248 -SB_BORDER_WIDTH, SB_WIDTH_NEXT,
240 height + SB_BORDER_WIDTH); 249 height + SB_BORDER_WIDTH);
241 XFillRectangle(Xdisplay, scrollBar.win, stippleGC, 250 XFillRectangle (display->display, scrollBar.win, stippleGC,
242 SB_LEFT_PADDING, 0, SB_BUTTON_WIDTH, height); 251 SB_LEFT_PADDING, 0, SB_BUTTON_WIDTH, height);
243 } 252 }
244 if (TermWin.nscrolled) { 253 if (TermWin.nscrolled)
254 {
245 if (last_top < scrollBar.top || !update) 255 if (last_top < scrollBar.top || !update)
246 XFillRectangle(Xdisplay, scrollBar.win, stippleGC, 256 XFillRectangle (display->display, scrollBar.win, stippleGC,
247 SB_LEFT_PADDING, SB_PADDING + last_top, 257 SB_LEFT_PADDING, SB_PADDING + last_top,
248 SB_BUTTON_WIDTH, scrollBar.top - last_top); 258 SB_BUTTON_WIDTH, scrollBar.top - last_top);
249 if (scrollBar.bot < last_bot || !update) 259 if (scrollBar.bot < last_bot || !update)
250 XFillRectangle(Xdisplay, scrollBar.win, stippleGC, 260 XFillRectangle (display->display, scrollBar.win, stippleGC,
251 SB_LEFT_PADDING, scrollBar.bot + SB_PADDING, 261 SB_LEFT_PADDING, scrollBar.bot + SB_PADDING,
252 SB_BUTTON_WIDTH, (last_bot - scrollBar.bot)); 262 SB_BUTTON_WIDTH, (last_bot - scrollBar.bot));
253 XFillRectangle(Xdisplay, scrollBar.win, grayGC, 263 XFillRectangle (display->display, scrollBar.win, grayGC,
254 SB_LEFT_PADDING, scrollBar.top + SB_PADDING, 264 SB_LEFT_PADDING, scrollBar.top + SB_PADDING,
255 SB_BUTTON_WIDTH, scrollbar_len); 265 SB_BUTTON_WIDTH, scrollbar_len);
256 XCopyArea(Xdisplay, dimple, scrollBar.win, whiteGC, 0, 0, 266 XCopyArea (display->display, dimple, scrollBar.win, whiteGC, 0, 0,
257 SCROLLER_DIMPLE_WIDTH, SCROLLER_DIMPLE_HEIGHT, 267 SCROLLER_DIMPLE_WIDTH, SCROLLER_DIMPLE_HEIGHT,
258 (SB_WIDTH_NEXT - SCROLLER_DIMPLE_WIDTH) / 2, 268 (SB_WIDTH_NEXT - SCROLLER_DIMPLE_WIDTH) / 2,
259 scrollBar.top + SB_BEVEL_WIDTH_UPPER_LEFT + 269 scrollBar.top + SB_BEVEL_WIDTH_UPPER_LEFT +
260 (scrollbar_len - SCROLLER_DIMPLE_HEIGHT) / 2); 270 (scrollbar_len - SCROLLER_DIMPLE_HEIGHT) / 2);
261 271
262 drawBevel (scrollBar.win, SB_BUTTON_BEVEL_X, 272 drawBevel (scrollBar.win, SB_BUTTON_BEVEL_X,
263 scrollBar.top + SB_PADDING, SB_BUTTON_WIDTH, 273 scrollBar.top + SB_PADDING, SB_BUTTON_WIDTH,
264 scrollbar_len); 274 scrollbar_len);
265 drawBevel (scrollBar.win, SB_BUTTON_BEVEL_X, 275 drawBevel (scrollBar.win, SB_BUTTON_BEVEL_X,
266 height - SB_BUTTON_BOTH_HEIGHT, SB_BUTTON_WIDTH, 276 height - SB_BUTTON_BOTH_HEIGHT, SB_BUTTON_WIDTH,
267 SB_BUTTON_HEIGHT); 277 SB_BUTTON_HEIGHT);
268 drawBevel (scrollBar.win, SB_BUTTON_BEVEL_X, 278 drawBevel (scrollBar.win, SB_BUTTON_BEVEL_X,
269 height - SB_BUTTON_SINGLE_HEIGHT, SB_BUTTON_WIDTH, 279 height - SB_BUTTON_SINGLE_HEIGHT, SB_BUTTON_WIDTH,
270 SB_BUTTON_HEIGHT); 280 SB_BUTTON_HEIGHT);
271 281
272 s = (scrollbar_isUp()) ? upArrowHi : upArrow; 282 s = (scrollbar_isUp ()) ? upArrowHi : upArrow;
273 XCopyArea(Xdisplay, s, scrollBar.win, whiteGC, 0, 0, 283 XCopyArea (display->display, s, scrollBar.win, whiteGC, 0, 0,
274 ARROW_WIDTH, ARROW_HEIGHT, SB_BUTTON_FACE_X, 284 ARROW_WIDTH, ARROW_HEIGHT, SB_BUTTON_FACE_X,
275 height - SB_BUTTON_BOTH_HEIGHT + SB_BEVEL_WIDTH_UPPER_LEFT); 285 height - SB_BUTTON_BOTH_HEIGHT + SB_BEVEL_WIDTH_UPPER_LEFT);
276 286
277 s = (scrollbar_isDn()) ? downArrowHi : downArrow; 287 s = (scrollbar_isDn ()) ? downArrowHi : downArrow;
278 XCopyArea(Xdisplay, s, scrollBar.win, whiteGC, 0, 0, 288 XCopyArea (display->display, s, scrollBar.win, whiteGC, 0, 0,
279 ARROW_WIDTH, ARROW_HEIGHT, SB_BUTTON_FACE_X, 289 ARROW_WIDTH, ARROW_HEIGHT, SB_BUTTON_FACE_X,
280 height - SB_BUTTON_SINGLE_HEIGHT + SB_BEVEL_WIDTH_UPPER_LEFT); 290 height - SB_BUTTON_SINGLE_HEIGHT + SB_BEVEL_WIDTH_UPPER_LEFT);
281 } 291 }
282 return 1; 292 return 1;
283} 293}
284#endif /* NEXT_SCROLLBAR */ 294#endif /* NEXT_SCROLLBAR */
285/*----------------------- end-of-file (C source) -----------------------*/ 295/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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