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.4 by pcg, Sat Jan 31 00:20:21 2004 UTC vs.
Revision 1.5 by pcg, Sat Jan 31 04:12:10 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: scrollbar-xterm.c 2 * File: scrollbar-xterm.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: scrollbar-xterm.C,v 1.4 2004/01/31 00:20:21 pcg Exp $
5 * 4 *
6 * Copyright (c) 1997,1998 mj olesen <olesen@me.QueensU.CA> 5 * Copyright (c) 1997,1998 mj olesen <olesen@me.QueensU.CA>
7 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com> 6 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com>
8 * 7 *
9 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
… …
28/*----------------------------------------------------------------------*/ 27/*----------------------------------------------------------------------*/
29#if defined(XTERM_SCROLLBAR) 28#if defined(XTERM_SCROLLBAR)
30 29
31#define x_stp_width 8 30#define x_stp_width 8
32#define x_stp_height 2 31#define x_stp_height 2
33const unsigned char x_stp_bits[] = { 0xff, 0xff }; 32const unsigned char x_stp_bits[] = { 0xaa, 0x55 };
34 33
35int 34int
36rxvt_term::scrollbar_show_xterm (int update __attribute__((unused)), int last_top, int last_bot, int scrollbar_len) 35rxvt_term::scrollbar_show_xterm (int update __attribute__((unused)), int last_top, int last_bot, int scrollbar_len)
37{ 36{
38 int xsb = 0; 37 int xsb = 0;
… …
52 gcvalue.fill_style = FillOpaqueStippled; 51 gcvalue.fill_style = FillOpaqueStippled;
53 gcvalue.foreground = PixColors[Color_fg]; 52 gcvalue.foreground = PixColors[Color_fg];
54 gcvalue.background = PixColors[Color_bg]; 53 gcvalue.background = PixColors[Color_bg];
55 54
56 xscrollbarGC = XCreateGC(Xdisplay, scrollBar.win, 55 xscrollbarGC = XCreateGC(Xdisplay, scrollBar.win,
57 GCForeground | GCBackground 56 GCForeground | GCBackground
58 | GCFillStyle | GCStipple, &gcvalue); 57 | GCFillStyle | GCStipple, &gcvalue);
59 gcvalue.foreground = PixColors[Color_border]; 58 gcvalue.foreground = PixColors[Color_border];
60 ShadowGC = XCreateGC(Xdisplay, scrollBar.win, GCForeground, 59 ShadowGC = XCreateGC(Xdisplay, scrollBar.win, GCForeground, &gcvalue);
61 &gcvalue);
62 } 60 }
63/* instead of XClearWindow (Xdisplay, scrollBar.win); */ 61/* instead of XClearWindow (Xdisplay, scrollBar.win); */
64 xsb = (Options & Opt_scrollBar_right) ? 1 : 0; 62 xsb = (Options & Opt_scrollBar_right) ? 1 : 0;
65 if (last_top < scrollBar.top) 63 if (last_top < scrollBar.top)
66 XClearArea(Xdisplay, scrollBar.win, 64 XClearArea(Xdisplay, scrollBar.win,
67 sb_shadow + xsb, last_top, 65 sb_shadow + xsb, last_top,
68 sbwidth + 1, (scrollBar.top - last_top), False); 66 sbwidth, (scrollBar.top - last_top), False);
69 67
70 if (scrollBar.bot < last_bot) 68 if (scrollBar.bot < last_bot)
71 XClearArea(Xdisplay, scrollBar.win, 69 XClearArea(Xdisplay, scrollBar.win,
72 sb_shadow + xsb, scrollBar.bot, 70 sb_shadow + xsb, scrollBar.bot,
73 sbwidth + 1, (last_bot - scrollBar.bot), False); 71 sbwidth, (last_bot - scrollBar.bot), False);
74 72
75/* scrollbar slider */ 73/* scrollbar slider */
76 XFillRectangle(Xdisplay, scrollBar.win, xscrollbarGC, 74 XFillRectangle(Xdisplay, scrollBar.win, xscrollbarGC,
77 xsb + 1, scrollBar.top, sbwidth, scrollbar_len); 75 xsb + 1, scrollBar.top, sbwidth - 2, scrollbar_len);
78 76
79 /*XDrawLine(Xdisplay, scrollBar.win, ShadowGC, 77 XDrawLine(Xdisplay, scrollBar.win, ShadowGC,
80 xsb ? 0 : sbwidth, scrollBar.beg, 78 xsb ? 0 : sbwidth, scrollBar.beg,
81 xsb ? 0 : sbwidth, scrollBar.end);*/ 79 xsb ? 0 : sbwidth, scrollBar.end);
82 return 1; 80 return 1;
83} 81}
84#endif /* XTERM_SCROLLBAR */ 82#endif /* XTERM_SCROLLBAR */
85/*----------------------- end-of-file (C source) -----------------------*/ 83/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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