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

Diff Legend

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