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.4 by pcg, Mon Feb 9 07:11:49 2004 UTC vs.
Revision 1.15 by root, Wed Jan 25 21:09:21 2006 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
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 * 8 *
8 * 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
9 * 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
10 * the Free Software Foundation; either version 2 of the License, or 11 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 12 * (at your option) any later version.
… …
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 *----------------------------------------------------------------------*/ 22 *----------------------------------------------------------------------*/
22 23
23#include "../config.h" /* NECESSARY */ 24#include "../config.h" /* NECESSARY */
24#include "rxvt.h" /* NECESSARY */ 25#include "rxvt.h" /* NECESSARY */
25#include "scrollbar-plain.intpro" /* PROTOS for internal routines */
26 26
27/*----------------------------------------------------------------------*/ 27/*----------------------------------------------------------------------*/
28#if defined(PLAIN_SCROLLBAR) 28#if defined(PLAIN_SCROLLBAR)
29 29
30int 30int
31rxvt_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)
32{ 32{
33 int xsb = 0; 33 int xsb = 0;
34 int sbwidth = scrollBar.width - 1; 34 int sbwidth = scrollBar.width - 1;
35 35
36 if ((scrollBar.init & R_SB_PLAIN) == 0) 36 if ((scrollBar.init & R_SB_PLAIN) == 0)
37 { 37 {
38 XGCValues gcvalue; 38 XGCValues gcvalue;
39 39
40 scrollBar.init |= R_SB_PLAIN; 40 scrollBar.init |= R_SB_PLAIN;
41 gcvalue.foreground = PixColors[Color_fg]; 41 gcvalue.foreground = pix_colors_focused[Color_scroll];
42 gcvalue.background = PixColors[Color_bg];
43 42
44 pscrollbarGC = XCreateGC (display->display, scrollBar.win, 43 pscrollbarGC = XCreateGC (xdisp, scrollBar.win,
45 GCForeground | GCBackground, &gcvalue); 44 GCForeground, &gcvalue);
46 } 45 }
47 /* instead of XClearWindow (display->display, scrollBar.win); */
48 xsb = (Options & Opt_scrollBar_right) ? 1 : 0;
49 if (last_top < scrollBar.top)
50 XClearArea (display->display, scrollBar.win,
51 sb_shadow + xsb, last_top,
52 sbwidth + 1, (scrollBar.top - last_top), False);
53 46
47 xsb = OPTION (Opt_scrollBar_right) ? 1 : 0;
48
49 if (update)
50 {
51 if (last_top < scrollBar.top)
52 XClearArea (xdisp, scrollBar.win,
53 sb_shadow + xsb, last_top,
54 sbwidth + 1, (scrollBar.top - last_top), False);
55
54 if (scrollBar.bot < last_bot) 56 if (scrollBar.bot < last_bot)
55 XClearArea (display->display, scrollBar.win, 57 XClearArea (xdisp, scrollBar.win,
56 sb_shadow + xsb, scrollBar.bot, 58 sb_shadow + xsb, scrollBar.bot,
57 sbwidth + 1, (last_bot - scrollBar.bot), False); 59 sbwidth + 1, (last_bot - scrollBar.bot), False);
60 }
61 else
62 XClearWindow (xdisp, scrollBar.win);
58 63
59 /* scrollbar slider */ 64 /* scrollbar slider */
60 XFillRectangle (display->display, scrollBar.win, pscrollbarGC, 65 XFillRectangle (xdisp, scrollBar.win, pscrollbarGC,
61 xsb + 1, scrollBar.top, sbwidth, scrollbar_len); 66 xsb + 1, scrollBar.top, sbwidth, scrollbar_len);
62 67
63 return 1; 68 return 1;
64} 69}
65 70

Diff Legend

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