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.3 by pcg, Sun Feb 1 01:34:41 2004 UTC vs.
Revision 1.4 by pcg, Mon Feb 9 07:11:49 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 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>
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 __attribute__((unused)), 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 = PixColors[Color_fg];
42 gcvalue.background = PixColors[Color_bg]; 42 gcvalue.background = PixColors[Color_bg];
43 43
44 pscrollbarGC = XCreateGC(Xdisplay, scrollBar.win, 44 pscrollbarGC = XCreateGC (display->display, scrollBar.win,
45 GCForeground | GCBackground 45 GCForeground | GCBackground, &gcvalue);
46 | GCFillStyle, &gcvalue);
47 } 46 }
48 /* instead of XClearWindow (Xdisplay, scrollBar.win); */ 47 /* instead of XClearWindow (display->display, scrollBar.win); */
49 xsb = (Options & Opt_scrollBar_right) ? 1 : 0; 48 xsb = (Options & Opt_scrollBar_right) ? 1 : 0;
50 if (last_top < scrollBar.top) 49 if (last_top < scrollBar.top)
51 XClearArea(Xdisplay, scrollBar.win, 50 XClearArea (display->display, scrollBar.win,
52 sb_shadow + xsb, last_top, 51 sb_shadow + xsb, last_top,
53 sbwidth + 1, (scrollBar.top - last_top), False); 52 sbwidth + 1, (scrollBar.top - last_top), False);
54 53
55 if (scrollBar.bot < last_bot) 54 if (scrollBar.bot < last_bot)
56 XClearArea(Xdisplay, scrollBar.win, 55 XClearArea (display->display, scrollBar.win,
57 sb_shadow + xsb, scrollBar.bot, 56 sb_shadow + xsb, scrollBar.bot,
58 sbwidth + 1, (last_bot - scrollBar.bot), False); 57 sbwidth + 1, (last_bot - scrollBar.bot), False);
59 58
60 /* scrollbar slider */ 59 /* scrollbar slider */
61 XFillRectangle(Xdisplay, scrollBar.win, pscrollbarGC, 60 XFillRectangle (display->display, scrollBar.win, pscrollbarGC,
62 xsb + 1, scrollBar.top, sbwidth, scrollbar_len); 61 xsb + 1, scrollBar.top, sbwidth, scrollbar_len);
63 62
64 return 1; 63 return 1;
65} 64}
66#endif /* XTERM_SCROLLBAR */ 65
67/*----------------------- end-of-file (C source) -----------------------*/ 66#endif
67

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines