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.27 by root, Tue Dec 20 19:31:00 2005 UTC vs.
Revision 1.55 by ayin, Mon Feb 18 09:58:05 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 Marc Lehmann <pcg@goof.com> 9 * Copyright (c) 2004-2006 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.
… …
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
40 if (map) 39 if (map)
41 { 40 {
42 scrollBar.setIdle (); 41 scrollBar.state = STATE_IDLE;
43 42
44 if (!scrollBar.win) 43 if (!scrollBar.win)
45 resize_scrollbar (); 44 resize_scrollbar ();
46 45
47 if (scrollBar.win) 46 if (scrollBar.win)
48 { 47 {
49 XMapWindow (display->display, scrollBar.win); 48 XMapWindow (dpy, scrollBar.win);
50 change = 1; 49 change = 1;
51 } 50 }
52 } 51 }
53 else 52 else
54 { 53 {
55 scrollBar.state = 0; 54 scrollBar.state = 0;
56 XUnmapWindow (display->display, scrollBar.win); 55 XUnmapWindow (dpy, scrollBar.win);
57 change = 1; 56 change = 1;
58 } 57 }
59#endif 58
60 return change; 59 return change;
61} 60}
62 61
63void 62void
64rxvt_term::resize_scrollbar () 63rxvt_term::resize_scrollbar ()
65{ 64{
66#ifdef HAVE_SCROLLBARS
67 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 ();
68 70
69#define R_SCROLLBEG_XTERM 0 71#define R_SCROLLBEG_XTERM 0
70#define R_SCROLLEND_XTERM szHint.height 72#define R_SCROLLEND_XTERM szHint.height
71#define R_SCROLLBEG_NEXT 0 73#define R_SCROLLBEG_NEXT 0
72#define R_SCROLLEND_NEXT szHint.height - (SB_BUTTON_TOTAL_HEIGHT + \ 74#define R_SCROLLEND_NEXT szHint.height - (SB_BUTTON_TOTAL_HEIGHT + \
73 SB_PADDING) 75 SB_PADDING)
74#define R_SCROLLBEG_RXVT (scrollBar.width + 1) + sb_shadow 76#define R_SCROLLBEG_RXVT (scrollBar.width + 1) + scrollBar.shadow
75#define R_SCROLLEND_RXVT szHint.height - R_SCROLLBEG_RXVT - \ 77#define R_SCROLLEND_RXVT szHint.height - R_SCROLLBEG_RXVT - \
76 (2 * sb_shadow) 78 (2 * scrollBar.shadow)
77 79
78#if defined(PLAIN_SCROLLBAR) 80#if defined(PLAIN_SCROLLBAR)
79 if (scrollBar.style == R_SB_PLAIN) 81 if (scrollBar.style == R_SB_PLAIN)
80 { 82 {
81 scrollBar.beg = R_SCROLLBEG_XTERM; 83 scrollBar.beg = R_SCROLLBEG_XTERM;
… …
109#endif 111#endif
110 112
111 if (!scrollBar.win) 113 if (!scrollBar.win)
112 { 114 {
113 /* create the scrollbar window */ 115 /* create the scrollbar window */
114 scrollBar.win = XCreateSimpleWindow (display->display, 116 scrollBar.win = XCreateSimpleWindow (dpy,
115 parent[0], 117 parent[0],
116 window_sb_x, 0, 118 window_sb_x, 0,
117 scrollbar_TotalWidth (), 119 scrollBar.total_width (),
118 szHint.height, 120 szHint.height,
119 0, 121 0,
120 pix_colors[Color_fg], 122 pix_colors[Color_fg],
121 pix_colors[Color_border]); 123 pix_colors[Color_border]);
122#ifdef DEBUG_X
123 XStoreName (display->display, scrollBar.win, "scrollbar");
124#endif
125 XDefineCursor (display->display, scrollBar.win, leftptr_cursor); 124 XDefineCursor (dpy, scrollBar.win, scrollBar.leftptr_cursor);
126 125
127 XSelectInput (display->display, scrollBar.win, 126 XSelectInput (dpy, scrollBar.win,
128 ExposureMask | ButtonPressMask | ButtonReleaseMask 127 ExposureMask | ButtonPressMask | ButtonReleaseMask
129 | Button1MotionMask | Button2MotionMask 128 | Button1MotionMask | Button2MotionMask
130 | Button3MotionMask); 129 | Button3MotionMask);
131 scrollbar_ev.start (display, scrollBar.win); 130 scrollbar_ev.start (display, scrollBar.win);
132 131
133 delayed_init = 1; 132 delayed_init = 1;
134 } 133 }
134 else
135 XMoveResizeWindow (dpy, scrollBar.win,
136 window_sb_x, 0,
137 scrollBar.total_width (), szHint.height);
135 138
136 scrollbar_show (1); 139 scrollbar_show (1);
137 140
138 if (delayed_init) 141 if (delayed_init)
139 XMapWindow (display->display, scrollBar.win); 142 XMapWindow (dpy, scrollBar.win);
140#endif
141} 143}
142 144
143/* 145/*
144 * Update current scrollbar view w.r.t. slider heights, etc. 146 * Update current scrollbar view w.r.t. slider heights, etc.
145 */ 147 */
146int 148int
147rxvt_term::scrollbar_show (int update) 149rxvt_term::scrollbar_show (int update)
148{ 150{
149 int ret = 0; 151 int ret = 0;
150#ifdef HAVE_SCROLLBARS
151 int top, bot, len, adj;
152 152
153 if (!scrollbar_visible ()) 153 if (!scrollBar.state)
154 return 0; 154 return 0;
155 155
156 if (update) 156 if (update)
157 { 157 {
158 top = nsaved - view_start; 158 int top = view_start - top_row;
159 bot = top + (nrow - 1); 159 int bot = top + (nrow - 1);
160 len = max (nsaved + (nrow - 1), 1); 160 int len = max (nrow - 1 - top_row, 1);
161 adj = (((bot - top) * scrollbar_size ()) % len) > 0 ? 1 : 0; 161 int adj = (((bot - top) * scrollBar.size ()) % len) > 0 ? 1 : 0;
162 162
163 scrollBar.top = (scrollBar.beg + (top * scrollbar_size ()) / len); 163 scrollBar.top = (scrollBar.beg + (top * scrollBar.size ()) / len);
164 scrollbar_len = ((bot - top) * scrollbar_size ()) / len + 164 scrollBar.len = ((bot - top) * scrollBar.size ()) / len +
165 scrollbar_minheight () + adj; 165 scrollBar.min_height () + adj;
166 scrollBar.bot = (scrollBar.top + scrollbar_len); 166 scrollBar.bot = (scrollBar.top + scrollBar.len);
167 /* no change */ 167 /* no change */
168 if (scrollBar.top == last_top 168 if (scrollBar.top == scrollBar.last_top
169 && scrollBar.bot == last_bot 169 && scrollBar.bot == scrollBar.last_bot
170 && (scrollBar.state == last_state || !scrollbar_isUpDn ())) 170 && (scrollBar.state == scrollBar.last_state
171 || !(scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)))
171 return 0; 172 return 0;
172 } 173 }
173 174
174 ret = (this->*scrollBar.update) (update, last_top, last_bot, scrollbar_len); 175 ret = (this->*scrollBar.update) (update, scrollBar.last_top, scrollBar.last_bot, scrollBar.len);
175 176
176 last_top = scrollBar.top; 177 scrollBar.last_top = scrollBar.top;
177 last_bot = scrollBar.bot; 178 scrollBar.last_bot = scrollBar.bot;
178 last_state = scrollBar.state; 179 scrollBar.last_state = scrollBar.state;
179#endif
180 180
181 return ret; 181 return ret;
182} 182}
183 183
184void 184void
185rxvt_term::setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness) 185scrollBar_t::setup (rxvt_term *term)
186{ 186{
187#ifdef HAVE_SCROLLBARS
188 int i; 187 int i;
189 short style, width; 188 short style, width;
189 const char *scrollalign, *scrollstyle, *thickness;
190
191 this->term = term;
192 scrollalign = term->rs[Rs_scrollBar_align];
193 scrollstyle = term->rs[Rs_scrollstyle];
194 thickness = term->rs[Rs_scrollBar_thickness];
190 195
191# if defined(RXVT_SCROLLBAR) 196# if defined(RXVT_SCROLLBAR)
192 style = R_SB_RXVT; 197 style = R_SB_RXVT;
193# elif defined(XTERM_SCROLLBAR) 198# elif defined(XTERM_SCROLLBAR)
194 style = R_SB_XTERM; 199 style = R_SB_XTERM;
… …
229 234
230 if (style != R_SB_NEXT) /* dishonour request - for now */ 235 if (style != R_SB_NEXT) /* dishonour request - for now */
231 if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM) 236 if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM)
232 width = min (i, SB_WIDTH_MAXIMUM); 237 width = min (i, SB_WIDTH_MAXIMUM);
233 238
234# if defined(RXVT_SCROLLBAR) 239# ifdef RXVT_SCROLLBAR
235 if (! (options & Opt_scrollBar_floating) && style == R_SB_RXVT) 240 if (! term->option (Opt_scrollBar_floating) && style == R_SB_RXVT)
236 sb_shadow = SHADOW; 241 shadow = SHADOW_WIDTH;
237# endif 242# endif
238 243
239 scrollBar.style = style; 244 this->style = style;
240 scrollBar.width = width; 245 this->width = width;
241 246
242 /* scrollbar_align = R_SB_ALIGN_CENTRE; */ 247 /* align = R_SB_ALIGN_CENTRE; */
243 if (scrollalign) 248 if (scrollalign)
244 { 249 {
245 if (strncasecmp (scrollalign, "top", 3) == 0) 250 if (strncasecmp (scrollalign, "top", 3) == 0)
246 scrollbar_align = R_SB_ALIGN_TOP; 251 align = R_SB_ALIGN_TOP;
247 else if (strncasecmp (scrollalign, "bottom", 6) == 0) 252 else if (strncasecmp (scrollalign, "bottom", 6) == 0)
248 scrollbar_align = R_SB_ALIGN_BOTTOM; 253 align = R_SB_ALIGN_BOTTOM;
249 } 254 }
250#endif 255 last_bot = last_state = -1;
256 /* cursor scrollBar: Black-on-White */
257 leftptr_cursor = XCreateFontCursor (term->dpy, XC_left_ptr);
251} 258}
252 259
253/*----------------------- end-of-file (C source) -----------------------*/ 260/*----------------------- end-of-file (C source) -----------------------*/
254 261

Diff Legend

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