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

Diff Legend

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