ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/scrollbar-xterm.C
(Generate patch)

Comparing rxvt-unicode/src/scrollbar-xterm.C (file contents):
Revision 1.15 by root, Sun Aug 15 22:09:24 2004 UTC vs.
Revision 1.23 by root, Sat Dec 16 02:33:18 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: scrollbar-xterm.C 2 * File: scrollbar-xterm.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.
… …
30#define x_stp_width 8 30#define x_stp_width 8
31#define x_stp_height 2 31#define x_stp_height 2
32const unsigned char x_stp_bits[] = { 0xaa, 0x55 }; 32const unsigned char x_stp_bits[] = { 0xaa, 0x55 };
33 33
34int 34int
35rxvt_term::scrollbar_show_xterm (int update __attribute__ ((unused)), int last_top, int last_bot, int scrollbar_len) 35rxvt_term::scrollbar_show_xterm (int update, int last_top, int last_bot, int scrollbar_len)
36{ 36{
37 int xsb = 0; 37 int xsb = 0;
38 int sbwidth = scrollBar.width - 1; 38 int sbwidth = scrollBar.width - 1;
39 39
40 if ((scrollBar.init & R_SB_XTERM) == 0) 40 if ((scrollBar.init & R_SB_XTERM) == 0)
41 { 41 {
42 XGCValues gcvalue; 42 XGCValues gcvalue;
43 43
44 scrollBar.init |= R_SB_XTERM; 44 scrollBar.init |= R_SB_XTERM;
45 gcvalue.stipple = XCreateBitmapFromData (display->display, scrollBar.win, 45 gcvalue.stipple = XCreateBitmapFromData (dpy, scrollBar.win,
46 (char *)x_stp_bits, x_stp_width, 46 (char *)x_stp_bits, x_stp_width,
47 x_stp_height); 47 x_stp_height);
48 if (!gcvalue.stipple) 48 if (!gcvalue.stipple)
49 rxvt_fatal ("can't create bitmap\n"); 49 rxvt_fatal ("can't create bitmap\n");
50 50
51 gcvalue.fill_style = FillOpaqueStippled; 51 gcvalue.fill_style = FillOpaqueStippled;
52 gcvalue.foreground = pix_colors[Color_fg]; 52 gcvalue.foreground = pix_colors_focused[Color_scroll];
53 gcvalue.background = pix_colors[Color_bg]; 53 gcvalue.background = pix_colors_focused[Color_bg];
54 54
55 xscrollbarGC = XCreateGC (display->display, scrollBar.win, 55 xscrollbarGC = XCreateGC (dpy, scrollBar.win,
56 GCForeground | GCBackground 56 GCForeground | GCBackground
57 | GCFillStyle | GCStipple, &gcvalue); 57 | GCFillStyle | GCStipple, &gcvalue);
58 gcvalue.foreground = pix_colors[Color_border]; 58 gcvalue.foreground = pix_colors_focused[Color_border];
59 ShadowGC = XCreateGC (display->display, scrollBar.win, GCForeground, &gcvalue); 59 ShadowGC = XCreateGC (dpy, scrollBar.win, GCForeground, &gcvalue);
60 } 60 }
61 /* instead of XClearWindow (display->display, scrollBar.win); */
62 xsb = (options & Opt_scrollBar_right) ? 1 : 0;
63 if (last_top < scrollBar.top)
64 XClearArea (display->display, scrollBar.win,
65 sb_shadow + xsb, last_top,
66 sbwidth, (scrollBar.top - last_top), False);
67 61
62 if (update)
63 {
64 xsb = OPTION (Opt_scrollBar_right) ? 1 : 0;
65 if (last_top < scrollBar.top)
66 XClearArea (dpy, scrollBar.win,
67 sb_shadow + xsb, last_top,
68 sbwidth, (scrollBar.top - last_top), False);
69
68 if (scrollBar.bot < last_bot) 70 if (scrollBar.bot < last_bot)
69 XClearArea (display->display, scrollBar.win, 71 XClearArea (dpy, scrollBar.win,
70 sb_shadow + xsb, scrollBar.bot, 72 sb_shadow + xsb, scrollBar.bot,
71 sbwidth, (last_bot - scrollBar.bot), False); 73 sbwidth, (last_bot - scrollBar.bot), False);
74 }
75 else
76 XClearWindow (dpy, scrollBar.win);
72 77
73 /* scrollbar slider */ 78 /* scrollbar slider */
74 XFillRectangle (display->display, scrollBar.win, xscrollbarGC, 79 XFillRectangle (dpy, scrollBar.win, xscrollbarGC,
75 xsb + 1, scrollBar.top, sbwidth - 2, scrollbar_len); 80 xsb + 1, scrollBar.top, sbwidth - 2, scrollbar_len);
76 81
77 XDrawLine (display->display, scrollBar.win, ShadowGC, 82 XDrawLine (dpy, scrollBar.win, ShadowGC,
78 xsb ? 0 : sbwidth, scrollBar.beg, 83 xsb ? 0 : sbwidth, scrollBar.beg,
79 xsb ? 0 : sbwidth, scrollBar.end); 84 xsb ? 0 : sbwidth, scrollBar.end);
80 return 1; 85 return 1;
81} 86}
82#endif /* XTERM_SCROLLBAR */ 87#endif /* XTERM_SCROLLBAR */

Diff Legend

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