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.19 by root, Sun Aug 15 22:09:24 2004 UTC vs.
Revision 1.39 by root, Tue May 1 21:30:01 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.
… …
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
33 */ 33 */
34int 34int
35rxvt_term::scrollbar_mapping (int map) 35rxvt_term::scrollbar_mapping (int map)
36{ 36{
37 int change = 0; 37 int change = 0;
38 38
39#ifdef HAVE_SCROLLBARS 39#ifdef HAVE_SCROLLBARS
40 if (map && !scrollbar_visible ()) 40 if (map)
41 { 41 {
42 scrollBar.setIdle (); 42 scrollBar.setIdle ();
43
43 if (!scrollBar.win) 44 if (!scrollBar.win)
44 resize_scrollbar (); 45 resize_scrollbar ();
46
45 if (scrollBar.win) 47 if (scrollBar.win)
46 { 48 {
47 XMapWindow (display->display, scrollBar.win); 49 XMapWindow (dpy, scrollBar.win);
48 change = 1; 50 change = 1;
49 } 51 }
50 } 52 }
51 else if (!map && scrollbar_visible ()) 53 else
52 { 54 {
53 scrollBar.state = 0; 55 scrollBar.state = 0;
54 XUnmapWindow (display->display, scrollBar.win); 56 XUnmapWindow (dpy, scrollBar.win);
55 change = 1; 57 change = 1;
56 } 58 }
57#endif 59#endif
60
58 return change; 61 return change;
59} 62}
60 63
61void 64void
62rxvt_term::resize_scrollbar () 65rxvt_term::resize_scrollbar ()
… …
66 69
67#define R_SCROLLBEG_XTERM 0 70#define R_SCROLLBEG_XTERM 0
68#define R_SCROLLEND_XTERM szHint.height 71#define R_SCROLLEND_XTERM szHint.height
69#define R_SCROLLBEG_NEXT 0 72#define R_SCROLLBEG_NEXT 0
70#define R_SCROLLEND_NEXT szHint.height - (SB_BUTTON_TOTAL_HEIGHT + \ 73#define R_SCROLLEND_NEXT szHint.height - (SB_BUTTON_TOTAL_HEIGHT + \
71 SB_PADDING) 74 SB_PADDING)
72#define R_SCROLLBEG_RXVT (scrollBar.width + 1) + sb_shadow 75#define R_SCROLLBEG_RXVT (scrollBar.width + 1) + sb_shadow
73#define R_SCROLLEND_RXVT szHint.height - R_SCROLLBEG_RXVT - \ 76#define R_SCROLLEND_RXVT szHint.height - R_SCROLLBEG_RXVT - \
74 (2 * sb_shadow) 77 (2 * sb_shadow)
75 78
76#if defined(PLAIN_SCROLLBAR) 79#if defined(PLAIN_SCROLLBAR)
77 if (scrollBar.style == R_SB_PLAIN) 80 if (scrollBar.style == R_SB_PLAIN)
78 { 81 {
79 scrollBar.beg = R_SCROLLBEG_XTERM; 82 scrollBar.beg = R_SCROLLBEG_XTERM;
… …
107#endif 110#endif
108 111
109 if (!scrollBar.win) 112 if (!scrollBar.win)
110 { 113 {
111 /* create the scrollbar window */ 114 /* create the scrollbar window */
112 scrollBar.win = XCreateSimpleWindow (display->display, 115 scrollBar.win = XCreateSimpleWindow (dpy,
113 TermWin.parent[0], 116 parent[0],
114 window_sb_x, 0, 117 window_sb_x, 0,
115 scrollbar_TotalWidth (), 118 scrollbar_TotalWidth (),
116 szHint.height, 119 szHint.height,
117 0, 120 0,
118 pix_colors[Color_fg], 121 pix_colors[Color_fg],
119 pix_colors[Color_bg]); 122 pix_colors[Color_border]);
120#ifdef DEBUG_X
121 XStoreName (display->display, scrollBar.win, "scrollbar");
122#endif
123 XDefineCursor (display->display, scrollBar.win, leftptr_cursor); 123 XDefineCursor (dpy, scrollBar.win, leftptr_cursor);
124 124
125 XSelectInput (display->display, scrollBar.win, 125 XSelectInput (dpy, scrollBar.win,
126 ExposureMask | ButtonPressMask | ButtonReleaseMask 126 ExposureMask | ButtonPressMask | ButtonReleaseMask
127 | Button1MotionMask | Button2MotionMask 127 | Button1MotionMask | Button2MotionMask
128 | Button3MotionMask); 128 | Button3MotionMask);
129 scrollbar_ev.start (display, scrollBar.win); 129 scrollbar_ev.start (display, scrollBar.win);
130 130
… …
132 } 132 }
133 133
134 scrollbar_show (1); 134 scrollbar_show (1);
135 135
136 if (delayed_init) 136 if (delayed_init)
137 XMapWindow (display->display, scrollBar.win); 137 XMapWindow (dpy, scrollBar.win);
138#endif 138#endif
139} 139}
140 140
141/* 141/*
142 * Update current scrollbar view w.r.t. slider heights, etc. 142 * Update current scrollbar view w.r.t. slider heights, etc.
… …
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 150
151 if (!scrollbar_visible ()) 151 if (!scrollBar.state)
152 return 0; 152 return 0;
153 153
154 if (update) 154 if (update)
155 { 155 {
156 top = (TermWin.nscrolled - TermWin.view_start); 156 top = view_start - top_row;
157 bot = top + (TermWin.nrow - 1); 157 bot = top + (nrow - 1);
158 len = max ((TermWin.nscrolled + (TermWin.nrow - 1)), 1); 158 len = max (nrow - 1 - top_row, 1);
159 adj = (((bot - top) * scrollbar_size ()) % len) > 0 ? 1 : 0; 159 adj = (((bot - top) * scrollbar_size ()) % len) > 0 ? 1 : 0;
160 160
161 scrollBar.top = (scrollBar.beg + (top * scrollbar_size ()) / len); 161 scrollBar.top = (scrollBar.beg + (top * scrollbar_size ()) / len);
162 scrollbar_len = ((bot - top) * scrollbar_size ()) / len + 162 scrollbar_len = ((bot - top) * scrollbar_size ()) / len +
163 scrollbar_minheight () + adj; 163 scrollbar_minheight () + adj;
… …
227 227
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# ifdef RXVT_SCROLLBAR
233 if (! (options & Opt_scrollBar_floating) && style == R_SB_RXVT) 233 if (! option (Opt_scrollBar_floating) && style == R_SB_RXVT)
234 sb_shadow = SHADOW; 234 sb_shadow = SHADOW_WIDTH;
235# endif 235# endif
236 236
237 scrollBar.style = style; 237 scrollBar.style = style;
238 scrollBar.width = width; 238 scrollBar.width = width;
239 239

Diff Legend

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