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.15 by root, Mon Aug 23 19:39:48 2004 UTC vs.
Revision 1.16 by root, Fri Feb 4 11:41:23 2005 UTC

… …
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
140 XDrawPoint (display->display, d, pointcolour, x, y); 141 XDrawPoint (display->display, d, pointcolour, x, y);
141 } 142 }
142 } 143 }
143 return d; 144 return d;
144} 145}
… …
148{ 149{
149 XGCValues gcvalue; 150 XGCValues gcvalue;
150 XColor xcol; 151 XColor xcol;
151 Pixmap stipple; 152 Pixmap stipple;
152 unsigned long light, dark; 153 unsigned long light, dark;
154 dDisp;
153 155
154 gcvalue.graphics_exposures = False; 156 gcvalue.graphics_exposures = False;
155 157
156 gcvalue.foreground = pix_colors_focused[Color_Black]; 158 gcvalue.foreground = pix_colors_focused[Color_Black];
157 blackGC = XCreateGC (display->display, scrollBar.win, 159 blackGC = XCreateGC (disp, scrollBar.win,
158 GCForeground | GCGraphicsExposures, &gcvalue); 160 GCForeground | GCGraphicsExposures, &gcvalue);
159 161
160 gcvalue.foreground = pix_colors_focused[Color_White]; 162 gcvalue.foreground = pix_colors_focused[Color_White];
161 whiteGC = XCreateGC (display->display, scrollBar.win, 163 whiteGC = XCreateGC (disp, scrollBar.win,
162 GCForeground | GCGraphicsExposures, &gcvalue); 164 GCForeground | GCGraphicsExposures, &gcvalue);
163 165
164 xcol.red = 0xaeba; 166 xcol.red = 0xaeba;
165 xcol.green = 0xaaaa; 167 xcol.green = 0xaaaa;
166 xcol.blue = 0xaeba; 168 xcol.blue = 0xaeba;
167 //if (!rXAllocColor (&xcol, "light gray"))//TODO//D// 169 //if (!rXAllocColor (&xcol, "light gray"))//TODO//D//
168 xcol.pixel = pix_colors_focused[Color_AntiqueWhite]; 170 xcol.pixel = pix_colors_focused[Color_AntiqueWhite];
169 light = gcvalue.foreground = xcol.pixel; 171 light = gcvalue.foreground = xcol.pixel;
170 grayGC = XCreateGC (display->display, scrollBar.win, 172 grayGC = XCreateGC (disp, scrollBar.win,
171 GCForeground | GCGraphicsExposures, &gcvalue); 173 GCForeground | GCGraphicsExposures, &gcvalue);
172 174
173 xcol.red = 0x51aa; 175 xcol.red = 0x51aa;
174 xcol.green = 0x5555; 176 xcol.green = 0x5555;
175 xcol.blue = 0x5144; 177 xcol.blue = 0x5144;
176 //if (!rXAllocColor (&xcol, "dark gray"))//TODO//D// 178 //if (!rXAllocColor (&xcol, "dark gray"))//TODO//D//
177 xcol.pixel = pix_colors_focused[Color_Grey25]; 179 xcol.pixel = pix_colors_focused[Color_Grey25];
178 dark = gcvalue.foreground = xcol.pixel; 180 dark = gcvalue.foreground = xcol.pixel;
179 darkGC = XCreateGC (display->display, scrollBar.win, 181 darkGC = XCreateGC (disp, scrollBar.win,
180 GCForeground | GCGraphicsExposures, &gcvalue); 182 GCForeground | GCGraphicsExposures, &gcvalue);
181 183
182 stipple = XCreateBitmapFromData (display->display, scrollBar.win, 184 stipple = XCreateBitmapFromData (disp, scrollBar.win,
183 (char *)n_stp_bits, n_stp_width, 185 (char *)n_stp_bits, n_stp_width,
184 n_stp_height); 186 n_stp_height);
185 187
186 gcvalue.foreground = dark; 188 gcvalue.foreground = dark;
187 gcvalue.background = light; 189 gcvalue.background = light;
188 gcvalue.fill_style = FillOpaqueStippled; 190 gcvalue.fill_style = FillOpaqueStippled;
189 gcvalue.stipple = stipple; 191 gcvalue.stipple = stipple;
190 192
191 /* XSetWindowBackground (display->display, scrollBar.win, pix_colors_focused[Color_Red]); */ 193 /* XSetWindowBackground (disp, scrollBar.win, pix_colors_focused[Color_Red]); */
192 194
193 stippleGC = XCreateGC (display->display, scrollBar.win, 195 stippleGC = XCreateGC (disp, scrollBar.win,
194 GCForeground | GCBackground | GCStipple 196 GCForeground | GCBackground | GCStipple
195 | GCFillStyle | GCGraphicsExposures, &gcvalue); 197 | GCFillStyle | GCGraphicsExposures, &gcvalue);
196 198
197 dimple = renderPixmap (SCROLLER_DIMPLE, SCROLLER_DIMPLE_WIDTH, 199 dimple = renderPixmap (SCROLLER_DIMPLE, SCROLLER_DIMPLE_WIDTH,
198 SCROLLER_DIMPLE_HEIGHT); 200 SCROLLER_DIMPLE_HEIGHT);
… …
209 211
210/* Draw bevel & arrows */ 212/* Draw bevel & arrows */
211void 213void
212rxvt_term::drawBevel (Drawable d, int x1, int y1, int w, int h) 214rxvt_term::drawBevel (Drawable d, int x1, int y1, int w, int h)
213{ 215{
214 int x2, y2; 216 int x2, y2;
217 dDisp;
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 (display->display, d, whiteGC, x1, y1, x2, y1); 222 XDrawLine (disp, d, whiteGC, x1, y1, x2, y1);
220 XDrawLine (display->display, d, whiteGC, x1, y1, x1, y2); 223 XDrawLine (disp, d, whiteGC, x1, y1, x1, y2);
221 /* black bottom and right */ 224 /* black bottom and right */
222 XDrawLine (display->display, d, blackGC, x1, y2, x2, y2); 225 XDrawLine (disp, d, blackGC, x1, y2, x2, y2);
223 XDrawLine (display->display, d, blackGC, x2, y1, x2, y2); 226 XDrawLine (disp, d, 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 (display->display, d, darkGC, x1, y2, x2, y2); 229 XDrawLine (disp, d, darkGC, x1, y2, x2, y2);
227 XDrawLine (display->display, d, darkGC, x2, y1, x2, y2); 230 XDrawLine (disp, d, 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) 234rxvt_term::scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len)
232{ 235{
233 int height = scrollBar.end + SB_BUTTON_TOTAL_HEIGHT + SB_PADDING; 236 int height = scrollBar.end + SB_BUTTON_TOTAL_HEIGHT + SB_PADDING;
234 Drawable s; 237 Drawable s;
238 dDisp;
235 239
236 if ((scrollBar.init & R_SB_NEXT) == 0) 240 if ((scrollBar.init & R_SB_NEXT) == 0)
237 { 241 {
238 scrollBar.init |= R_SB_NEXT; 242 scrollBar.init |= R_SB_NEXT;
239 init_scrollbar_stuff (); 243 init_scrollbar_stuff ();
240 } 244 }
241 245
242 if (TermWin.nscrolled == 0 || !update) 246 if (TermWin.nscrolled == 0 || !update)
243 { 247 {
244 XFillRectangle (display->display, scrollBar.win, grayGC, 0, 0, 248 XFillRectangle (disp, scrollBar.win, grayGC, 0, 0,
245 SB_WIDTH_NEXT + 1, height); 249 SB_WIDTH_NEXT + 1, height);
246 XDrawRectangle (display->display, scrollBar.win, blackGC, 0, 250 XDrawRectangle (disp, scrollBar.win, blackGC, 0,
247 -SB_BORDER_WIDTH, SB_WIDTH_NEXT, 251 -SB_BORDER_WIDTH, SB_WIDTH_NEXT,
248 height + SB_BORDER_WIDTH); 252 height + SB_BORDER_WIDTH);
249 XFillRectangle (display->display, scrollBar.win, stippleGC, 253 XFillRectangle (disp, scrollBar.win, stippleGC,
250 SB_LEFT_PADDING, 0, SB_BUTTON_WIDTH, height); 254 SB_LEFT_PADDING, 0, SB_BUTTON_WIDTH, height);
251 } 255 }
252 256
253 if (TermWin.nscrolled) 257 if (TermWin.nscrolled)
254 { 258 {
255 if (last_top < scrollBar.top || !update) 259 if (last_top < scrollBar.top || !update)
256 XFillRectangle (display->display, scrollBar.win, stippleGC, 260 XFillRectangle (disp, scrollBar.win, stippleGC,
257 SB_LEFT_PADDING, SB_PADDING + last_top, 261 SB_LEFT_PADDING, SB_PADDING + last_top,
258 SB_BUTTON_WIDTH, scrollBar.top - last_top); 262 SB_BUTTON_WIDTH, scrollBar.top - last_top);
259 263
260 if (scrollBar.bot < last_bot || !update) 264 if (scrollBar.bot < last_bot || !update)
261 XFillRectangle (display->display, scrollBar.win, stippleGC, 265 XFillRectangle (disp, scrollBar.win, stippleGC,
262 SB_LEFT_PADDING, scrollBar.bot + SB_PADDING, 266 SB_LEFT_PADDING, scrollBar.bot + SB_PADDING,
263 SB_BUTTON_WIDTH, (last_bot - scrollBar.bot)); 267 SB_BUTTON_WIDTH, (last_bot - scrollBar.bot));
264 268
265 XFillRectangle (display->display, scrollBar.win, grayGC, 269 XFillRectangle (disp, scrollBar.win, grayGC,
266 SB_LEFT_PADDING, scrollBar.top + SB_PADDING, 270 SB_LEFT_PADDING, scrollBar.top + SB_PADDING,
267 SB_BUTTON_WIDTH, scrollbar_len); 271 SB_BUTTON_WIDTH, scrollbar_len);
268 272
269 XCopyArea (display->display, dimple, scrollBar.win, whiteGC, 0, 0, 273 XCopyArea (disp, dimple, scrollBar.win, whiteGC, 0, 0,
270 SCROLLER_DIMPLE_WIDTH, SCROLLER_DIMPLE_HEIGHT, 274 SCROLLER_DIMPLE_WIDTH, SCROLLER_DIMPLE_HEIGHT,
271 (SB_WIDTH_NEXT - SCROLLER_DIMPLE_WIDTH) / 2, 275 (SB_WIDTH_NEXT - SCROLLER_DIMPLE_WIDTH) / 2,
272 scrollBar.top + SB_BEVEL_WIDTH_UPPER_LEFT + 276 scrollBar.top + SB_BEVEL_WIDTH_UPPER_LEFT +
273 (scrollbar_len - SCROLLER_DIMPLE_HEIGHT) / 2); 277 (scrollbar_len - SCROLLER_DIMPLE_HEIGHT) / 2);
274 278
… …
281 drawBevel (scrollBar.win, SB_BUTTON_BEVEL_X, 285 drawBevel (scrollBar.win, SB_BUTTON_BEVEL_X,
282 height - SB_BUTTON_SINGLE_HEIGHT, SB_BUTTON_WIDTH, 286 height - SB_BUTTON_SINGLE_HEIGHT, SB_BUTTON_WIDTH,
283 SB_BUTTON_HEIGHT); 287 SB_BUTTON_HEIGHT);
284 288
285 s = (scrollbar_isUp ()) ? upArrowHi : upArrow; 289 s = (scrollbar_isUp ()) ? upArrowHi : upArrow;
286 XCopyArea (display->display, s, scrollBar.win, whiteGC, 0, 0, 290 XCopyArea (disp, s, scrollBar.win, whiteGC, 0, 0,
287 ARROW_WIDTH, ARROW_HEIGHT, SB_BUTTON_FACE_X, 291 ARROW_WIDTH, ARROW_HEIGHT, SB_BUTTON_FACE_X,
288 height - SB_BUTTON_BOTH_HEIGHT + SB_BEVEL_WIDTH_UPPER_LEFT); 292 height - SB_BUTTON_BOTH_HEIGHT + SB_BEVEL_WIDTH_UPPER_LEFT);
289 293
290 s = (scrollbar_isDn ()) ? downArrowHi : downArrow; 294 s = (scrollbar_isDn ()) ? downArrowHi : downArrow;
291 XCopyArea (display->display, s, scrollBar.win, whiteGC, 0, 0, 295 XCopyArea (disp, s, scrollBar.win, whiteGC, 0, 0,
292 ARROW_WIDTH, ARROW_HEIGHT, SB_BUTTON_FACE_X, 296 ARROW_WIDTH, ARROW_HEIGHT, SB_BUTTON_FACE_X,
293 height - SB_BUTTON_SINGLE_HEIGHT + SB_BEVEL_WIDTH_UPPER_LEFT); 297 height - SB_BUTTON_SINGLE_HEIGHT + SB_BEVEL_WIDTH_UPPER_LEFT);
294 } 298 }
295 299
296 return 1; 300 return 1;

Diff Legend

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