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.5 by pcg, Thu Dec 18 05:45:11 2003 UTC vs.
Revision 1.15 by pcg, Thu Apr 8 20:31:45 2004 UTC

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

Diff Legend

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