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.2 by pcg, Mon Nov 24 17:31:28 2003 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 * $Id: scrollbar-xterm.C,v 1.2 2003/11/24 17:31:28 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>
7 * Copyright (c) 2004 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.
… …
28/*----------------------------------------------------------------------*/ 28/*----------------------------------------------------------------------*/
29#if defined(XTERM_SCROLLBAR) 29#if defined(XTERM_SCROLLBAR)
30 30
31#define x_stp_width 8 31#define x_stp_width 8
32#define x_stp_height 2 32#define x_stp_height 2
33const unsigned char x_stp_bits[] = { 0xff, 0xff }; 33const unsigned char x_stp_bits[] = { 0xaa, 0x55 };
34 34
35/* EXTPROTO */
36int 35int
37rxvt_scrollbar_show_xterm(pR_ 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)
38{ 37{
39 int xsb = 0; 38 int xsb = 0;
40 int sbwidth = R->scrollBar.width - 1; 39 int sbwidth = scrollBar.width - 1;
41 40
42 if ((R->scrollBar.init & R_SB_XTERM) == 0) { 41 if ((scrollBar.init & R_SB_XTERM) == 0)
42 {
43 XGCValues gcvalue; 43 XGCValues gcvalue;
44 44
45 R->scrollBar.init |= R_SB_XTERM; 45 scrollBar.init |= R_SB_XTERM;
46 gcvalue.stipple = XCreateBitmapFromData(R->Xdisplay, R->scrollBar.win, 46 gcvalue.stipple = XCreateBitmapFromData (display->display, scrollBar.win,
47 (char *)x_stp_bits, x_stp_width, 47 (char *)x_stp_bits, x_stp_width,
48 x_stp_height); 48 x_stp_height);
49 if (!gcvalue.stipple) { 49 if (!gcvalue.stipple)
50 rxvt_print_error("can't create bitmap"); 50 rxvt_fatal ("can't create bitmap");
51 exit(EXIT_FAILURE);
52 }
53 gcvalue.fill_style = FillOpaqueStippled;
54 gcvalue.foreground = R->PixColors[Color_fg];
55 gcvalue.background = R->PixColors[Color_bg];
56 51
52 gcvalue.fill_style = FillOpaqueStippled;
53 gcvalue.foreground = PixColors[Color_fg];
54 gcvalue.background = PixColors[Color_bg];
55
57 R->h->xscrollbarGC = XCreateGC(R->Xdisplay, R->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 = R->PixColors[Color_border]; 59 gcvalue.foreground = PixColors[Color_border];
61 R->h->ShadowGC = XCreateGC(R->Xdisplay, R->scrollBar.win, GCForeground, 60 ShadowGC = XCreateGC (display->display, scrollBar.win, GCForeground, &gcvalue);
62 &gcvalue);
63 } 61 }
64/* instead of XClearWindow (R->Xdisplay, R->scrollBar.win); */ 62 /* instead of XClearWindow (display->display, scrollBar.win); */
65 xsb = (R->Options & Opt_scrollBar_right) ? 1 : 0; 63 xsb = (Options & Opt_scrollBar_right) ? 1 : 0;
66 if (last_top < R->scrollBar.top) 64 if (last_top < scrollBar.top)
67 XClearArea(R->Xdisplay, R->scrollBar.win, 65 XClearArea (display->display, scrollBar.win,
68 R->sb_shadow + xsb, last_top, 66 sb_shadow + xsb, last_top,
69 sbwidth + 1, (R->scrollBar.top - last_top), False); 67 sbwidth, (scrollBar.top - last_top), False);
70 68
71 if (R->scrollBar.bot < last_bot) 69 if (scrollBar.bot < last_bot)
72 XClearArea(R->Xdisplay, R->scrollBar.win, 70 XClearArea (display->display, scrollBar.win,
73 R->sb_shadow + xsb, R->scrollBar.bot, 71 sb_shadow + xsb, scrollBar.bot,
74 sbwidth + 1, (last_bot - R->scrollBar.bot), False); 72 sbwidth, (last_bot - scrollBar.bot), False);
75 73
76/* scrollbar slider */ 74 /* scrollbar slider */
77 XFillRectangle(R->Xdisplay, R->scrollBar.win, R->h->xscrollbarGC, 75 XFillRectangle (display->display, scrollBar.win, xscrollbarGC,
78 xsb + 1, R->scrollBar.top, sbwidth, scrollbar_len); 76 xsb + 1, scrollBar.top, sbwidth - 2, scrollbar_len);
79 77
80 /*XDrawLine(R->Xdisplay, R->scrollBar.win, R->h->ShadowGC, 78 XDrawLine (display->display, scrollBar.win, ShadowGC,
81 xsb ? 0 : sbwidth, R->scrollBar.beg, 79 xsb ? 0 : sbwidth, scrollBar.beg,
82 xsb ? 0 : sbwidth, R->scrollBar.end);*/ 80 xsb ? 0 : sbwidth, scrollBar.end);
83 return 1; 81 return 1;
84} 82}
85#endif /* XTERM_SCROLLBAR */ 83#endif /* XTERM_SCROLLBAR */
86/*----------------------- end-of-file (C source) -----------------------*/ 84/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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