ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/scrollbar-plain.C
(Generate patch)

Comparing rxvt-unicode/src/scrollbar-plain.C (file contents):
Revision 1.6 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.22 by ayin, Sat Dec 29 14:25:42 2007 UTC

… …
2 * File: scrollbar-plain.C 2 * File: scrollbar-plain.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) 1999-2001 Geoff Wing <gcw@pobox.com> 6 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com>
7 * Copyright (c) 2004 Marc Lehmann <pcg@goof.com> 7 * Copyright (c) 2004-2006 Marc Lehmann <pcg@goof.com>
8 * 8 *
9 * This program is free software; you can redistribute it and/or modify 9 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by 10 * it under the terms of the GNU General Public License as published by
11 * the Free Software Foundation; either version 2 of the License, or 11 * the Free Software Foundation; either version 2 of the License, or
12 * (at your option) any later version. 12 * (at your option) any later version.
… …
21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22 *----------------------------------------------------------------------*/ 22 *----------------------------------------------------------------------*/
23 23
24#include "../config.h" /* NECESSARY */ 24#include "../config.h" /* NECESSARY */
25#include "rxvt.h" /* NECESSARY */ 25#include "rxvt.h" /* NECESSARY */
26#include "scrollbar-plain.intpro" /* PROTOS for internal routines */
27 26
28/*----------------------------------------------------------------------*/ 27/*----------------------------------------------------------------------*/
29#if defined(PLAIN_SCROLLBAR) 28#if defined(PLAIN_SCROLLBAR)
30 29
31int 30int
32rxvt_term::scrollbar_show_plain (int update __attribute__ ((unused)), int last_top, int last_bot, int scrollbar_len) 31rxvt_term::scrollbar_show_plain (int update, int last_top, int last_bot, int scrollbar_len)
33{ 32{
34 int xsb = 0; 33 int xsb = 0;
35 int sbwidth = scrollBar.width - 1; 34 int sbwidth = scrollBar.width - 1;
36 35
37 if ((scrollBar.init & R_SB_PLAIN) == 0) 36 if ((scrollBar.init & R_SB_PLAIN) == 0)
38 { 37 {
39 XGCValues gcvalue; 38 XGCValues gcvalue;
40 39
41 scrollBar.init |= R_SB_PLAIN; 40 scrollBar.init |= R_SB_PLAIN;
42 gcvalue.foreground = PixColors[Color_fg]; 41 gcvalue.foreground = pix_colors_focused[Color_scroll];
43 gcvalue.background = PixColors[Color_bg];
44 42
45 pscrollbarGC = XCreateGC (display->display, scrollBar.win, 43 pscrollbarGC = XCreateGC (dpy, scrollBar.win, GCForeground, &gcvalue);
46 GCForeground | GCBackground, &gcvalue);
47 } 44 }
48 /* instead of XClearWindow (display->display, scrollBar.win); */
49 xsb = (Options & Opt_scrollBar_right) ? 1 : 0;
50 if (last_top < scrollBar.top)
51 XClearArea (display->display, scrollBar.win,
52 sb_shadow + xsb, last_top,
53 sbwidth + 1, (scrollBar.top - last_top), False);
54 45
46 xsb = option (Opt_scrollBar_right) ? 1 : 0;
47
48 if (update)
49 {
50 if (last_top < scrollBar.top)
51 XClearArea (dpy, scrollBar.win,
52 scrollBar.sb_shadow, last_top,
53 sbwidth + 1, scrollBar.top - last_top, False);
54
55 if (scrollBar.bot < last_bot) 55 if (scrollBar.bot < last_bot)
56 XClearArea (display->display, scrollBar.win, 56 XClearArea (dpy, scrollBar.win,
57 sb_shadow + xsb, scrollBar.bot, 57 scrollBar.sb_shadow, scrollBar.bot,
58 sbwidth + 1, (last_bot - scrollBar.bot), False); 58 sbwidth + 1, last_bot - scrollBar.bot, False);
59 }
60 else
61 XClearWindow (dpy, scrollBar.win);
59 62
60 /* scrollbar slider */ 63 /* scrollbar slider */
61 XFillRectangle (display->display, scrollBar.win, pscrollbarGC, 64 XFillRectangle (dpy, scrollBar.win, pscrollbarGC,
62 xsb + 1, scrollBar.top, sbwidth, scrollbar_len); 65 1 - xsb, scrollBar.top, sbwidth, scrollbar_len);
63 66
64 return 1; 67 return 1;
65} 68}
66 69
67#endif 70#endif

Diff Legend

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