ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/scrollbar.C
(Generate patch)

Comparing rxvt-unicode/src/scrollbar.C (file contents):
Revision 1.36 by root, Thu Feb 2 18:04:46 2006 UTC vs.
Revision 1.41 by ayin, Sat Dec 29 14:40:09 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: scrollbar.C 2 * File: scrollbar.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) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 6 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
7 * - N*XTstep like scrollbars 7 * - N*XTstep like scrollbars
8 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com> 8 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com>
9 * Copyright (c) 2004 Marc Lehmann <pcg@goof.com> 9 * Copyright (c) 2004-2006 Marc Lehmann <pcg@goof.com>
10 * 10 *
11 * This program is free software; you can redistribute it and/or modify 11 * This program is free software; you can redistribute it and/or modify
12 * it under the terms of the GNU General Public License as published by 12 * it under the terms of the GNU General Public License as published by
13 * the Free Software Foundation; either version 2 of the License, or 13 * the Free Software Foundation; either version 2 of the License, or
14 * (at your option) any later version. 14 * (at your option) any later version.
… …
70#define R_SCROLLBEG_XTERM 0 70#define R_SCROLLBEG_XTERM 0
71#define R_SCROLLEND_XTERM szHint.height 71#define R_SCROLLEND_XTERM szHint.height
72#define R_SCROLLBEG_NEXT 0 72#define R_SCROLLBEG_NEXT 0
73#define R_SCROLLEND_NEXT szHint.height - (SB_BUTTON_TOTAL_HEIGHT + \ 73#define R_SCROLLEND_NEXT szHint.height - (SB_BUTTON_TOTAL_HEIGHT + \
74 SB_PADDING) 74 SB_PADDING)
75#define R_SCROLLBEG_RXVT (scrollBar.width + 1) + sb_shadow 75#define R_SCROLLBEG_RXVT (scrollBar.width + 1) + scrollBar.sb_shadow
76#define R_SCROLLEND_RXVT szHint.height - R_SCROLLBEG_RXVT - \ 76#define R_SCROLLEND_RXVT szHint.height - R_SCROLLBEG_RXVT - \
77 (2 * sb_shadow) 77 (2 * scrollBar.sb_shadow)
78 78
79#if defined(PLAIN_SCROLLBAR) 79#if defined(PLAIN_SCROLLBAR)
80 if (scrollBar.style == R_SB_PLAIN) 80 if (scrollBar.style == R_SB_PLAIN)
81 { 81 {
82 scrollBar.beg = R_SCROLLBEG_XTERM; 82 scrollBar.beg = R_SCROLLBEG_XTERM;
… …
145rxvt_term::scrollbar_show (int update) 145rxvt_term::scrollbar_show (int update)
146{ 146{
147 int ret = 0; 147 int ret = 0;
148#ifdef HAVE_SCROLLBARS 148#ifdef HAVE_SCROLLBARS
149 int top, bot, len, adj; 149 int top, bot, len, adj;
150 int scrollbar_len = 0;
150 151
151 if (!scrollBar.state) 152 if (!scrollBar.state)
152 return 0; 153 return 0;
153 154
154 if (update) 155 if (update)
… …
228 if (style != R_SB_NEXT) /* dishonour request - for now */ 229 if (style != R_SB_NEXT) /* dishonour request - for now */
229 if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM) 230 if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM)
230 width = min (i, SB_WIDTH_MAXIMUM); 231 width = min (i, SB_WIDTH_MAXIMUM);
231 232
232# ifdef RXVT_SCROLLBAR 233# ifdef RXVT_SCROLLBAR
233 if (! OPTION (Opt_scrollBar_floating) && style == R_SB_RXVT) 234 if (! option (Opt_scrollBar_floating) && style == R_SB_RXVT)
234 sb_shadow = SHADOW_WIDTH; 235 scrollBar.sb_shadow = SHADOW_WIDTH;
235# endif 236# endif
236 237
237 scrollBar.style = style; 238 scrollBar.style = style;
238 scrollBar.width = width; 239 scrollBar.width = width;
239 240

Diff Legend

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