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.55 by ayin, Mon Feb 18 09:58:05 2008 UTC vs.
Revision 1.61 by ayin, Tue Feb 19 13:01:33 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 if (map) 39 if (map)
40 { 40 {
41 scrollBar.state = STATE_IDLE; 41 state = STATE_IDLE;
42 42
43 if (!scrollBar.win) 43 if (!win)
44 resize_scrollbar (); 44 resize ();
45 45
46 if (scrollBar.win) 46 if (win)
47 { 47 {
48 XMapWindow (dpy, scrollBar.win); 48 XMapWindow (term->dpy, win);
49 change = 1; 49 change = 1;
50 } 50 }
51 } 51 }
52 else 52 else
53 { 53 {
54 scrollBar.state = 0; 54 state = 0;
55 XUnmapWindow (dpy, scrollBar.win); 55 XUnmapWindow (term->dpy, win);
56 change = 1; 56 change = 1;
57 } 57 }
58 58
59 return change; 59 return change;
60} 60}
61 61
62void 62void
63rxvt_term::resize_scrollbar () 63scrollBar_t::resize ()
64{ 64{
65 int delayed_init = 0; 65 int delayed_init = 0;
66 int window_sb_x = 0; 66 int window_sb_x = 0;
67 67
68 if (option (Opt_scrollBar_right)) 68 if (term->option (Opt_scrollBar_right))
69 window_sb_x = szHint.width - scrollBar.total_width (); 69 window_sb_x = term->szHint.width - total_width ();
70 70
71#define R_SCROLLBEG_XTERM 0 71 update_data ();
72#define R_SCROLLEND_XTERM szHint.height
73#define R_SCROLLBEG_NEXT 0
74#define R_SCROLLEND_NEXT szHint.height - (SB_BUTTON_TOTAL_HEIGHT + \
75 SB_PADDING)
76#define R_SCROLLBEG_RXVT (scrollBar.width + 1) + scrollBar.shadow
77#define R_SCROLLEND_RXVT szHint.height - R_SCROLLBEG_RXVT - \
78 (2 * scrollBar.shadow)
79 72
80#if defined(PLAIN_SCROLLBAR) 73 if (!win)
81 if (scrollBar.style == R_SB_PLAIN)
82 {
83 scrollBar.beg = R_SCROLLBEG_XTERM;
84 scrollBar.end = R_SCROLLEND_XTERM;
85 scrollBar.update = &rxvt_term::scrollbar_show_plain;
86 }
87#endif
88#if defined(XTERM_SCROLLBAR)
89 if (scrollBar.style == R_SB_XTERM)
90 {
91 scrollBar.beg = R_SCROLLBEG_XTERM;
92 scrollBar.end = R_SCROLLEND_XTERM;
93 scrollBar.update = &rxvt_term::scrollbar_show_xterm;
94 }
95#endif
96#if defined(NEXT_SCROLLBAR)
97 if (scrollBar.style == R_SB_NEXT)
98 {
99 scrollBar.beg = R_SCROLLBEG_NEXT;
100 scrollBar.end = R_SCROLLEND_NEXT;
101 scrollBar.update = &rxvt_term::scrollbar_show_next;
102 }
103#endif
104#if defined(RXVT_SCROLLBAR)
105 if (scrollBar.style == R_SB_RXVT)
106 {
107 scrollBar.beg = R_SCROLLBEG_RXVT;
108 scrollBar.end = R_SCROLLEND_RXVT;
109 scrollBar.update = &rxvt_term::scrollbar_show_rxvt;
110 }
111#endif
112
113 if (!scrollBar.win)
114 { 74 {
115 /* create the scrollbar window */ 75 /* create the scrollbar window */
116 scrollBar.win = XCreateSimpleWindow (dpy, 76 win = XCreateSimpleWindow (term->dpy,
117 parent[0], 77 term->parent[0],
118 window_sb_x, 0, 78 window_sb_x, 0,
119 scrollBar.total_width (), 79 total_width (),
120 szHint.height, 80 term->szHint.height,
121 0, 81 0,
122 pix_colors[Color_fg], 82 term->pix_colors[Color_fg],
123 pix_colors[Color_border]); 83 term->pix_colors[Color_border]);
124 XDefineCursor (dpy, scrollBar.win, scrollBar.leftptr_cursor); 84 XDefineCursor (term->dpy, win, leftptr_cursor);
125 85
126 XSelectInput (dpy, scrollBar.win, 86 XSelectInput (term->dpy, win,
127 ExposureMask | ButtonPressMask | ButtonReleaseMask 87 ExposureMask | ButtonPressMask | ButtonReleaseMask
128 | Button1MotionMask | Button2MotionMask 88 | Button1MotionMask | Button2MotionMask
129 | Button3MotionMask); 89 | Button3MotionMask);
130 scrollbar_ev.start (display, scrollBar.win); 90 term->scrollbar_ev.start (term->display, win);
131 91
132 delayed_init = 1; 92 delayed_init = 1;
133 } 93 }
134 else 94 else
135 XMoveResizeWindow (dpy, scrollBar.win, 95 XMoveResizeWindow (term->dpy, win,
136 window_sb_x, 0, 96 window_sb_x, 0,
137 scrollBar.total_width (), szHint.height); 97 total_width (), term->szHint.height);
138 98
139 scrollbar_show (1); 99 show (1);
140 100
141 if (delayed_init) 101 if (delayed_init)
142 XMapWindow (dpy, scrollBar.win); 102 XMapWindow (term->dpy, win);
143} 103}
144 104
145/* 105/*
146 * Update current scrollbar view w.r.t. slider heights, etc. 106 * Update current scrollbar view w.r.t. slider heights, etc.
147 */ 107 */
148int 108int
149rxvt_term::scrollbar_show (int update) 109scrollBar_t::show (int refresh)
150{ 110{
151 int ret = 0; 111 int ret;
152 112
153 if (!scrollBar.state) 113 if (!state)
154 return 0; 114 return 0;
155 115
156 if (update) 116 if (refresh)
157 { 117 {
158 int top = view_start - top_row; 118 int sb_top = term->view_start - term->top_row;
159 int bot = top + (nrow - 1); 119 int sb_bot = sb_top + (term->nrow - 1);
160 int len = max (nrow - 1 - top_row, 1); 120 int sb_len = max (term->nrow - 1 - term->top_row, 1);
161 int adj = (((bot - top) * scrollBar.size ()) % len) > 0 ? 1 : 0; 121 int sb_size = (sb_bot - sb_top) * size ();
162 122
163 scrollBar.top = (scrollBar.beg + (top * scrollBar.size ()) / len); 123 top = beg + (sb_top * size ()) / sb_len;
164 scrollBar.len = ((bot - top) * scrollBar.size ()) / len + 124 len = sb_size / sb_len + min_height () + (sb_size % sb_len > 0);
165 scrollBar.min_height () + adj; 125 bot = top + len;
166 scrollBar.bot = (scrollBar.top + scrollBar.len);
167 /* no change */ 126 /* no change */
168 if (scrollBar.top == scrollBar.last_top 127 if (top == last_top
169 && scrollBar.bot == scrollBar.last_bot 128 && bot == last_bot
170 && (scrollBar.state == scrollBar.last_state 129 && (state == last_state
171 || !(scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN))) 130 || !(state == STATE_UP || state == STATE_DOWN)))
172 return 0; 131 return 0;
173 } 132 }
174 133
175 ret = (this->*scrollBar.update) (update, scrollBar.last_top, scrollBar.last_bot, scrollBar.len); 134 ret = (this->*update) (refresh);
176 135
177 scrollBar.last_top = scrollBar.top; 136 last_top = top;
178 scrollBar.last_bot = scrollBar.bot; 137 last_bot = bot;
179 scrollBar.last_state = scrollBar.state; 138 last_state = state;
180 139
181 return ret; 140 return ret;
182} 141}
183 142
184void 143void
… …
255 last_bot = last_state = -1; 214 last_bot = last_state = -1;
256 /* cursor scrollBar: Black-on-White */ 215 /* cursor scrollBar: Black-on-White */
257 leftptr_cursor = XCreateFontCursor (term->dpy, XC_left_ptr); 216 leftptr_cursor = XCreateFontCursor (term->dpy, XC_left_ptr);
258} 217}
259 218
219void
220scrollBar_t::destroy ()
221{
222#ifdef XTERM_SCROLLBAR
223 if (xscrollbarGC) XFreeGC (term->dpy, xscrollbarGC);
224 if (ShadowGC) XFreeGC (term->dpy, ShadowGC);
225#endif
226#ifdef PLAIN_SCROLLBAR
227 if (pscrollbarGC) XFreeGC (term->dpy, pscrollbarGC);
228#endif
229#ifdef NEXT_SCROLLBAR
230 if (blackGC) XFreeGC (term->dpy, blackGC);
231 if (whiteGC) XFreeGC (term->dpy, whiteGC);
232 if (grayGC) XFreeGC (term->dpy, grayGC);
233 if (darkGC) XFreeGC (term->dpy, darkGC);
234 if (stippleGC) XFreeGC (term->dpy, stippleGC);
235 if (dimple) XFreePixmap (term->dpy, dimple);
236 if (upArrow) XFreePixmap (term->dpy, upArrow);
237 if (downArrow) XFreePixmap (term->dpy, downArrow);
238 if (upArrowHi) XFreePixmap (term->dpy, upArrowHi);
239 if (downArrowHi) XFreePixmap (term->dpy, downArrowHi);
240#endif
241#ifdef RXVT_SCROLLBAR
242 if (topShadowGC) XFreeGC (term->dpy, topShadowGC);
243 if (botShadowGC) XFreeGC (term->dpy, botShadowGC);
244 if (scrollbarGC) XFreeGC (term->dpy, scrollbarGC);
245#endif
246}
247
248void
249scrollBar_t::update_data ()
250{
251#if defined(PLAIN_SCROLLBAR)
252 if (style == R_SB_PLAIN)
253 {
254 beg = 0;
255 end = term->szHint.height;
256 update = &scrollBar_t::show_plain;
257 }
258#endif
259#if defined(XTERM_SCROLLBAR)
260 if (style == R_SB_XTERM)
261 {
262 beg = 0;
263 end = term->szHint.height;
264 update = &scrollBar_t::show_xterm;
265 }
266#endif
267#if defined(NEXT_SCROLLBAR)
268 if (style == R_SB_NEXT)
269 {
270 beg = 0;
271 end = term->szHint.height - (SB_BUTTON_TOTAL_HEIGHT + SB_PADDING);
272 update = &scrollBar_t::show_next;
273 }
274#endif
275#if defined(RXVT_SCROLLBAR)
276 if (style == R_SB_RXVT)
277 {
278 beg = (width + 1) + shadow;
279 end = term->szHint.height - beg - (2 * shadow);
280 update = &scrollBar_t::show_rxvt;
281 }
282#endif
283}
284
260/*----------------------- end-of-file (C source) -----------------------*/ 285/*----------------------- end-of-file (C source) -----------------------*/
261 286

Diff Legend

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