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.14 by pcg, Fri Feb 13 12:16:21 2004 UTC vs.
Revision 1.19 by root, Sun Aug 15 22:09:24 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
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 * 10 *
10 * 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
11 * 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
12 * the Free Software Foundation; either version 2 of the License, or 13 * the Free Software Foundation; either version 2 of the License, or
13 * (at your option) any later version. 14 * (at your option) any later version.
… …
22 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
23 *----------------------------------------------------------------------*/ 24 *----------------------------------------------------------------------*/
24 25
25#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
26#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
27#include "scrollbar.intpro" /* PROTOS for internal routines */
28 28
29/*----------------------------------------------------------------------*/ 29/*----------------------------------------------------------------------*/
30 30
31/* 31/*
32 * Map or unmap a scrollbar. Returns non-zero upon change of state 32 * Map or unmap a scrollbar. Returns non-zero upon change of state
… …
113 TermWin.parent[0], 113 TermWin.parent[0],
114 window_sb_x, 0, 114 window_sb_x, 0,
115 scrollbar_TotalWidth (), 115 scrollbar_TotalWidth (),
116 szHint.height, 116 szHint.height,
117 0, 117 0,
118 PixColors[Color_fg], 118 pix_colors[Color_fg],
119 PixColors[Color_bg]); 119 pix_colors[Color_bg]);
120#ifdef DEBUG_X 120#ifdef DEBUG_X
121 XStoreName (display->display, scrollBar.win, "scrollbar"); 121 XStoreName (display->display, scrollBar.win, "scrollbar");
122#endif 122#endif
123 XDefineCursor (display->display, scrollBar.win, leftptr_cursor); 123 XDefineCursor (display->display, scrollBar.win, leftptr_cursor);
124 124
… …
200 200
201# if (defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)) 201# if (defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR))
202 if (scrollstyle) 202 if (scrollstyle)
203 { 203 {
204# ifdef NEXT_SCROLLBAR 204# ifdef NEXT_SCROLLBAR
205 if (STRNCASECMP (scrollstyle, "next", 4) == 0) 205 if (strncasecmp (scrollstyle, "next", 4) == 0)
206 style = R_SB_NEXT; 206 style = R_SB_NEXT;
207# endif 207# endif
208# ifdef XTERM_SCROLLBAR 208# ifdef XTERM_SCROLLBAR
209 if (STRNCASECMP (scrollstyle, "xterm", 5) == 0) 209 if (strncasecmp (scrollstyle, "xterm", 5) == 0)
210 style = R_SB_XTERM; 210 style = R_SB_XTERM;
211# endif 211# endif
212# ifdef PLAIN_SCROLLBAR 212# ifdef PLAIN_SCROLLBAR
213 if (STRNCASECMP (scrollstyle, "plain", 5) == 0) 213 if (strncasecmp (scrollstyle, "plain", 5) == 0)
214 style = R_SB_PLAIN; 214 style = R_SB_PLAIN;
215# endif 215# endif
216 216
217 } 217 }
218# endif 218# endif
… …
228 if (style != R_SB_NEXT) /* dishonour request - for now */ 228 if (style != R_SB_NEXT) /* dishonour request - for now */
229 if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM) 229 if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM)
230 width = min (i, SB_WIDTH_MAXIMUM); 230 width = min (i, SB_WIDTH_MAXIMUM);
231 231
232# if defined(RXVT_SCROLLBAR) 232# if defined(RXVT_SCROLLBAR)
233 if (! (Options & Opt_scrollBar_floating) && style == R_SB_RXVT) 233 if (! (options & Opt_scrollBar_floating) && style == R_SB_RXVT)
234 sb_shadow = SHADOW; 234 sb_shadow = SHADOW;
235# endif 235# endif
236 236
237 scrollBar.style = style; 237 scrollBar.style = style;
238 scrollBar.width = width; 238 scrollBar.width = width;
239 239
240 /* scrollbar_align = R_SB_ALIGN_CENTRE; */ 240 /* scrollbar_align = R_SB_ALIGN_CENTRE; */
241 if (scrollalign) 241 if (scrollalign)
242 { 242 {
243 if (STRNCASECMP (scrollalign, "top", 3) == 0) 243 if (strncasecmp (scrollalign, "top", 3) == 0)
244 scrollbar_align = R_SB_ALIGN_TOP; 244 scrollbar_align = R_SB_ALIGN_TOP;
245 else if (STRNCASECMP (scrollalign, "bottom", 6) == 0) 245 else if (strncasecmp (scrollalign, "bottom", 6) == 0)
246 scrollbar_align = R_SB_ALIGN_BOTTOM; 246 scrollbar_align = R_SB_ALIGN_BOTTOM;
247 } 247 }
248#endif 248#endif
249} 249}
250 250

Diff Legend

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