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.6 by pcg, Sun Feb 1 01:34:41 2004 UTC vs.
Revision 1.11 by root, Mon Jun 21 22:24:07 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines