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.45 by ayin, Tue Jan 1 21:14:39 2008 UTC vs.
Revision 1.59 by ayin, Mon Feb 18 15:14:32 2008 UTC

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

Diff Legend

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