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.8 by pcg, Fri Feb 13 12:16:21 2004 UTC vs.
Revision 1.15 by root, Sun Aug 15 22:09:24 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.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 *----------------------------------------------------------------------*/ 22 *----------------------------------------------------------------------*/
22 23
23#include "../config.h" /* NECESSARY */ 24#include "../config.h" /* NECESSARY */
24#include "rxvt.h" /* NECESSARY */ 25#include "rxvt.h" /* NECESSARY */
25#include "scrollbar-xterm.intpro" /* PROTOS for internal routines */
26 26
27/*----------------------------------------------------------------------*/ 27/*----------------------------------------------------------------------*/
28#if defined(XTERM_SCROLLBAR) 28#if defined(XTERM_SCROLLBAR)
29 29
30#define x_stp_width 8 30#define x_stp_width 8
44 scrollBar.init |= R_SB_XTERM; 44 scrollBar.init |= R_SB_XTERM;
45 gcvalue.stipple = XCreateBitmapFromData (display->display, scrollBar.win, 45 gcvalue.stipple = XCreateBitmapFromData (display->display, 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 {
50 rxvt_print_error ("can't create bitmap"); 49 rxvt_fatal ("can't create bitmap\n");
51 exit (EXIT_FAILURE); 50
52 }
53 gcvalue.fill_style = FillOpaqueStippled; 51 gcvalue.fill_style = FillOpaqueStippled;
54 gcvalue.foreground = PixColors[Color_fg]; 52 gcvalue.foreground = pix_colors[Color_fg];
55 gcvalue.background = PixColors[Color_bg]; 53 gcvalue.background = pix_colors[Color_bg];
56 54
57 xscrollbarGC = XCreateGC (display->display, scrollBar.win, 55 xscrollbarGC = XCreateGC (display->display, scrollBar.win,
58 GCForeground | GCBackground 56 GCForeground | GCBackground
59 | GCFillStyle | GCStipple, &gcvalue); 57 | GCFillStyle | GCStipple, &gcvalue);
60 gcvalue.foreground = PixColors[Color_border]; 58 gcvalue.foreground = pix_colors[Color_border];
61 ShadowGC = XCreateGC (display->display, scrollBar.win, GCForeground, &gcvalue); 59 ShadowGC = XCreateGC (display->display, scrollBar.win, GCForeground, &gcvalue);
62 } 60 }
63 /* instead of XClearWindow (display->display, scrollBar.win); */ 61 /* instead of XClearWindow (display->display, 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 (display->display, scrollBar.win, 64 XClearArea (display->display, scrollBar.win,
67 sb_shadow + xsb, last_top, 65 sb_shadow + xsb, last_top,
68 sbwidth, (scrollBar.top - last_top), False); 66 sbwidth, (scrollBar.top - last_top), False);
69 67

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines