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.2 by pcg, Sat Jan 31 04:20:20 2004 UTC vs.
Revision 1.6 by pcg, Thu Apr 8 20:31:45 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>
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.
26 27
27/*----------------------------------------------------------------------*/ 28/*----------------------------------------------------------------------*/
28#if defined(PLAIN_SCROLLBAR) 29#if defined(PLAIN_SCROLLBAR)
29 30
30int 31int
31rxvt_term::scrollbar_show_plain (int update __attribute__((unused)), int last_top, int last_bot, int scrollbar_len) 32rxvt_term::scrollbar_show_plain (int update __attribute__ ((unused)), int last_top, int last_bot, int scrollbar_len)
32{ 33{
33 int xsb = 0; 34 int xsb = 0;
34 int sbwidth = scrollBar.width - 1; 35 int sbwidth = scrollBar.width - 1;
35 36
36 if ((scrollBar.init & R_SB_PLAIN) == 0) { 37 if ((scrollBar.init & R_SB_PLAIN) == 0)
37 XGCValues gcvalue; 38 {
39 XGCValues gcvalue;
38 40
39 scrollBar.init |= R_SB_PLAIN; 41 scrollBar.init |= R_SB_PLAIN;
40 gcvalue.foreground = PixColors[Color_fg]; 42 gcvalue.foreground = PixColors[Color_fg];
41 gcvalue.background = PixColors[Color_bg]; 43 gcvalue.background = PixColors[Color_bg];
42 44
43 pscrollbarGC = XCreateGC(Xdisplay, scrollBar.win, 45 pscrollbarGC = XCreateGC (display->display, scrollBar.win,
44 GCForeground | GCBackground 46 GCForeground | GCBackground, &gcvalue);
45 | GCFillStyle, &gcvalue);
46 } 47 }
47/* instead of XClearWindow (Xdisplay, scrollBar.win); */ 48 /* instead of XClearWindow (display->display, scrollBar.win); */
48 xsb = (Options & Opt_scrollBar_right) ? 1 : 0; 49 xsb = (Options & Opt_scrollBar_right) ? 1 : 0;
49 if (last_top < scrollBar.top) 50 if (last_top < scrollBar.top)
50 XClearArea(Xdisplay, scrollBar.win, 51 XClearArea (display->display, scrollBar.win,
51 sb_shadow + xsb, last_top, 52 sb_shadow + xsb, last_top,
52 sbwidth + 1, (scrollBar.top - last_top), False); 53 sbwidth + 1, (scrollBar.top - last_top), False);
53 54
54 if (scrollBar.bot < last_bot) 55 if (scrollBar.bot < last_bot)
55 XClearArea(Xdisplay, scrollBar.win, 56 XClearArea (display->display, scrollBar.win,
56 sb_shadow + xsb, scrollBar.bot, 57 sb_shadow + xsb, scrollBar.bot,
57 sbwidth + 1, (last_bot - scrollBar.bot), False); 58 sbwidth + 1, (last_bot - scrollBar.bot), False);
58 59
59/* scrollbar slider */ 60 /* scrollbar slider */
60 XFillRectangle(Xdisplay, scrollBar.win, pscrollbarGC, 61 XFillRectangle (display->display, scrollBar.win, pscrollbarGC,
61 xsb + 1, scrollBar.top, sbwidth, scrollbar_len); 62 xsb + 1, scrollBar.top, sbwidth, scrollbar_len);
62 63
63 return 1; 64 return 1;
64} 65}
65#endif /* XTERM_SCROLLBAR */ 66
66/*----------------------- end-of-file (C source) -----------------------*/ 67#endif
68

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines