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

Diff Legend

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