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