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.30 by ayin, Tue Feb 19 17:49:16 2008 UTC vs.
Revision 1.34 by sf-exg, Fri May 30 19:40:23 2014 UTC

… …
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-2006 Marc Lehmann <pcg@goof.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 3 of the License, or
14 * (at your option) any later version. 14 * (at your option) any later version.
15 * 15 *
16 * This program is distributed in the hope that it will be useful, 16 * This program is distributed in the hope that it will be useful,
17 * but WITHOUT ANY WARRANTY; without even the implied warranty of 17 * but WITHOUT ANY WARRANTY; without even the implied warranty of
18 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 18 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
146 146
147void 147void
148scrollBar_t::init_next () 148scrollBar_t::init_next ()
149{ 149{
150 XGCValues gcvalue; 150 XGCValues gcvalue;
151 XColor xcol; 151 rxvt_color color;
152 Pixmap stipple; 152 Pixmap stipple;
153 unsigned long light, dark; 153 unsigned long light, dark;
154 154
155 gcvalue.graphics_exposures = False; 155 gcvalue.graphics_exposures = False;
156 156
… …
160 160
161 gcvalue.foreground = term->pix_colors_focused[Color_White]; 161 gcvalue.foreground = term->pix_colors_focused[Color_White];
162 whiteGC = XCreateGC (term->dpy, win, 162 whiteGC = XCreateGC (term->dpy, win,
163 GCForeground | GCGraphicsExposures, &gcvalue); 163 GCForeground | GCGraphicsExposures, &gcvalue);
164 164
165 xcol.red = 0xaeba;
166 xcol.green = 0xaaaa;
167 xcol.blue = 0xaeba;
168 xcol.pixel = term->pix_colors_focused[Color_scroll]; 165 light = term->pix_colors_focused[Color_scroll];
169 light = gcvalue.foreground = xcol.pixel; 166#if 0
167 //color used by rxvt
168 if (color.set (term, rgba (0xaeba, 0xaaaa, 0xaeba)))
169 light = color;
170#endif
171 gcvalue.foreground = light;
170 grayGC = XCreateGC (term->dpy, win, 172 grayGC = XCreateGC (term->dpy, win,
171 GCForeground | GCGraphicsExposures, &gcvalue); 173 GCForeground | GCGraphicsExposures, &gcvalue);
172 174
173 xcol.red = 0x51aa;
174 xcol.green = 0x5555;
175 xcol.blue = 0x5144;
176 //if (!rXAllocColor (&xcol, "dark gray"))//TODO//D//
177 xcol.pixel = term->pix_colors_focused[Color_Grey25]; 175 dark = term->pix_colors_focused[Color_Grey25];
178 dark = gcvalue.foreground = xcol.pixel; 176#if 0
177 //color used by rxvt
178 if (color.set (term, rgba (0x51aa, 0x5555, 0x5144)))
179 dark = color;
180#endif
181 gcvalue.foreground = dark;
179 darkGC = XCreateGC (term->dpy, win, 182 darkGC = XCreateGC (term->dpy, win,
180 GCForeground | GCGraphicsExposures, &gcvalue); 183 GCForeground | GCGraphicsExposures, &gcvalue);
181 184
182 stipple = XCreateBitmapFromData (term->dpy, win, 185 stipple = XCreateBitmapFromData (term->dpy, win,
183 (char *)n_stp_bits, n_stp_width, 186 (char *)n_stp_bits, n_stp_width,
… …
185 188
186 gcvalue.foreground = dark; 189 gcvalue.foreground = dark;
187 gcvalue.background = light; 190 gcvalue.background = light;
188 gcvalue.fill_style = FillOpaqueStippled; 191 gcvalue.fill_style = FillOpaqueStippled;
189 gcvalue.stipple = stipple; 192 gcvalue.stipple = stipple;
190
191 /* XSetWindowBackground (dpy, scrollBar.win, pix_colors_focused[Color_Red]); */
192 193
193 stippleGC = XCreateGC (term->dpy, win, 194 stippleGC = XCreateGC (term->dpy, win,
194 GCForeground | GCBackground | GCStipple 195 GCForeground | GCBackground | GCStipple
195 | GCFillStyle | GCGraphicsExposures, &gcvalue); 196 | GCFillStyle | GCGraphicsExposures, &gcvalue);
196 197
… …
233scrollBar_t::show_next (int update) 234scrollBar_t::show_next (int update)
234{ 235{
235 int height = end + SB_BUTTON_TOTAL_HEIGHT + SB_PADDING; 236 int height = end + SB_BUTTON_TOTAL_HEIGHT + SB_PADDING;
236 Drawable src; 237 Drawable src;
237 238
238 if ((init & R_SB_NEXT) == 0) 239 if ((init & SB_STYLE_NEXT) == 0)
239 { 240 {
240 init |= R_SB_NEXT; 241 init |= SB_STYLE_NEXT;
241 init_next (); 242 init_next ();
242 } 243 }
243 244
244 if (term->top_row == 0 || !update) 245 if (term->top_row == 0 || !update)
245 { 246 {
… …
282 SB_BUTTON_HEIGHT); 283 SB_BUTTON_HEIGHT);
283 drawBevel (this, SB_BUTTON_BEVEL_X, 284 drawBevel (this, SB_BUTTON_BEVEL_X,
284 height - SB_BUTTON_SINGLE_HEIGHT, SB_BUTTON_WIDTH, 285 height - SB_BUTTON_SINGLE_HEIGHT, SB_BUTTON_WIDTH,
285 SB_BUTTON_HEIGHT); 286 SB_BUTTON_HEIGHT);
286 287
287 src = state == STATE_UP ? upArrowHi : upArrow; 288 src = state == SB_STATE_UP ? upArrowHi : upArrow;
288 XCopyArea (term->dpy, src, win, whiteGC, 0, 0, 289 XCopyArea (term->dpy, src, win, whiteGC, 0, 0,
289 ARROW_WIDTH, ARROW_HEIGHT, SB_BUTTON_FACE_X, 290 ARROW_WIDTH, ARROW_HEIGHT, SB_BUTTON_FACE_X,
290 height - SB_BUTTON_BOTH_HEIGHT + SB_BEVEL_WIDTH_UPPER_LEFT); 291 height - SB_BUTTON_BOTH_HEIGHT + SB_BEVEL_WIDTH_UPPER_LEFT);
291 292
292 src = state == STATE_DOWN ? downArrowHi : downArrow; 293 src = state == SB_STATE_DOWN ? downArrowHi : downArrow;
293 XCopyArea (term->dpy, src, win, whiteGC, 0, 0, 294 XCopyArea (term->dpy, src, win, whiteGC, 0, 0,
294 ARROW_WIDTH, ARROW_HEIGHT, SB_BUTTON_FACE_X, 295 ARROW_WIDTH, ARROW_HEIGHT, SB_BUTTON_FACE_X,
295 height - SB_BUTTON_SINGLE_HEIGHT + SB_BEVEL_WIDTH_UPPER_LEFT); 296 height - SB_BUTTON_SINGLE_HEIGHT + SB_BEVEL_WIDTH_UPPER_LEFT);
296 } 297 }
297 298

Diff Legend

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