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.62 by ayin, Tue Feb 19 17:49:16 2008 UTC

… …
30 30
31/* 31/*
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) 35scrollBar_t::map (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 state = STATE_IDLE;
43 42
44 if (!scrollBar.win) 43 if (!win)
45 resize_scrollbar (); 44 resize ();
46 45
47 if (scrollBar.win) 46 if (win)
48 { 47 {
49 XMapWindow (dpy, scrollBar.win); 48 XMapWindow (term->dpy, win);
50 change = 1; 49 change = 1;
51 } 50 }
52 } 51 }
53 else 52 else
54 { 53 {
55 scrollBar.state = 0; 54 state = 0;
56 XUnmapWindow (dpy, scrollBar.win); 55 XUnmapWindow (term->dpy, 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 () 63scrollBar_t::resize ()
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 (term->option (Opt_scrollBar_right))
71#define R_SCROLLEND_XTERM szHint.height 69 window_sb_x = term->szHint.width - 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 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 (!win)
113 { 74 {
114 /* create the scrollbar window */ 75 /* create the scrollbar window */
115 scrollBar.win = XCreateSimpleWindow (dpy, 76 win = XCreateSimpleWindow (term->dpy,
116 parent[0], 77 term->parent[0],
117 window_sb_x, 0, 78 window_sb_x, 0,
118 scrollbar_TotalWidth (), 79 total_width (),
119 szHint.height, 80 term->szHint.height,
120 0, 81 0,
121 pix_colors[Color_fg], 82 term->pix_colors[Color_fg],
122 pix_colors[Color_border]); 83 term->pix_colors[Color_border]);
123 XDefineCursor (dpy, scrollBar.win, leftptr_cursor); 84 XDefineCursor (term->dpy, win, leftptr_cursor);
124 85
125 XSelectInput (dpy, scrollBar.win, 86 XSelectInput (term->dpy, 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 term->scrollbar_ev.start (term->display, win);
130 91
131 delayed_init = 1; 92 delayed_init = 1;
132 } 93 }
94 else
95 XMoveResizeWindow (term->dpy, win,
96 window_sb_x, 0,
97 total_width (), term->szHint.height);
133 98
134 scrollbar_show (1); 99 show (1);
135 100
136 if (delayed_init) 101 if (delayed_init)
137 XMapWindow (dpy, scrollBar.win); 102 XMapWindow (term->dpy, 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) 109scrollBar_t::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 (!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 = term->view_start - term->top_row;
157 bot = top + (nrow - 1); 119 int sb_bot = sb_top + (term->nrow - 1);
158 len = max (nrow - 1 - top_row, 1); 120 int sb_len = max (term->nrow - 1 - term->top_row, 1);
159 adj = (((bot - top) * scrollbar_size ()) % len) > 0 ? 1 : 0; 121 int sb_size = (sb_bot - sb_top) * size ();
160 122
161 scrollBar.top = (scrollBar.beg + (top * scrollbar_size ()) / len); 123 top = beg + (sb_top * size ()) / sb_len;
162 scrollBar.len = ((bot - top) * scrollbar_size ()) / len + 124 bot = top + sb_size / sb_len + min_height () + (sb_size % sb_len > 0);
163 scrollbar_minheight () + adj;
164 scrollBar.bot = (scrollBar.top + ScrollBar.len);
165 /* no change */ 125 /* no change */
166 if (scrollBar.top == scrollBar.last_top 126 if (top == last_top
167 && scrollBar.bot == scrollBar.last_bot 127 && bot == last_bot
168 && (scrollBar.state == scrollBar.last_state || !scrollbar_isUpDn ())) 128 && (state == last_state
129 || !(state == STATE_UP || state == STATE_DOWN)))
169 return 0; 130 return 0;
170 } 131 }
171 132
172 ret = (this->*scrollBar.update) (update, scrollBar.last_top, scrollBar.last_bot, scrollBar.len); 133 ret = (this->*update) (refresh);
173 134
174 scrollBar.last_top = scrollBar.top; 135 last_top = top;
175 scrollBar.last_bot = scrollBar.bot; 136 last_bot = bot;
176 scrollBar.last_state = scrollBar.state; 137 last_state = state;
177#endif
178 138
179 return ret; 139 return ret;
180} 140}
181 141
182void 142void
183rxvt_term::setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness) 143scrollBar_t::setup (rxvt_term *term)
184{ 144{
185#ifdef HAVE_SCROLLBARS
186 int i; 145 int i;
187 short style, width; 146 short style, width;
147 const char *scrollalign, *scrollstyle, *thickness;
148
149 this->term = term;
150 scrollalign = term->rs[Rs_scrollBar_align];
151 scrollstyle = term->rs[Rs_scrollstyle];
152 thickness = term->rs[Rs_scrollBar_thickness];
188 153
189# if defined(RXVT_SCROLLBAR) 154# if defined(RXVT_SCROLLBAR)
190 style = R_SB_RXVT; 155 style = R_SB_RXVT;
191# elif defined(XTERM_SCROLLBAR) 156# elif defined(XTERM_SCROLLBAR)
192 style = R_SB_XTERM; 157 style = R_SB_XTERM;
… …
228 if (style != R_SB_NEXT) /* dishonour request - for now */ 193 if (style != R_SB_NEXT) /* dishonour request - for now */
229 if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM) 194 if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM)
230 width = min (i, SB_WIDTH_MAXIMUM); 195 width = min (i, SB_WIDTH_MAXIMUM);
231 196
232# ifdef RXVT_SCROLLBAR 197# ifdef RXVT_SCROLLBAR
233 if (! option (Opt_scrollBar_floating) && style == R_SB_RXVT) 198 if (! term->option (Opt_scrollBar_floating) && style == R_SB_RXVT)
234 scrollBar.shadow = SHADOW_WIDTH; 199 shadow = SHADOW_WIDTH;
235# endif 200# endif
236 201
237 scrollBar.style = style; 202 this->style = style;
238 scrollBar.width = width; 203 this->width = width;
239 204
240 /* scrollBar.align = R_SB_ALIGN_CENTRE; */ 205 /* align = R_SB_ALIGN_CENTRE; */
241 if (scrollalign) 206 if (scrollalign)
242 { 207 {
243 if (strncasecmp (scrollalign, "top", 3) == 0) 208 if (strncasecmp (scrollalign, "top", 3) == 0)
244 scrollBar.align = R_SB_ALIGN_TOP; 209 align = R_SB_ALIGN_TOP;
245 else if (strncasecmp (scrollalign, "bottom", 6) == 0) 210 else if (strncasecmp (scrollalign, "bottom", 6) == 0)
246 scrollBar.align = R_SB_ALIGN_BOTTOM; 211 align = R_SB_ALIGN_BOTTOM;
212 }
213 last_bot = last_state = -1;
214 /* cursor scrollBar: Black-on-White */
215 leftptr_cursor = XCreateFontCursor (term->dpy, XC_left_ptr);
216}
217
218void
219scrollBar_t::destroy ()
220{
221#ifdef XTERM_SCROLLBAR
222 if (xscrollbarGC) XFreeGC (term->dpy, xscrollbarGC);
223 if (ShadowGC) XFreeGC (term->dpy, ShadowGC);
224#endif
225#ifdef PLAIN_SCROLLBAR
226 if (pscrollbarGC) XFreeGC (term->dpy, pscrollbarGC);
227#endif
228#ifdef NEXT_SCROLLBAR
229 if (blackGC) XFreeGC (term->dpy, blackGC);
230 if (whiteGC) XFreeGC (term->dpy, whiteGC);
231 if (grayGC) XFreeGC (term->dpy, grayGC);
232 if (darkGC) XFreeGC (term->dpy, darkGC);
233 if (stippleGC) XFreeGC (term->dpy, stippleGC);
234 if (dimple) XFreePixmap (term->dpy, dimple);
235 if (upArrow) XFreePixmap (term->dpy, upArrow);
236 if (downArrow) XFreePixmap (term->dpy, downArrow);
237 if (upArrowHi) XFreePixmap (term->dpy, upArrowHi);
238 if (downArrowHi) XFreePixmap (term->dpy, downArrowHi);
239#endif
240#ifdef RXVT_SCROLLBAR
241 if (topShadowGC) XFreeGC (term->dpy, topShadowGC);
242 if (botShadowGC) XFreeGC (term->dpy, botShadowGC);
243 if (scrollbarGC) XFreeGC (term->dpy, scrollbarGC);
244#endif
245}
246
247void
248scrollBar_t::update_data ()
249{
250#if defined(PLAIN_SCROLLBAR)
251 if (style == R_SB_PLAIN)
247 } 252 {
248 scrollBar.last_bot = scrollBar.last_state = -1; 253 beg = 0;
254 end = term->szHint.height;
255 update = &scrollBar_t::show_plain;
256 }
257#endif
258#if defined(XTERM_SCROLLBAR)
259 if (style == R_SB_XTERM)
260 {
261 beg = 0;
262 end = term->szHint.height;
263 update = &scrollBar_t::show_xterm;
264 }
265#endif
266#if defined(NEXT_SCROLLBAR)
267 if (style == R_SB_NEXT)
268 {
269 beg = 0;
270 end = term->szHint.height - (SB_BUTTON_TOTAL_HEIGHT + SB_PADDING);
271 update = &scrollBar_t::show_next;
272 }
273#endif
274#if defined(RXVT_SCROLLBAR)
275 if (style == R_SB_RXVT)
276 {
277 beg = (width + 1) + shadow;
278 end = term->szHint.height - beg - (2 * shadow);
279 update = &scrollBar_t::show_rxvt;
280 }
249#endif 281#endif
250} 282}
251 283
252/*----------------------- end-of-file (C source) -----------------------*/ 284/*----------------------- end-of-file (C source) -----------------------*/
253 285

Diff Legend

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