… | |
… | |
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 | |
30 | int |
30 | int |
31 | rxvt_term::scrollbar_show_plain (int update, int last_top, int last_bot, int scrollbar_len) |
31 | scrollBar_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, GCForeground, &gcvalue); |
43 | pscrollbarGC = XCreateGC (term->dpy, win, GCForeground, &gcvalue); |
44 | } |
44 | } |
45 | |
45 | |
46 | xsb = OPTION (Opt_scrollBar_right) ? 1 : 0; |
46 | xsb = term->option (Opt_scrollBar_right) ? 1 : 0; |
47 | |
47 | |
48 | if (update) |
48 | if (update) |
49 | { |
49 | { |
50 | if (last_top < scrollBar.top) |
50 | if (last_top < top) |
51 | XClearArea (xdisp, scrollBar.win, |
51 | XClearArea (term->dpy, win, |
52 | sb_shadow, last_top, |
52 | 0, last_top, |
53 | sbwidth + 1, (scrollBar.top - last_top), False); |
53 | sbwidth + 1, top - last_top, False); |
54 | |
54 | |
55 | if (scrollBar.bot < last_bot) |
55 | if (bot < last_bot) |
56 | XClearArea (xdisp, scrollBar.win, |
56 | XClearArea (term->dpy, win, |
57 | sb_shadow, scrollBar.bot, |
57 | 0, bot, |
58 | sbwidth + 1, (last_bot - scrollBar.bot), False); |
58 | sbwidth + 1, last_bot - bot, False); |
59 | } |
59 | } |
60 | else |
60 | else |
61 | XClearWindow (xdisp, scrollBar.win); |
61 | XClearWindow (term->dpy, win); |
62 | |
62 | |
63 | /* scrollbar slider */ |
63 | /* scrollbar slider */ |
64 | XFillRectangle (xdisp, scrollBar.win, pscrollbarGC, |
64 | XFillRectangle (term->dpy, win, pscrollbarGC, |
65 | 1 - xsb, scrollBar.top, sbwidth, scrollbar_len); |
65 | 1 - xsb, top, sbwidth, len); |
66 | |
66 | |
67 | return 1; |
67 | return 1; |
68 | } |
68 | } |
69 | |
69 | |
70 | #endif |
70 | #endif |