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.26 by ayin, Tue Dec 18 11:08:45 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
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-2006 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
31#define x_stp_height 2 31#define x_stp_height 2
32const unsigned char x_stp_bits[] = { 0xaa, 0x55 }; 32const unsigned char x_stp_bits[] = { 0xaa, 0x55 };
33 33
34int 34int
35rxvt_term::scrollbar_show_xterm (int update __attribute__ ((unused)), int last_top, int last_bot, int scrollbar_len) 35rxvt_term::scrollbar_show_xterm (int update, int last_top, int last_bot, int scrollbar_len)
36{ 36{
37 int xsb = 0; 37 int xsb = 0;
38 int sbwidth = scrollBar.width - 1; 38 int sbwidth = scrollBar.width - 1;
39 39
40 if ((scrollBar.init & R_SB_XTERM) == 0) 40 if ((scrollBar.init & R_SB_XTERM) == 0)
41 { 41 {
42 XGCValues gcvalue; 42 XGCValues gcvalue;
43 43
44 scrollBar.init |= R_SB_XTERM; 44 scrollBar.init |= R_SB_XTERM;
45 gcvalue.stipple = XCreateBitmapFromData (display->display, scrollBar.win, 45 gcvalue.stipple = XCreateBitmapFromData (dpy, 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_focused[Color_scroll];
55 gcvalue.background = PixColors[Color_bg]; 53 gcvalue.background = pix_colors_focused[Color_bg];
56 54
57 xscrollbarGC = XCreateGC (display->display, scrollBar.win, 55 xscrollbarGC = XCreateGC (dpy, 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_focused[Color_border];
61 ShadowGC = XCreateGC (display->display, scrollBar.win, GCForeground, &gcvalue); 59 ShadowGC = XCreateGC (dpy, scrollBar.win, GCForeground, &gcvalue);
62 } 60 }
63 /* instead of XClearWindow (display->display, scrollBar.win); */
64 xsb = (Options & Opt_scrollBar_right) ? 1 : 0;
65 if (last_top < scrollBar.top)
66 XClearArea (display->display, scrollBar.win,
67 sb_shadow + xsb, last_top,
68 sbwidth, (scrollBar.top - last_top), False);
69 61
62 xsb = option (Opt_scrollBar_right) ? 1 : 0;
63
64 if (update)
65 {
66 if (last_top < scrollBar.top)
67 XClearArea (dpy, scrollBar.win,
68 sb_shadow + xsb, last_top,
69 sbwidth, (scrollBar.top - last_top), False);
70
70 if (scrollBar.bot < last_bot) 71 if (scrollBar.bot < last_bot)
71 XClearArea (display->display, scrollBar.win, 72 XClearArea (dpy, scrollBar.win,
72 sb_shadow + xsb, scrollBar.bot, 73 sb_shadow + xsb, scrollBar.bot,
73 sbwidth, (last_bot - scrollBar.bot), False); 74 sbwidth, (last_bot - scrollBar.bot), False);
75 }
76 else
77 XClearWindow (dpy, scrollBar.win);
74 78
75 /* scrollbar slider */ 79 /* scrollbar slider */
76 XFillRectangle (display->display, scrollBar.win, xscrollbarGC, 80 XFillRectangle (dpy, scrollBar.win, xscrollbarGC,
77 xsb + 1, scrollBar.top, sbwidth - 2, scrollbar_len); 81 xsb + 1, scrollBar.top, sbwidth - 2, scrollbar_len);
78 82
79 XDrawLine (display->display, scrollBar.win, ShadowGC, 83 XDrawLine (dpy, scrollBar.win, ShadowGC,
80 xsb ? 0 : sbwidth, scrollBar.beg, 84 xsb ? 0 : sbwidth, scrollBar.beg,
81 xsb ? 0 : sbwidth, scrollBar.end); 85 xsb ? 0 : sbwidth, scrollBar.end);
82 return 1; 86 return 1;
83} 87}
84#endif /* XTERM_SCROLLBAR */ 88#endif /* XTERM_SCROLLBAR */
85/*----------------------- end-of-file (C source) -----------------------*/ 89/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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