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.12 by pcg, Sun Feb 1 01:34:41 2004 UTC vs.
Revision 1.33 by root, Tue Jan 24 19:40:12 2006 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
… …
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(Xdisplay, scrollBar.win); 49 XMapWindow (display->display, 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(Xdisplay, scrollBar.win); 56 XUnmapWindow (display->display, scrollBar.win);
55 change = 1; 57 change = 1;
56 } 58 }
57#endif 59#endif
58 return change; 60 return change;
59} 61}
… …
66 68
67#define R_SCROLLBEG_XTERM 0 69#define R_SCROLLBEG_XTERM 0
68#define R_SCROLLEND_XTERM szHint.height 70#define R_SCROLLEND_XTERM szHint.height
69#define R_SCROLLBEG_NEXT 0 71#define R_SCROLLBEG_NEXT 0
70#define R_SCROLLEND_NEXT szHint.height - (SB_BUTTON_TOTAL_HEIGHT + \ 72#define R_SCROLLEND_NEXT szHint.height - (SB_BUTTON_TOTAL_HEIGHT + \
71 SB_PADDING) 73 SB_PADDING)
72#define R_SCROLLBEG_RXVT (scrollBar.width + 1) + sb_shadow 74#define R_SCROLLBEG_RXVT (scrollBar.width + 1) + sb_shadow
73#define R_SCROLLEND_RXVT szHint.height - R_SCROLLBEG_RXVT - \ 75#define R_SCROLLEND_RXVT szHint.height - R_SCROLLBEG_RXVT - \
74 (2 * sb_shadow) 76 (2 * sb_shadow)
75 77
76#if defined(PLAIN_SCROLLBAR) 78#if defined(PLAIN_SCROLLBAR)
77 if (scrollBar.style == R_SB_PLAIN) 79 if (scrollBar.style == R_SB_PLAIN)
78 { 80 {
79 scrollBar.beg = R_SCROLLBEG_XTERM; 81 scrollBar.beg = R_SCROLLBEG_XTERM;
… …
107#endif 109#endif
108 110
109 if (!scrollBar.win) 111 if (!scrollBar.win)
110 { 112 {
111 /* create the scrollbar window */ 113 /* create the scrollbar window */
112 scrollBar.win = XCreateSimpleWindow(Xdisplay, 114 scrollBar.win = XCreateSimpleWindow (display->display,
113 TermWin.parent[0], 115 parent[0],
114 window_sb_x, 0, 116 window_sb_x, 0,
115 scrollbar_TotalWidth(), 117 scrollbar_TotalWidth (),
116 szHint.height, 118 szHint.height,
117 0, 119 0,
118 PixColors[Color_fg], 120 pix_colors[Color_fg],
119 PixColors[Color_bg]); 121 pix_colors[Color_border]);
120#ifdef DEBUG_X
121 XStoreName(Xdisplay, scrollBar.win, "scrollbar");
122#endif
123 XDefineCursor(Xdisplay, scrollBar.win, leftptr_cursor); 122 XDefineCursor (display->display, scrollBar.win, leftptr_cursor);
123
124 XSelectInput(Xdisplay, scrollBar.win, 124 XSelectInput (display->display, scrollBar.win,
125 (ExposureMask | ButtonPressMask | ButtonReleaseMask 125 ExposureMask | ButtonPressMask | ButtonReleaseMask
126 | Button1MotionMask | Button2MotionMask 126 | Button1MotionMask | Button2MotionMask
127 | Button3MotionMask)); 127 | Button3MotionMask);
128 scrollbar_ev.start (display, scrollBar.win);
129
128 delayed_init = 1; 130 delayed_init = 1;
129 } 131 }
132
130 scrollbar_show (1); 133 scrollbar_show (1);
134
131 if (delayed_init) 135 if (delayed_init)
132 XMapWindow (Xdisplay, scrollBar.win); 136 XMapWindow (display->display, scrollBar.win);
133#endif 137#endif
134} 138}
135 139
136/* 140/*
137 * Update current scrollbar view w.r.t. slider heights, etc. 141 * Update current scrollbar view w.r.t. slider heights, etc.
… …
141{ 145{
142 int ret = 0; 146 int ret = 0;
143#ifdef HAVE_SCROLLBARS 147#ifdef HAVE_SCROLLBARS
144 int top, bot, len, adj; 148 int top, bot, len, adj;
145 149
146 if (!scrollbar_visible()) 150 if (!scrollBar.state)
147 return 0; 151 return 0;
148 152
149 if (update) 153 if (update)
150 { 154 {
151 top = (TermWin.nscrolled - TermWin.view_start); 155 top = view_start - top_row;
152 bot = top + (TermWin.nrow - 1); 156 bot = top + (nrow - 1);
153 len = max((TermWin.nscrolled + (TermWin.nrow - 1)), 1); 157 len = max (nrow - 1 - top_row, 1);
154 adj = (((bot - top) * scrollbar_size()) % len) > 0 ? 1 : 0; 158 adj = (((bot - top) * scrollbar_size ()) % len) > 0 ? 1 : 0;
155 159
156 scrollBar.top = (scrollBar.beg + (top * scrollbar_size()) / len); 160 scrollBar.top = (scrollBar.beg + (top * scrollbar_size ()) / len);
157 scrollbar_len = ((bot - top) * scrollbar_size()) / len + 161 scrollbar_len = ((bot - top) * scrollbar_size ()) / len +
158 scrollbar_minheight() + adj; 162 scrollbar_minheight () + adj;
159 scrollBar.bot = (scrollBar.top + scrollbar_len); 163 scrollBar.bot = (scrollBar.top + scrollbar_len);
160 /* no change */ 164 /* no change */
161 if (scrollBar.top == last_top 165 if (scrollBar.top == last_top
162 && scrollBar.bot == last_bot 166 && scrollBar.bot == last_bot
163 && (scrollBar.state == last_state || !scrollbar_isUpDn())) 167 && (scrollBar.state == last_state || !scrollbar_isUpDn ()))
164 return 0; 168 return 0;
165 } 169 }
166 170
167 ret = (this->*scrollBar.update) (update, last_top, last_bot, scrollbar_len); 171 ret = (this->*scrollBar.update) (update, last_top, last_bot, scrollbar_len);
168 172
… …
195 199
196# if (defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)) 200# if (defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR))
197 if (scrollstyle) 201 if (scrollstyle)
198 { 202 {
199# ifdef NEXT_SCROLLBAR 203# ifdef NEXT_SCROLLBAR
200 if (STRNCASECMP(scrollstyle, "next", 4) == 0) 204 if (strncasecmp (scrollstyle, "next", 4) == 0)
201 style = R_SB_NEXT; 205 style = R_SB_NEXT;
202# endif 206# endif
203# ifdef XTERM_SCROLLBAR 207# ifdef XTERM_SCROLLBAR
204 if (STRNCASECMP(scrollstyle, "xterm", 5) == 0) 208 if (strncasecmp (scrollstyle, "xterm", 5) == 0)
205 style = R_SB_XTERM; 209 style = R_SB_XTERM;
206# endif 210# endif
207# ifdef PLAIN_SCROLLBAR 211# ifdef PLAIN_SCROLLBAR
208 if (STRNCASECMP(scrollstyle, "plain", 5) == 0) 212 if (strncasecmp (scrollstyle, "plain", 5) == 0)
209 style = R_SB_PLAIN; 213 style = R_SB_PLAIN;
210# endif 214# endif
211 215
212 } 216 }
213# endif 217# endif
… …
219 width = SB_WIDTH_PLAIN; 223 width = SB_WIDTH_PLAIN;
220 else /* if (style == R_SB_RXVT) */ 224 else /* if (style == R_SB_RXVT) */
221 width = SB_WIDTH_RXVT; 225 width = SB_WIDTH_RXVT;
222 226
223 if (style != R_SB_NEXT) /* dishonour request - for now */ 227 if (style != R_SB_NEXT) /* dishonour request - for now */
224 if (thickness && (i = atoi(thickness)) >= SB_WIDTH_MINIMUM) 228 if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM)
225 width = min(i, SB_WIDTH_MAXIMUM); 229 width = min (i, SB_WIDTH_MAXIMUM);
226 230
227# if defined(RXVT_SCROLLBAR) 231# ifdef RXVT_SCROLLBAR
228 if (!(Options & Opt_scrollBar_floating) && style == R_SB_RXVT) 232 if (! OPTION (Opt_scrollBar_floating) && style == R_SB_RXVT)
229 sb_shadow = SHADOW; 233 sb_shadow = 2;
230# endif 234# endif
231 235
232 scrollBar.style = style; 236 scrollBar.style = style;
233 scrollBar.width = width; 237 scrollBar.width = width;
234 238
235 /* scrollbar_align = R_SB_ALIGN_CENTRE; */ 239 /* scrollbar_align = R_SB_ALIGN_CENTRE; */
236 if (scrollalign) 240 if (scrollalign)
237 { 241 {
238 if (STRNCASECMP(scrollalign, "top", 3) == 0) 242 if (strncasecmp (scrollalign, "top", 3) == 0)
239 scrollbar_align = R_SB_ALIGN_TOP; 243 scrollbar_align = R_SB_ALIGN_TOP;
240 else if (STRNCASECMP(scrollalign, "bottom", 6) == 0) 244 else if (strncasecmp (scrollalign, "bottom", 6) == 0)
241 scrollbar_align = R_SB_ALIGN_BOTTOM; 245 scrollbar_align = R_SB_ALIGN_BOTTOM;
242 } 246 }
243#endif 247#endif
244} 248}
245 249

Diff Legend

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