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.11 by pcg, Sat Jan 31 04:16:15 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
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 scrollBar.setIdle (); 42 scrollBar.setIdle ();
43
42 if (!scrollBar.win) 44 if (!scrollBar.win)
43 resize_scrollbar (); 45 resize_scrollbar ();
46
44 if (scrollBar.win) { 47 if (scrollBar.win)
48 {
45 XMapWindow(Xdisplay, scrollBar.win); 49 XMapWindow (display->display, scrollBar.win);
50 change = 1;
51 }
52 }
53 else
54 {
55 scrollBar.state = 0;
56 XUnmapWindow (display->display, scrollBar.win);
46 change = 1; 57 change = 1;
47 }
48 } else if (!map && scrollbar_visible()) {
49 scrollBar.state = 0;
50 XUnmapWindow(Xdisplay, scrollBar.win);
51 change = 1;
52 } 58 }
53#endif 59#endif
54 return change; 60 return change;
55} 61}
56 62
57void 63void
58rxvt_term::resize_scrollbar () 64rxvt_term::resize_scrollbar ()
59{ 65{
60#ifdef HAVE_SCROLLBARS 66#ifdef HAVE_SCROLLBARS
61 int delayed_init = 0; 67 int delayed_init = 0;
62 68
63#define R_SCROLLBEG_XTERM 0 69#define R_SCROLLBEG_XTERM 0
64#define R_SCROLLEND_XTERM szHint.height 70#define R_SCROLLEND_XTERM szHint.height
65#define R_SCROLLBEG_NEXT 0 71#define R_SCROLLBEG_NEXT 0
66#define R_SCROLLEND_NEXT szHint.height - (SB_BUTTON_TOTAL_HEIGHT + \ 72#define R_SCROLLEND_NEXT szHint.height - (SB_BUTTON_TOTAL_HEIGHT + \
67 SB_PADDING) 73 SB_PADDING)
68#define R_SCROLLBEG_RXVT (scrollBar.width + 1) + sb_shadow 74#define R_SCROLLBEG_RXVT (scrollBar.width + 1) + sb_shadow
69#define R_SCROLLEND_RXVT szHint.height - R_SCROLLBEG_RXVT - \ 75#define R_SCROLLEND_RXVT szHint.height - R_SCROLLBEG_RXVT - \
70 (2 * sb_shadow) 76 (2 * sb_shadow)
71 77
72#if defined(PLAIN_SCROLLBAR) 78#if defined(PLAIN_SCROLLBAR)
73 if (scrollBar.style == R_SB_PLAIN) { 79 if (scrollBar.style == R_SB_PLAIN)
80 {
74 scrollBar.beg = R_SCROLLBEG_XTERM; 81 scrollBar.beg = R_SCROLLBEG_XTERM;
75 scrollBar.end = R_SCROLLEND_XTERM; 82 scrollBar.end = R_SCROLLEND_XTERM;
76 scrollBar.update = &rxvt_term::scrollbar_show_plain; 83 scrollBar.update = &rxvt_term::scrollbar_show_plain;
77 } 84 }
78#endif 85#endif
79#if defined(XTERM_SCROLLBAR) 86#if defined(XTERM_SCROLLBAR)
80 if (scrollBar.style == R_SB_XTERM) { 87 if (scrollBar.style == R_SB_XTERM)
88 {
81 scrollBar.beg = R_SCROLLBEG_XTERM; 89 scrollBar.beg = R_SCROLLBEG_XTERM;
82 scrollBar.end = R_SCROLLEND_XTERM; 90 scrollBar.end = R_SCROLLEND_XTERM;
83 scrollBar.update = &rxvt_term::scrollbar_show_xterm; 91 scrollBar.update = &rxvt_term::scrollbar_show_xterm;
84 } 92 }
85#endif 93#endif
86#if defined(NEXT_SCROLLBAR) 94#if defined(NEXT_SCROLLBAR)
87 if (scrollBar.style == R_SB_NEXT) { 95 if (scrollBar.style == R_SB_NEXT)
96 {
88 scrollBar.beg = R_SCROLLBEG_NEXT; 97 scrollBar.beg = R_SCROLLBEG_NEXT;
89 scrollBar.end = R_SCROLLEND_NEXT; 98 scrollBar.end = R_SCROLLEND_NEXT;
90 scrollBar.update = &rxvt_term::scrollbar_show_next; 99 scrollBar.update = &rxvt_term::scrollbar_show_next;
91 } 100 }
92#endif 101#endif
93#if defined(RXVT_SCROLLBAR) 102#if defined(RXVT_SCROLLBAR)
94 if (scrollBar.style == R_SB_RXVT) { 103 if (scrollBar.style == R_SB_RXVT)
104 {
95 scrollBar.beg = R_SCROLLBEG_RXVT; 105 scrollBar.beg = R_SCROLLBEG_RXVT;
96 scrollBar.end = R_SCROLLEND_RXVT; 106 scrollBar.end = R_SCROLLEND_RXVT;
97 scrollBar.update = &rxvt_term::scrollbar_show_rxvt; 107 scrollBar.update = &rxvt_term::scrollbar_show_rxvt;
98 } 108 }
99#endif 109#endif
100 110
101 if (!scrollBar.win) { 111 if (!scrollBar.win)
112 {
102/* create the scrollbar window */ 113 /* create the scrollbar window */
103 scrollBar.win = XCreateSimpleWindow(Xdisplay, 114 scrollBar.win = XCreateSimpleWindow (display->display,
104 TermWin.parent[0], 115 parent[0],
105 window_sb_x, 0, 116 window_sb_x, 0,
106 scrollbar_TotalWidth(), 117 scrollbar_TotalWidth (),
107 szHint.height, 118 szHint.height,
108 0, 119 0,
109 PixColors[Color_fg], 120 pix_colors[Color_fg],
110 PixColors[Color_bg]); 121 pix_colors[Color_border]);
111#ifdef DEBUG_X
112 XStoreName(Xdisplay, scrollBar.win, "scrollbar");
113#endif
114 XDefineCursor(Xdisplay, scrollBar.win, leftptr_cursor); 122 XDefineCursor (display->display, scrollBar.win, leftptr_cursor);
123
115 XSelectInput(Xdisplay, scrollBar.win, 124 XSelectInput (display->display, scrollBar.win,
116 (ExposureMask | ButtonPressMask | ButtonReleaseMask 125 ExposureMask | ButtonPressMask | ButtonReleaseMask
117 | Button1MotionMask | Button2MotionMask 126 | Button1MotionMask | Button2MotionMask
118 | Button3MotionMask)); 127 | Button3MotionMask);
128 scrollbar_ev.start (display, scrollBar.win);
129
119 delayed_init = 1; 130 delayed_init = 1;
120 } 131 }
132
121 scrollbar_show (1); 133 scrollbar_show (1);
134
122 if (delayed_init) 135 if (delayed_init)
123 XMapWindow (Xdisplay, scrollBar.win); 136 XMapWindow (display->display, scrollBar.win);
124#endif 137#endif
125} 138}
126 139
127/* 140/*
128 * Update current scrollbar view w.r.t. slider heights, etc. 141 * Update current scrollbar view w.r.t. slider heights, etc.
129 */ 142 */
130int 143int
131rxvt_term::scrollbar_show (int update) 144rxvt_term::scrollbar_show (int update)
132{ 145{
133 int ret = 0; 146 int ret = 0;
134#ifdef HAVE_SCROLLBARS 147#ifdef HAVE_SCROLLBARS
135 int top, bot, len, adj; 148 int top, bot, len, adj;
136 149
137 if (!scrollbar_visible()) 150 if (!scrollBar.state)
138 return 0;
139
140 if (update) {
141 top = (TermWin.nscrolled - TermWin.view_start);
142 bot = top + (TermWin.nrow - 1);
143 len = max((TermWin.nscrolled + (TermWin.nrow - 1)), 1);
144 adj = (((bot - top) * scrollbar_size()) % len) > 0 ? 1 : 0;
145
146 scrollBar.top = (scrollBar.beg + (top * scrollbar_size()) / len);
147 scrollbar_len = ((bot - top) * scrollbar_size()) / len +
148 scrollbar_minheight() + adj;
149 scrollBar.bot = (scrollBar.top + scrollbar_len);
150 /* no change */
151 if (scrollBar.top == last_top
152 && scrollBar.bot == last_bot
153 && (scrollBar.state == last_state || !scrollbar_isUpDn()))
154 return 0; 151 return 0;
152
153 if (update)
155 } 154 {
155 top = view_start - top_row;
156 bot = top + (nrow - 1);
157 len = max (nrow - 1 - top_row, 1);
158 adj = (((bot - top) * scrollbar_size ()) % len) > 0 ? 1 : 0;
156 159
160 scrollBar.top = (scrollBar.beg + (top * scrollbar_size ()) / len);
161 scrollbar_len = ((bot - top) * scrollbar_size ()) / len +
162 scrollbar_minheight () + adj;
163 scrollBar.bot = (scrollBar.top + scrollbar_len);
164 /* no change */
165 if (scrollBar.top == last_top
166 && scrollBar.bot == last_bot
167 && (scrollBar.state == last_state || !scrollbar_isUpDn ()))
168 return 0;
169 }
170
157 ret = (this->*scrollBar.update) (update, last_top, last_bot, scrollbar_len); 171 ret = (this->*scrollBar.update) (update, last_top, last_bot, scrollbar_len);
158 172
159 last_top = scrollBar.top; 173 last_top = scrollBar.top;
160 last_bot = scrollBar.bot; 174 last_bot = scrollBar.bot;
161 last_state = scrollBar.state; 175 last_state = scrollBar.state;
162#endif 176#endif
163 177
164 return ret; 178 return ret;
165} 179}
166 180
167void 181void
168rxvt_term::setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness) 182rxvt_term::setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness)
169{ 183{
170#ifdef HAVE_SCROLLBARS 184#ifdef HAVE_SCROLLBARS
171 int i; 185 int i;
172 short style, width; 186 short style, width;
173 187
174# if defined(RXVT_SCROLLBAR) 188# if defined(RXVT_SCROLLBAR)
175 style = R_SB_RXVT; 189 style = R_SB_RXVT;
176# elif defined(XTERM_SCROLLBAR) 190# elif defined(XTERM_SCROLLBAR)
177 style = R_SB_XTERM; 191 style = R_SB_XTERM;
178# elif defined(NEXT_SCROLLBAR) 192# elif defined(NEXT_SCROLLBAR)
179 style = R_SB_NEXT; 193 style = R_SB_NEXT;
180# elif defined(PLAIN_SCROLLBAR) 194# elif defined(PLAIN_SCROLLBAR)
181 style = R_SB_PLAIN; 195 style = R_SB_PLAIN;
182#else 196#else
183 style = R_SB_RXVT; 197 style = R_SB_RXVT;
184# endif 198# endif
185 199
186# if (defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)) 200# if (defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR))
187 if (scrollstyle) { 201 if (scrollstyle)
202 {
188# ifdef NEXT_SCROLLBAR 203# ifdef NEXT_SCROLLBAR
189 if (STRNCASECMP(scrollstyle, "next", 4) == 0) 204 if (strncasecmp (scrollstyle, "next", 4) == 0)
190 style = R_SB_NEXT; 205 style = R_SB_NEXT;
191# endif 206# endif
192# ifdef XTERM_SCROLLBAR 207# ifdef XTERM_SCROLLBAR
193 if (STRNCASECMP(scrollstyle, "xterm", 5) == 0) 208 if (strncasecmp (scrollstyle, "xterm", 5) == 0)
194 style = R_SB_XTERM; 209 style = R_SB_XTERM;
195# endif 210# endif
196# ifdef PLAIN_SCROLLBAR 211# ifdef PLAIN_SCROLLBAR
197 if (STRNCASECMP(scrollstyle, "plain", 5) == 0) 212 if (strncasecmp (scrollstyle, "plain", 5) == 0)
198 style = R_SB_PLAIN; 213 style = R_SB_PLAIN;
199# endif 214# endif
215
200 } 216 }
201# endif 217# endif
202 if (style == R_SB_NEXT) 218 if (style == R_SB_NEXT)
203 width = SB_WIDTH_NEXT; 219 width = SB_WIDTH_NEXT;
204 else if (style == R_SB_XTERM) 220 else if (style == R_SB_XTERM)
205 width = SB_WIDTH_XTERM; 221 width = SB_WIDTH_XTERM;
206 else if (style == R_SB_PLAIN) 222 else if (style == R_SB_PLAIN)
207 width = SB_WIDTH_PLAIN; 223 width = SB_WIDTH_PLAIN;
208 else /* if (style == R_SB_RXVT) */ 224 else /* if (style == R_SB_RXVT) */
209 width = SB_WIDTH_RXVT; 225 width = SB_WIDTH_RXVT;
210 226
211 if (style != R_SB_NEXT) /* dishonour request - for now */ 227 if (style != R_SB_NEXT) /* dishonour request - for now */
212 if (thickness && (i = atoi(thickness)) >= SB_WIDTH_MINIMUM) 228 if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM)
213 width = min(i, SB_WIDTH_MAXIMUM); 229 width = min (i, SB_WIDTH_MAXIMUM);
214 230
215# if defined(RXVT_SCROLLBAR) 231# ifdef RXVT_SCROLLBAR
216 if (!(Options & Opt_scrollBar_floating) && style == R_SB_RXVT) 232 if (! OPTION (Opt_scrollBar_floating) && style == R_SB_RXVT)
217 sb_shadow = SHADOW; 233 sb_shadow = 2;
218# endif 234# endif
219 235
220 scrollBar.style = style; 236 scrollBar.style = style;
221 scrollBar.width = width; 237 scrollBar.width = width;
222 238
223 /* scrollbar_align = R_SB_ALIGN_CENTRE; */ 239 /* scrollbar_align = R_SB_ALIGN_CENTRE; */
224 if (scrollalign) { 240 if (scrollalign)
225 if (STRNCASECMP(scrollalign, "top", 3) == 0) 241 {
242 if (strncasecmp (scrollalign, "top", 3) == 0)
226 scrollbar_align = R_SB_ALIGN_TOP; 243 scrollbar_align = R_SB_ALIGN_TOP;
227 else if (STRNCASECMP(scrollalign, "bottom", 6) == 0) 244 else if (strncasecmp (scrollalign, "bottom", 6) == 0)
228 scrollbar_align = R_SB_ALIGN_BOTTOM; 245 scrollbar_align = R_SB_ALIGN_BOTTOM;
229 } 246 }
230#endif 247#endif
231} 248}
232 249
233/*----------------------- end-of-file (C source) -----------------------*/ 250/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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