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.22 by root, Wed Jan 25 21:09:21 2006 UTC vs.
Revision 1.23 by root, Thu Feb 2 18:04:46 2006 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 (xdisp, scrollBar.win, width, height, depth); 126 d = XCreatePixmap (dpy, scrollBar.win, width, height, 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 {
… …
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
141 XDrawPoint (xdisp, d, pointcolour, x, y); 141 XDrawPoint (dpy, d, pointcolour, x, y);
142 } 142 }
143 } 143 }
144 return d; 144 return d;
145} 145}
146 146
… …
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 = pix_colors_focused[Color_Black];
158 blackGC = XCreateGC (xdisp, scrollBar.win, 158 blackGC = XCreateGC (dpy, scrollBar.win,
159 GCForeground | GCGraphicsExposures, &gcvalue); 159 GCForeground | GCGraphicsExposures, &gcvalue);
160 160
161 gcvalue.foreground = pix_colors_focused[Color_White]; 161 gcvalue.foreground = pix_colors_focused[Color_White];
162 whiteGC = XCreateGC (xdisp, scrollBar.win, 162 whiteGC = XCreateGC (dpy, scrollBar.win,
163 GCForeground | GCGraphicsExposures, &gcvalue); 163 GCForeground | GCGraphicsExposures, &gcvalue);
164 164
165 xcol.red = 0xaeba; 165 xcol.red = 0xaeba;
166 xcol.green = 0xaaaa; 166 xcol.green = 0xaaaa;
167 xcol.blue = 0xaeba; 167 xcol.blue = 0xaeba;
168 xcol.pixel = pix_colors_focused[Color_scroll]; 168 xcol.pixel = pix_colors_focused[Color_scroll];
169 light = gcvalue.foreground = xcol.pixel; 169 light = gcvalue.foreground = xcol.pixel;
170 grayGC = XCreateGC (xdisp, scrollBar.win, 170 grayGC = XCreateGC (dpy, 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 = pix_colors_focused[Color_Grey25]; 177 xcol.pixel = pix_colors_focused[Color_Grey25];
178 dark = gcvalue.foreground = xcol.pixel; 178 dark = gcvalue.foreground = xcol.pixel;
179 darkGC = XCreateGC (xdisp, scrollBar.win, 179 darkGC = XCreateGC (dpy, scrollBar.win,
180 GCForeground | GCGraphicsExposures, &gcvalue); 180 GCForeground | GCGraphicsExposures, &gcvalue);
181 181
182 stipple = XCreateBitmapFromData (xdisp, scrollBar.win, 182 stipple = XCreateBitmapFromData (dpy, 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 (xdisp, scrollBar.win, pix_colors_focused[Color_Red]); */ 191 /* XSetWindowBackground (dpy, scrollBar.win, pix_colors_focused[Color_Red]); */
192 192
193 stippleGC = XCreateGC (xdisp, scrollBar.win, 193 stippleGC = XCreateGC (dpy, 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 (xdisp, d, whiteGC, x1, y1, x2, y1); 219 XDrawLine (dpy, d, whiteGC, x1, y1, x2, y1);
220 XDrawLine (xdisp, d, whiteGC, x1, y1, x1, y2); 220 XDrawLine (dpy, d, whiteGC, x1, y1, x1, y2);
221 /* black bottom and right */ 221 /* black bottom and right */
222 XDrawLine (xdisp, d, blackGC, x1, y2, x2, y2); 222 XDrawLine (dpy, d, blackGC, x1, y2, x2, y2);
223 XDrawLine (xdisp, d, blackGC, x2, y1, x2, y2); 223 XDrawLine (dpy, 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 (xdisp, d, darkGC, x1, y2, x2, y2); 226 XDrawLine (dpy, d, darkGC, x1, y2, x2, y2);
227 XDrawLine (xdisp, d, darkGC, x2, y1, x2, y2); 227 XDrawLine (dpy, 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 (top_row == 0 || !update) 242 if (top_row == 0 || !update)
243 { 243 {
244 XFillRectangle (xdisp, scrollBar.win, grayGC, 0, 0, 244 XFillRectangle (dpy, scrollBar.win, grayGC, 0, 0,
245 SB_WIDTH_NEXT + 1, height); 245 SB_WIDTH_NEXT + 1, height);
246 XDrawRectangle (xdisp, scrollBar.win, blackGC, 0, 246 XDrawRectangle (dpy, 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 (xdisp, scrollBar.win, stippleGC, 249 XFillRectangle (dpy, scrollBar.win, stippleGC,
250 SB_LEFT_PADDING, 0, SB_BUTTON_WIDTH, height); 250 SB_LEFT_PADDING, 0, SB_BUTTON_WIDTH, height);
251 } 251 }
252 252
253 if (top_row) 253 if (top_row)
254 { 254 {
255 if (last_top < scrollBar.top || !update) 255 if (last_top < scrollBar.top || !update)
256 XFillRectangle (xdisp, scrollBar.win, stippleGC, 256 XFillRectangle (dpy, scrollBar.win, stippleGC,
257 SB_LEFT_PADDING, SB_PADDING + last_top, 257 SB_LEFT_PADDING, SB_PADDING + last_top,
258 SB_BUTTON_WIDTH, scrollBar.top - last_top); 258 SB_BUTTON_WIDTH, scrollBar.top - last_top);
259 259
260 if (scrollBar.bot < last_bot || !update) 260 if (scrollBar.bot < last_bot || !update)
261 XFillRectangle (xdisp, scrollBar.win, stippleGC, 261 XFillRectangle (dpy, scrollBar.win, stippleGC,
262 SB_LEFT_PADDING, scrollBar.bot + SB_PADDING, 262 SB_LEFT_PADDING, scrollBar.bot + SB_PADDING,
263 SB_BUTTON_WIDTH, (last_bot - scrollBar.bot)); 263 SB_BUTTON_WIDTH, (last_bot - scrollBar.bot));
264 264
265 XFillRectangle (xdisp, scrollBar.win, grayGC, 265 XFillRectangle (dpy, scrollBar.win, grayGC,
266 SB_LEFT_PADDING, scrollBar.top + SB_PADDING, 266 SB_LEFT_PADDING, scrollBar.top + SB_PADDING,
267 SB_BUTTON_WIDTH, scrollbar_len); 267 SB_BUTTON_WIDTH, scrollbar_len);
268 268
269 XCopyArea (xdisp, dimple, scrollBar.win, whiteGC, 0, 0, 269 XCopyArea (dpy, dimple, scrollBar.win, whiteGC, 0, 0,
270 SCROLLER_DIMPLE_WIDTH, SCROLLER_DIMPLE_HEIGHT, 270 SCROLLER_DIMPLE_WIDTH, SCROLLER_DIMPLE_HEIGHT,
271 (SB_WIDTH_NEXT - SCROLLER_DIMPLE_WIDTH) / 2, 271 (SB_WIDTH_NEXT - SCROLLER_DIMPLE_WIDTH) / 2,
272 scrollBar.top + SB_BEVEL_WIDTH_UPPER_LEFT + 272 scrollBar.top + SB_BEVEL_WIDTH_UPPER_LEFT +
273 (scrollbar_len - SCROLLER_DIMPLE_HEIGHT) / 2); 273 (scrollbar_len - SCROLLER_DIMPLE_HEIGHT) / 2);
274 274
… …
281 drawBevel (scrollBar.win, SB_BUTTON_BEVEL_X, 281 drawBevel (scrollBar.win, SB_BUTTON_BEVEL_X,
282 height - SB_BUTTON_SINGLE_HEIGHT, SB_BUTTON_WIDTH, 282 height - SB_BUTTON_SINGLE_HEIGHT, SB_BUTTON_WIDTH,
283 SB_BUTTON_HEIGHT); 283 SB_BUTTON_HEIGHT);
284 284
285 s = (scrollbar_isUp ()) ? upArrowHi : upArrow; 285 s = (scrollbar_isUp ()) ? upArrowHi : upArrow;
286 XCopyArea (xdisp, s, scrollBar.win, whiteGC, 0, 0, 286 XCopyArea (dpy, s, scrollBar.win, whiteGC, 0, 0,
287 ARROW_WIDTH, ARROW_HEIGHT, SB_BUTTON_FACE_X, 287 ARROW_WIDTH, ARROW_HEIGHT, SB_BUTTON_FACE_X,
288 height - SB_BUTTON_BOTH_HEIGHT + SB_BEVEL_WIDTH_UPPER_LEFT); 288 height - SB_BUTTON_BOTH_HEIGHT + SB_BEVEL_WIDTH_UPPER_LEFT);
289 289
290 s = (scrollbar_isDn ()) ? downArrowHi : downArrow; 290 s = (scrollbar_isDn ()) ? downArrowHi : downArrow;
291 XCopyArea (xdisp, s, scrollBar.win, whiteGC, 0, 0, 291 XCopyArea (dpy, s, scrollBar.win, whiteGC, 0, 0,
292 ARROW_WIDTH, ARROW_HEIGHT, SB_BUTTON_FACE_X, 292 ARROW_WIDTH, ARROW_HEIGHT, SB_BUTTON_FACE_X,
293 height - SB_BUTTON_SINGLE_HEIGHT + SB_BEVEL_WIDTH_UPPER_LEFT); 293 height - SB_BUTTON_SINGLE_HEIGHT + SB_BEVEL_WIDTH_UPPER_LEFT);
294 } 294 }
295 295
296 return 1; 296 return 1;

Diff Legend

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