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.6 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.13 by root, Mon Aug 23 19:57:33 2004 UTC

… …
21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22 *----------------------------------------------------------------------*/ 22 *----------------------------------------------------------------------*/
23 23
24#include "../config.h" /* NECESSARY */ 24#include "../config.h" /* NECESSARY */
25#include "rxvt.h" /* NECESSARY */ 25#include "rxvt.h" /* NECESSARY */
26#include "scrollbar-plain.intpro" /* PROTOS for internal routines */
27 26
28/*----------------------------------------------------------------------*/ 27/*----------------------------------------------------------------------*/
29#if defined(PLAIN_SCROLLBAR) 28#if defined(PLAIN_SCROLLBAR)
30 29
31int 30int
32rxvt_term::scrollbar_show_plain (int update __attribute__ ((unused)), int last_top, int last_bot, int scrollbar_len) 31rxvt_term::scrollbar_show_plain (int update, int last_top, int last_bot, int scrollbar_len)
33{ 32{
34 int xsb = 0; 33 int xsb = 0;
35 int sbwidth = scrollBar.width - 1; 34 int sbwidth = scrollBar.width - 1;
36 35
37 if ((scrollBar.init & R_SB_PLAIN) == 0) 36 if ((scrollBar.init & R_SB_PLAIN) == 0)
38 { 37 {
39 XGCValues gcvalue; 38 XGCValues gcvalue;
40 39
41 scrollBar.init |= R_SB_PLAIN; 40 scrollBar.init |= R_SB_PLAIN;
42 gcvalue.foreground = PixColors[Color_fg]; 41 gcvalue.foreground = pix_colors_focused[Color_scroll];
43 gcvalue.background = PixColors[Color_bg];
44 42
45 pscrollbarGC = XCreateGC (display->display, scrollBar.win, 43 pscrollbarGC = XCreateGC (display->display, scrollBar.win,
46 GCForeground | GCBackground, &gcvalue); 44 GCForeground, &gcvalue);
47 } 45 }
48 /* instead of XClearWindow (display->display, scrollBar.win); */
49 xsb = (Options & Opt_scrollBar_right) ? 1 : 0;
50 if (last_top < scrollBar.top)
51 XClearArea (display->display, scrollBar.win,
52 sb_shadow + xsb, last_top,
53 sbwidth + 1, (scrollBar.top - last_top), False);
54 46
55 if (scrollBar.bot < last_bot) 47 xsb = (options & Opt_scrollBar_right) ? 1 : 0;
48
49 if (update)
50 {
51 if (last_top < scrollBar.top)
56 XClearArea (display->display, scrollBar.win, 52 XClearArea (display->display, scrollBar.win,
53 sb_shadow + xsb, last_top,
54 sbwidth + 1, (scrollBar.top - last_top), False);
55
56 if (scrollBar.bot < last_bot)
57 XClearArea (display->display, scrollBar.win,
57 sb_shadow + xsb, scrollBar.bot, 58 sb_shadow + xsb, scrollBar.bot,
58 sbwidth + 1, (last_bot - scrollBar.bot), False); 59 sbwidth + 1, (last_bot - scrollBar.bot), False);
60 }
61 else
62 XClearWindow (display->display, scrollBar.win);
59 63
60 /* scrollbar slider */ 64 /* scrollbar slider */
61 XFillRectangle (display->display, scrollBar.win, pscrollbarGC, 65 XFillRectangle (display->display, scrollBar.win, pscrollbarGC,
62 xsb + 1, scrollBar.top, sbwidth, scrollbar_len); 66 xsb + 1, scrollBar.top, sbwidth, scrollbar_len);
63 67

Diff Legend

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