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.6 by pcg, Sat Jan 31 04:12:10 2004 UTC vs.
Revision 1.17 by root, Fri Apr 22 12:52:28 2005 UTC

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

Diff Legend

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