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.8 by pcg, Mon Feb 9 07:11:49 2004 UTC vs.
Revision 1.9 by pcg, Fri Feb 13 12:16:21 2004 UTC

… …
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, XDEPTH); 126 d = XCreatePixmap (display->display, scrollBar.win, width, height, XDEPTH);
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 {
… …
135 pointcolour = grayGC; 135 pointcolour = grayGC;
136 else if (a == '%' || a == 'd') 136 else if (a == '%' || a == 'd')
137 pointcolour = darkGC; 137 pointcolour = darkGC;
138 else /* if (a == '#' || a == 'b' || a) */ 138 else /* if (a == '#' || a == 'b' || a) */
139 pointcolour = blackGC; 139 pointcolour = blackGC;
140 XDrawPoint(display->display, d, pointcolour, x, y); 140 XDrawPoint (display->display, d, pointcolour, x, y);
141 } 141 }
142 } 142 }
143 return d; 143 return d;
144} 144}
145 145
… …
152 unsigned long light, dark; 152 unsigned long light, dark;
153 153
154 gcvalue.graphics_exposures = False; 154 gcvalue.graphics_exposures = False;
155 155
156 gcvalue.foreground = PixColors[Color_Black]; 156 gcvalue.foreground = PixColors[Color_Black];
157 blackGC = XCreateGC(display->display, scrollBar.win, 157 blackGC = XCreateGC (display->display, scrollBar.win,
158 GCForeground | GCGraphicsExposures, &gcvalue); 158 GCForeground | GCGraphicsExposures, &gcvalue);
159 159
160 gcvalue.foreground = PixColors[Color_White]; 160 gcvalue.foreground = PixColors[Color_White];
161 whiteGC = XCreateGC(display->display, scrollBar.win, 161 whiteGC = XCreateGC (display->display, scrollBar.win,
162 GCForeground | GCGraphicsExposures, &gcvalue); 162 GCForeground | GCGraphicsExposures, &gcvalue);
163 163
164 xcol.red = 0xaeba; 164 xcol.red = 0xaeba;
165 xcol.green = 0xaaaa; 165 xcol.green = 0xaaaa;
166 xcol.blue = 0xaeba; 166 xcol.blue = 0xaeba;
167 //if (!rXAllocColor (&xcol, "light gray"))//TODO//D// 167 //if (!rXAllocColor (&xcol, "light gray"))//TODO//D//
168 xcol.pixel = PixColors[Color_AntiqueWhite]; 168 xcol.pixel = PixColors[Color_AntiqueWhite];
169 light = gcvalue.foreground = xcol.pixel; 169 light = gcvalue.foreground = xcol.pixel;
170 grayGC = XCreateGC(display->display, scrollBar.win, 170 grayGC = XCreateGC (display->display, scrollBar.win,
171 GCForeground | GCGraphicsExposures, &gcvalue); 171 GCForeground | GCGraphicsExposures, &gcvalue);
172 172
173 xcol.red = 0x51aa; 173 xcol.red = 0x51aa;
174 xcol.green = 0x5555; 174 xcol.green = 0x5555;
175 xcol.blue = 0x5144; 175 xcol.blue = 0x5144;
176 //if (!rXAllocColor (&xcol, "dark gray"))//TODO//D// 176 //if (!rXAllocColor (&xcol, "dark gray"))//TODO//D//
177 xcol.pixel = PixColors[Color_Grey25]; 177 xcol.pixel = PixColors[Color_Grey25];
178 dark = gcvalue.foreground = xcol.pixel; 178 dark = gcvalue.foreground = xcol.pixel;
179 darkGC = XCreateGC(display->display, scrollBar.win, 179 darkGC = XCreateGC (display->display, scrollBar.win,
180 GCForeground | GCGraphicsExposures, &gcvalue); 180 GCForeground | GCGraphicsExposures, &gcvalue);
181 181
182 stipple = XCreateBitmapFromData(display->display, scrollBar.win, 182 stipple = XCreateBitmapFromData (display->display, scrollBar.win,
183 (char *)n_stp_bits, n_stp_width, 183 (char *)n_stp_bits, n_stp_width,
184 n_stp_height); 184 n_stp_height);
185 185
186 gcvalue.foreground = dark; 186 gcvalue.foreground = dark;
187 gcvalue.background = light; 187 gcvalue.background = light;
188 gcvalue.fill_style = FillOpaqueStippled; 188 gcvalue.fill_style = FillOpaqueStippled;
189 gcvalue.stipple = stipple; 189 gcvalue.stipple = stipple;
190 190
191 /* XSetWindowBackground(display->display, scrollBar.win, PixColors[Color_Red]); */ 191 /* XSetWindowBackground (display->display, scrollBar.win, PixColors[Color_Red]); */
192 192
193 stippleGC = XCreateGC(display->display, scrollBar.win, 193 stippleGC = XCreateGC (display->display, scrollBar.win,
194 GCForeground | GCBackground | GCStipple 194 GCForeground | GCBackground | GCStipple
195 | GCFillStyle | GCGraphicsExposures, &gcvalue); 195 | GCFillStyle | GCGraphicsExposures, &gcvalue);
196 196
197 dimple = renderPixmap (SCROLLER_DIMPLE, SCROLLER_DIMPLE_WIDTH, 197 dimple = renderPixmap (SCROLLER_DIMPLE, SCROLLER_DIMPLE_WIDTH,
198 SCROLLER_DIMPLE_HEIGHT); 198 SCROLLER_DIMPLE_HEIGHT);
… …
214 int x2, y2; 214 int x2, y2;
215 215
216 x2 = x1 + w - 1; /* right point */ 216 x2 = x1 + w - 1; /* right point */
217 y2 = y1 + h - 1; /* bottom point */ 217 y2 = y1 + h - 1; /* bottom point */
218 /* white top and left */ 218 /* white top and left */
219 XDrawLine(display->display, d, whiteGC, x1, y1, x2, y1); 219 XDrawLine (display->display, d, whiteGC, x1, y1, x2, y1);
220 XDrawLine(display->display, d, whiteGC, x1, y1, x1, y2); 220 XDrawLine (display->display, d, whiteGC, x1, y1, x1, y2);
221 /* black bottom and right */ 221 /* black bottom and right */
222 XDrawLine(display->display, d, blackGC, x1, y2, x2, y2); 222 XDrawLine (display->display, d, blackGC, x1, y2, x2, y2);
223 XDrawLine(display->display, d, blackGC, x2, y1, x2, y2); 223 XDrawLine (display->display, d, blackGC, x2, y1, x2, y2);
224 /* dark inside bottom and right */ 224 /* dark inside bottom and right */
225 x1++, y1++, x2--, y2--; /* move in one point */ 225 x1++, y1++, x2--, y2--; /* move in one point */
226 XDrawLine(display->display, d, darkGC, x1, y2, x2, y2); 226 XDrawLine (display->display, d, darkGC, x1, y2, x2, y2);
227 XDrawLine(display->display, d, darkGC, x2, y1, x2, y2); 227 XDrawLine (display->display, d, darkGC, x2, y1, x2, y2);
228} 228}
229 229
230int 230int
231rxvt_term::scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len) 231rxvt_term::scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len)
232{ 232{
… …
239 init_scrollbar_stuff (); 239 init_scrollbar_stuff ();
240 } 240 }
241 241
242 if (TermWin.nscrolled == 0 || !update) 242 if (TermWin.nscrolled == 0 || !update)
243 { 243 {
244 XFillRectangle(display->display, scrollBar.win, grayGC, 0, 0, 244 XFillRectangle (display->display, scrollBar.win, grayGC, 0, 0,
245 SB_WIDTH_NEXT + 1, height); 245 SB_WIDTH_NEXT + 1, height);
246 XDrawRectangle(display->display, scrollBar.win, blackGC, 0, 246 XDrawRectangle (display->display, scrollBar.win, blackGC, 0,
247 -SB_BORDER_WIDTH, SB_WIDTH_NEXT, 247 -SB_BORDER_WIDTH, SB_WIDTH_NEXT,
248 height + SB_BORDER_WIDTH); 248 height + SB_BORDER_WIDTH);
249 XFillRectangle(display->display, scrollBar.win, stippleGC, 249 XFillRectangle (display->display, scrollBar.win, stippleGC,
250 SB_LEFT_PADDING, 0, SB_BUTTON_WIDTH, height); 250 SB_LEFT_PADDING, 0, SB_BUTTON_WIDTH, height);
251 } 251 }
252 if (TermWin.nscrolled) 252 if (TermWin.nscrolled)
253 { 253 {
254 if (last_top < scrollBar.top || !update) 254 if (last_top < scrollBar.top || !update)
255 XFillRectangle(display->display, scrollBar.win, stippleGC, 255 XFillRectangle (display->display, scrollBar.win, stippleGC,
256 SB_LEFT_PADDING, SB_PADDING + last_top, 256 SB_LEFT_PADDING, SB_PADDING + last_top,
257 SB_BUTTON_WIDTH, scrollBar.top - last_top); 257 SB_BUTTON_WIDTH, scrollBar.top - last_top);
258 if (scrollBar.bot < last_bot || !update) 258 if (scrollBar.bot < last_bot || !update)
259 XFillRectangle(display->display, scrollBar.win, stippleGC, 259 XFillRectangle (display->display, scrollBar.win, stippleGC,
260 SB_LEFT_PADDING, scrollBar.bot + SB_PADDING, 260 SB_LEFT_PADDING, scrollBar.bot + SB_PADDING,
261 SB_BUTTON_WIDTH, (last_bot - scrollBar.bot)); 261 SB_BUTTON_WIDTH, (last_bot - scrollBar.bot));
262 XFillRectangle(display->display, scrollBar.win, grayGC, 262 XFillRectangle (display->display, scrollBar.win, grayGC,
263 SB_LEFT_PADDING, scrollBar.top + SB_PADDING, 263 SB_LEFT_PADDING, scrollBar.top + SB_PADDING,
264 SB_BUTTON_WIDTH, scrollbar_len); 264 SB_BUTTON_WIDTH, scrollbar_len);
265 XCopyArea(display->display, dimple, scrollBar.win, whiteGC, 0, 0, 265 XCopyArea (display->display, dimple, scrollBar.win, whiteGC, 0, 0,
266 SCROLLER_DIMPLE_WIDTH, SCROLLER_DIMPLE_HEIGHT, 266 SCROLLER_DIMPLE_WIDTH, SCROLLER_DIMPLE_HEIGHT,
267 (SB_WIDTH_NEXT - SCROLLER_DIMPLE_WIDTH) / 2, 267 (SB_WIDTH_NEXT - SCROLLER_DIMPLE_WIDTH) / 2,
268 scrollBar.top + SB_BEVEL_WIDTH_UPPER_LEFT + 268 scrollBar.top + SB_BEVEL_WIDTH_UPPER_LEFT +
269 (scrollbar_len - SCROLLER_DIMPLE_HEIGHT) / 2); 269 (scrollbar_len - SCROLLER_DIMPLE_HEIGHT) / 2);
270 270
… …
276 SB_BUTTON_HEIGHT); 276 SB_BUTTON_HEIGHT);
277 drawBevel (scrollBar.win, SB_BUTTON_BEVEL_X, 277 drawBevel (scrollBar.win, SB_BUTTON_BEVEL_X,
278 height - SB_BUTTON_SINGLE_HEIGHT, SB_BUTTON_WIDTH, 278 height - SB_BUTTON_SINGLE_HEIGHT, SB_BUTTON_WIDTH,
279 SB_BUTTON_HEIGHT); 279 SB_BUTTON_HEIGHT);
280 280
281 s = (scrollbar_isUp()) ? upArrowHi : upArrow; 281 s = (scrollbar_isUp ()) ? upArrowHi : upArrow;
282 XCopyArea(display->display, s, scrollBar.win, whiteGC, 0, 0, 282 XCopyArea (display->display, s, scrollBar.win, whiteGC, 0, 0,
283 ARROW_WIDTH, ARROW_HEIGHT, SB_BUTTON_FACE_X, 283 ARROW_WIDTH, ARROW_HEIGHT, SB_BUTTON_FACE_X,
284 height - SB_BUTTON_BOTH_HEIGHT + SB_BEVEL_WIDTH_UPPER_LEFT); 284 height - SB_BUTTON_BOTH_HEIGHT + SB_BEVEL_WIDTH_UPPER_LEFT);
285 285
286 s = (scrollbar_isDn()) ? downArrowHi : downArrow; 286 s = (scrollbar_isDn ()) ? downArrowHi : downArrow;
287 XCopyArea(display->display, s, scrollBar.win, whiteGC, 0, 0, 287 XCopyArea (display->display, s, scrollBar.win, whiteGC, 0, 0,
288 ARROW_WIDTH, ARROW_HEIGHT, SB_BUTTON_FACE_X, 288 ARROW_WIDTH, ARROW_HEIGHT, SB_BUTTON_FACE_X,
289 height - SB_BUTTON_SINGLE_HEIGHT + SB_BEVEL_WIDTH_UPPER_LEFT); 289 height - SB_BUTTON_SINGLE_HEIGHT + SB_BEVEL_WIDTH_UPPER_LEFT);
290 } 290 }
291 return 1; 291 return 1;
292} 292}

Diff Legend

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