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.16 by root, Tue Jan 31 19:11:43 2006 UTC vs.
Revision 1.25 by ayin, Tue Feb 19 13:01:33 2008 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.
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, int last_top, int last_bot, int scrollbar_len) 31scrollBar_t::show_plain (int update)
32{ 32{
33 int xsb = 0; 33 int xsb = 0;
34 int sbwidth = scrollBar.width - 1; 34 int sbwidth = width - 1;
35 35
36 if ((scrollBar.init & R_SB_PLAIN) == 0) 36 if ((init & R_SB_PLAIN) == 0)
37 { 37 {
38 XGCValues gcvalue; 38 XGCValues gcvalue;
39 39
40 scrollBar.init |= R_SB_PLAIN; 40 init |= R_SB_PLAIN;
41 gcvalue.foreground = pix_colors_focused[Color_scroll]; 41 gcvalue.foreground = term->pix_colors_focused[Color_scroll];
42 42
43 pscrollbarGC = XCreateGC (xdisp, scrollBar.win, 43 pscrollbarGC = XCreateGC (term->dpy, win, GCForeground, &gcvalue);
44 GCForeground, &gcvalue);
45 } 44 }
46 45
47 xsb = OPTION (Opt_scrollBar_right) ? 1 : 0; 46 xsb = term->option (Opt_scrollBar_right) ? 1 : 0;
48 47
49 if (update) 48 if (update)
50 { 49 {
51 if (last_top < scrollBar.top) 50 if (last_top < top)
52 XClearArea (xdisp, scrollBar.win, 51 XClearArea (term->dpy, win,
53 sb_shadow + xsb, last_top, 52 0, last_top,
54 sbwidth + 1, (scrollBar.top - last_top), False); 53 sbwidth + 1, top - last_top, False);
55 54
56 if (scrollBar.bot < last_bot) 55 if (bot < last_bot)
57 XClearArea (xdisp, scrollBar.win, 56 XClearArea (term->dpy, win,
58 sb_shadow + xsb, scrollBar.bot, 57 0, bot,
59 sbwidth + 1, (last_bot - scrollBar.bot), False); 58 sbwidth + 1, last_bot - bot, False);
60 } 59 }
61 else 60 else
62 XClearWindow (xdisp, scrollBar.win); 61 XClearWindow (term->dpy, win);
63 62
64 /* scrollbar slider */ 63 /* scrollbar slider */
65 XFillRectangle (xdisp, scrollBar.win, pscrollbarGC, 64 XFillRectangle (term->dpy, win, pscrollbarGC,
66 1 - xsb, scrollBar.top, sbwidth, scrollbar_len); 65 1 - xsb, top, sbwidth, len);
67 66
68 return 1; 67 return 1;
69} 68}
70 69
71#endif 70#endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines