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.52 by ayin, Sun Feb 17 11:37:21 2008 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-2006 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
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 if (map)
40 if (map && !scrollbar_visible())
41 { 40 {
42 scrollBar.setIdle (); 41 scrollBar.state = STATE_IDLE;
42
43 if (!scrollBar.win) 43 if (!scrollBar.win)
44 resize_scrollbar (); 44 resize_scrollbar ();
45
45 if (scrollBar.win) 46 if (scrollBar.win)
46 { 47 {
47 XMapWindow(Xdisplay, scrollBar.win); 48 XMapWindow (dpy, scrollBar.win);
48 change = 1; 49 change = 1;
49 } 50 }
50 } 51 }
51 else if (!map && scrollbar_visible()) 52 else
52 { 53 {
53 scrollBar.state = 0; 54 scrollBar.state = 0;
54 XUnmapWindow(Xdisplay, scrollBar.win); 55 XUnmapWindow (dpy, scrollBar.win);
55 change = 1; 56 change = 1;
56 } 57 }
57#endif 58
58 return change; 59 return change;
59} 60}
60 61
61void 62void
62rxvt_term::resize_scrollbar () 63rxvt_term::resize_scrollbar ()
63{ 64{
64#ifdef HAVE_SCROLLBARS
65 int delayed_init = 0; 65 int delayed_init = 0;
66 66
67#define R_SCROLLBEG_XTERM 0 67#define R_SCROLLBEG_XTERM 0
68#define R_SCROLLEND_XTERM szHint.height 68#define R_SCROLLEND_XTERM szHint.height
69#define R_SCROLLBEG_NEXT 0 69#define R_SCROLLBEG_NEXT 0
70#define R_SCROLLEND_NEXT szHint.height - (SB_BUTTON_TOTAL_HEIGHT + \ 70#define R_SCROLLEND_NEXT szHint.height - (SB_BUTTON_TOTAL_HEIGHT + \
71 SB_PADDING) 71 SB_PADDING)
72#define R_SCROLLBEG_RXVT (scrollBar.width + 1) + sb_shadow 72#define R_SCROLLBEG_RXVT (scrollBar.width + 1) + scrollBar.shadow
73#define R_SCROLLEND_RXVT szHint.height - R_SCROLLBEG_RXVT - \ 73#define R_SCROLLEND_RXVT szHint.height - R_SCROLLBEG_RXVT - \
74 (2 * sb_shadow) 74 (2 * scrollBar.shadow)
75 75
76#if defined(PLAIN_SCROLLBAR) 76#if defined(PLAIN_SCROLLBAR)
77 if (scrollBar.style == R_SB_PLAIN) 77 if (scrollBar.style == R_SB_PLAIN)
78 { 78 {
79 scrollBar.beg = R_SCROLLBEG_XTERM; 79 scrollBar.beg = R_SCROLLBEG_XTERM;
… …
107#endif 107#endif
108 108
109 if (!scrollBar.win) 109 if (!scrollBar.win)
110 { 110 {
111 /* create the scrollbar window */ 111 /* create the scrollbar window */
112 scrollBar.win = XCreateSimpleWindow(Xdisplay, 112 scrollBar.win = XCreateSimpleWindow (dpy,
113 TermWin.parent[0], 113 parent[0],
114 window_sb_x, 0, 114 window_sb_x, 0,
115 scrollbar_TotalWidth(), 115 scrollBar.total_width (),
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_border]);
120#ifdef DEBUG_X
121 XStoreName(Xdisplay, scrollBar.win, "scrollbar");
122#endif
123 XDefineCursor(Xdisplay, scrollBar.win, leftptr_cursor); 120 XDefineCursor (dpy, scrollBar.win, scrollBar.leftptr_cursor);
121
124 XSelectInput(Xdisplay, scrollBar.win, 122 XSelectInput (dpy, scrollBar.win,
125 (ExposureMask | ButtonPressMask | ButtonReleaseMask 123 ExposureMask | ButtonPressMask | ButtonReleaseMask
126 | Button1MotionMask | Button2MotionMask 124 | Button1MotionMask | Button2MotionMask
127 | Button3MotionMask)); 125 | Button3MotionMask);
126 scrollbar_ev.start (display, scrollBar.win);
127
128 delayed_init = 1; 128 delayed_init = 1;
129 } 129 }
130
130 scrollbar_show (1); 131 scrollbar_show (1);
132
131 if (delayed_init) 133 if (delayed_init)
132 XMapWindow (Xdisplay, scrollBar.win); 134 XMapWindow (dpy, scrollBar.win);
133#endif
134} 135}
135 136
136/* 137/*
137 * Update current scrollbar view w.r.t. slider heights, etc. 138 * Update current scrollbar view w.r.t. slider heights, etc.
138 */ 139 */
139int 140int
140rxvt_term::scrollbar_show (int update) 141rxvt_term::scrollbar_show (int update)
141{ 142{
142 int ret = 0; 143 int ret = 0;
143#ifdef HAVE_SCROLLBARS
144 int top, bot, len, adj; 144 int top, bot, len, adj;
145 145
146 if (!scrollbar_visible()) 146 if (!scrollBar.state)
147 return 0; 147 return 0;
148 148
149 if (update) 149 if (update)
150 { 150 {
151 top = (TermWin.nscrolled - TermWin.view_start); 151 top = view_start - top_row;
152 bot = top + (TermWin.nrow - 1); 152 bot = top + (nrow - 1);
153 len = max((TermWin.nscrolled + (TermWin.nrow - 1)), 1); 153 len = max (nrow - 1 - top_row, 1);
154 adj = (((bot - top) * scrollbar_size()) % len) > 0 ? 1 : 0; 154 adj = (((bot - top) * scrollbar_size ()) % len) > 0 ? 1 : 0;
155 155
156 scrollBar.top = (scrollBar.beg + (top * scrollbar_size()) / len); 156 scrollBar.top = (scrollBar.beg + (top * scrollbar_size ()) / len);
157 scrollbar_len = ((bot - top) * scrollbar_size()) / len + 157 scrollBar.len = ((bot - top) * scrollbar_size ()) / len +
158 scrollbar_minheight() + adj; 158 scrollbar_minheight () + adj;
159 scrollBar.bot = (scrollBar.top + scrollbar_len); 159 scrollBar.bot = (scrollBar.top + scrollBar.len);
160 /* no change */ 160 /* no change */
161 if (scrollBar.top == last_top 161 if (scrollBar.top == scrollBar.last_top
162 && scrollBar.bot == last_bot 162 && scrollBar.bot == scrollBar.last_bot
163 && (scrollBar.state == last_state || !scrollbar_isUpDn())) 163 && (scrollBar.state == scrollBar.last_state
164 || !(scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)))
164 return 0; 165 return 0;
165 } 166 }
166 167
167 ret = (this->*scrollBar.update) (update, last_top, last_bot, scrollbar_len); 168 ret = (this->*scrollBar.update) (update, scrollBar.last_top, scrollBar.last_bot, scrollBar.len);
168 169
169 last_top = scrollBar.top; 170 scrollBar.last_top = scrollBar.top;
170 last_bot = scrollBar.bot; 171 scrollBar.last_bot = scrollBar.bot;
171 last_state = scrollBar.state; 172 scrollBar.last_state = scrollBar.state;
172#endif
173 173
174 return ret; 174 return ret;
175} 175}
176 176
177void 177void
178rxvt_term::setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness) 178scrollBar_t::setup (rxvt_term *term)
179{ 179{
180#ifdef HAVE_SCROLLBARS
181 int i; 180 int i;
182 short style, width; 181 short style, width;
182 const char *scrollalign, *scrollstyle, *thickness;
183
184 this->term = term;
185 scrollalign = term->rs[Rs_scrollBar_align];
186 scrollstyle = term->rs[Rs_scrollstyle];
187 thickness = term->rs[Rs_scrollBar_thickness];
183 188
184# if defined(RXVT_SCROLLBAR) 189# if defined(RXVT_SCROLLBAR)
185 style = R_SB_RXVT; 190 style = R_SB_RXVT;
186# elif defined(XTERM_SCROLLBAR) 191# elif defined(XTERM_SCROLLBAR)
187 style = R_SB_XTERM; 192 style = R_SB_XTERM;
… …
195 200
196# if (defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)) 201# if (defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR))
197 if (scrollstyle) 202 if (scrollstyle)
198 { 203 {
199# ifdef NEXT_SCROLLBAR 204# ifdef NEXT_SCROLLBAR
200 if (STRNCASECMP(scrollstyle, "next", 4) == 0) 205 if (strncasecmp (scrollstyle, "next", 4) == 0)
201 style = R_SB_NEXT; 206 style = R_SB_NEXT;
202# endif 207# endif
203# ifdef XTERM_SCROLLBAR 208# ifdef XTERM_SCROLLBAR
204 if (STRNCASECMP(scrollstyle, "xterm", 5) == 0) 209 if (strncasecmp (scrollstyle, "xterm", 5) == 0)
205 style = R_SB_XTERM; 210 style = R_SB_XTERM;
206# endif 211# endif
207# ifdef PLAIN_SCROLLBAR 212# ifdef PLAIN_SCROLLBAR
208 if (STRNCASECMP(scrollstyle, "plain", 5) == 0) 213 if (strncasecmp (scrollstyle, "plain", 5) == 0)
209 style = R_SB_PLAIN; 214 style = R_SB_PLAIN;
210# endif 215# endif
211 216
212 } 217 }
213# endif 218# endif
… …
219 width = SB_WIDTH_PLAIN; 224 width = SB_WIDTH_PLAIN;
220 else /* if (style == R_SB_RXVT) */ 225 else /* if (style == R_SB_RXVT) */
221 width = SB_WIDTH_RXVT; 226 width = SB_WIDTH_RXVT;
222 227
223 if (style != R_SB_NEXT) /* dishonour request - for now */ 228 if (style != R_SB_NEXT) /* dishonour request - for now */
224 if (thickness && (i = atoi(thickness)) >= SB_WIDTH_MINIMUM) 229 if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM)
225 width = min(i, SB_WIDTH_MAXIMUM); 230 width = min (i, SB_WIDTH_MAXIMUM);
226 231
227# if defined(RXVT_SCROLLBAR) 232# ifdef RXVT_SCROLLBAR
228 if (!(Options & Opt_scrollBar_floating) && style == R_SB_RXVT) 233 if (! term->option (Opt_scrollBar_floating) && style == R_SB_RXVT)
229 sb_shadow = SHADOW; 234 shadow = SHADOW_WIDTH;
230# endif 235# endif
231 236
232 scrollBar.style = style; 237 this->style = style;
233 scrollBar.width = width; 238 this->width = width;
234 239
235 /* scrollbar_align = R_SB_ALIGN_CENTRE; */ 240 /* align = R_SB_ALIGN_CENTRE; */
236 if (scrollalign) 241 if (scrollalign)
237 { 242 {
238 if (STRNCASECMP(scrollalign, "top", 3) == 0) 243 if (strncasecmp (scrollalign, "top", 3) == 0)
239 scrollbar_align = R_SB_ALIGN_TOP; 244 align = R_SB_ALIGN_TOP;
240 else if (STRNCASECMP(scrollalign, "bottom", 6) == 0) 245 else if (strncasecmp (scrollalign, "bottom", 6) == 0)
241 scrollbar_align = R_SB_ALIGN_BOTTOM; 246 align = R_SB_ALIGN_BOTTOM;
242 } 247 }
243#endif 248 last_bot = last_state = -1;
249 /* cursor scrollBar: Black-on-White */
250 leftptr_cursor = XCreateFontCursor (term->dpy, XC_left_ptr);
244} 251}
245 252
246/*----------------------- end-of-file (C source) -----------------------*/ 253/*----------------------- end-of-file (C source) -----------------------*/
247 254

Diff Legend

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