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.2 by pcg, Mon Nov 24 17:31:28 2003 UTC vs.
Revision 1.31 by root, Mon Feb 21 07:41:03 2011 UTC

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

Diff Legend

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