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.57 by ayin, Mon Feb 18 11:41:39 2008 UTC vs.
Revision 1.63 by sf-exg, Tue Mar 30 10:31:07 2010 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 scrollBar.update_data (); 71 update_data ();
72 72
73 if (!scrollBar.win) 73 if (!win)
74 { 74 {
75 /* create the scrollbar window */ 75 /* create the scrollbar window */
76 scrollBar.win = XCreateSimpleWindow (dpy, 76 win = XCreateSimpleWindow (term->dpy,
77 parent[0], 77 term->parent[0],
78 window_sb_x, 0, 78 window_sb_x, 0,
79 scrollBar.total_width (), 79 total_width (),
80 szHint.height, 80 term->szHint.height,
81 0, 81 0,
82 pix_colors[Color_fg], 82 term->pix_colors[Color_fg],
83 pix_colors[Color_border]); 83 term->pix_colors[Color_border]);
84 XDefineCursor (dpy, scrollBar.win, scrollBar.leftptr_cursor); 84 XDefineCursor (term->dpy, win, leftptr_cursor);
85 85
86 XSelectInput (dpy, scrollBar.win, 86 XSelectInput (term->dpy, win,
87 ExposureMask | ButtonPressMask | ButtonReleaseMask 87 ExposureMask | ButtonPressMask | ButtonReleaseMask
88 | Button1MotionMask | Button2MotionMask 88 | Button1MotionMask | Button2MotionMask
89 | Button3MotionMask); 89 | Button3MotionMask);
90 scrollbar_ev.start (display, scrollBar.win); 90 term->scrollbar_ev.start (term->display, win);
91 91
92 delayed_init = 1; 92 delayed_init = 1;
93 } 93 }
94 else 94 else
95 XMoveResizeWindow (dpy, scrollBar.win, 95 XMoveResizeWindow (term->dpy, win,
96 window_sb_x, 0, 96 window_sb_x, 0,
97 scrollBar.total_width (), szHint.height); 97 total_width (), term->szHint.height);
98 98
99 scrollbar_show (1); 99 show (1);
100 100
101 if (delayed_init) 101 if (delayed_init)
102 XMapWindow (dpy, scrollBar.win); 102 XMapWindow (term->dpy, win);
103} 103}
104 104
105/* 105/*
106 * Update current scrollbar view w.r.t. slider heights, etc. 106 * Update current scrollbar view w.r.t. slider heights, etc.
107 */ 107 */
108int 108int
109rxvt_term::scrollbar_show (int update) 109scrollBar_t::show (int refresh)
110{ 110{
111 int ret = 0; 111 int ret;
112 112
113 if (!scrollBar.state) 113 if (!state)
114 return 0; 114 return 0;
115 115
116 if (update) 116 if (refresh)
117 { 117 {
118 int top = view_start - top_row; 118 int sb_top = term->view_start - term->top_row;
119 int bot = top + (nrow - 1); 119 int sb_bot = sb_top + (term->nrow - 1);
120 int len = max (nrow - 1 - top_row, 1); 120 int sb_len = max (term->nrow - 1 - term->top_row, 1);
121 int size = (bot - top) * scrollBar.size (); 121 int sb_size = (sb_bot - sb_top) * size ();
122 122
123 scrollBar.top = (scrollBar.beg + (top * scrollBar.size ()) / len); 123 top = beg + (sb_top * size ()) / sb_len;
124 scrollBar.len = size / len + scrollBar.min_height () + (size % len > 0); 124 bot = top + sb_size / sb_len + min_height () + (sb_size % sb_len > 0);
125 scrollBar.bot = (scrollBar.top + scrollBar.len);
126 /* no change */ 125 /* no change */
127 if (scrollBar.top == scrollBar.last_top 126 if (top == last_top
128 && scrollBar.bot == scrollBar.last_bot 127 && bot == last_bot
129 && (scrollBar.state == scrollBar.last_state 128 && (state == last_state
130 || !(scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN))) 129 || !(state == STATE_UP || state == STATE_DOWN)))
131 return 0; 130 return 0;
132 } 131 }
133 132
134 ret = (this->*scrollBar.update) (update, scrollBar.last_top, scrollBar.last_bot, scrollBar.len); 133 ret = (this->*update) (refresh);
135 134
136 scrollBar.last_top = scrollBar.top; 135 last_top = top;
137 scrollBar.last_bot = scrollBar.bot; 136 last_bot = bot;
138 scrollBar.last_state = scrollBar.state; 137 last_state = state;
139 138
140 return ret; 139 return ret;
141} 140}
142 141
143void 142void
… …
193 192
194 if (style != R_SB_NEXT) /* dishonour request - for now */ 193 if (style != R_SB_NEXT) /* dishonour request - for now */
195 if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM) 194 if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM)
196 width = min (i, SB_WIDTH_MAXIMUM); 195 width = min (i, SB_WIDTH_MAXIMUM);
197 196
198# ifdef RXVT_SCROLLBAR
199 if (! term->option (Opt_scrollBar_floating) && style == R_SB_RXVT)
200 shadow = SHADOW_WIDTH;
201# endif
202
203 this->style = style; 197 this->style = style;
204 this->width = width; 198 this->width = width;
205 199
206 /* align = R_SB_ALIGN_CENTRE; */ 200 /* align = R_SB_ALIGN_CENTRE; */
207 if (scrollalign) 201 if (scrollalign)
… …
215 /* cursor scrollBar: Black-on-White */ 209 /* cursor scrollBar: Black-on-White */
216 leftptr_cursor = XCreateFontCursor (term->dpy, XC_left_ptr); 210 leftptr_cursor = XCreateFontCursor (term->dpy, XC_left_ptr);
217} 211}
218 212
219void 213void
214scrollBar_t::destroy ()
215{
216#ifdef XTERM_SCROLLBAR
217 if (xscrollbarGC) XFreeGC (term->dpy, xscrollbarGC);
218 if (ShadowGC) XFreeGC (term->dpy, ShadowGC);
219#endif
220#ifdef PLAIN_SCROLLBAR
221 if (pscrollbarGC) XFreeGC (term->dpy, pscrollbarGC);
222#endif
223#ifdef NEXT_SCROLLBAR
224 if (blackGC) XFreeGC (term->dpy, blackGC);
225 if (whiteGC) XFreeGC (term->dpy, whiteGC);
226 if (grayGC) XFreeGC (term->dpy, grayGC);
227 if (darkGC) XFreeGC (term->dpy, darkGC);
228 if (stippleGC) XFreeGC (term->dpy, stippleGC);
229 if (dimple) XFreePixmap (term->dpy, dimple);
230 if (upArrow) XFreePixmap (term->dpy, upArrow);
231 if (downArrow) XFreePixmap (term->dpy, downArrow);
232 if (upArrowHi) XFreePixmap (term->dpy, upArrowHi);
233 if (downArrowHi) XFreePixmap (term->dpy, downArrowHi);
234#endif
235#ifdef RXVT_SCROLLBAR
236 if (topShadowGC) XFreeGC (term->dpy, topShadowGC);
237 if (botShadowGC) XFreeGC (term->dpy, botShadowGC);
238 if (scrollbarGC) XFreeGC (term->dpy, scrollbarGC);
239#endif
240}
241
242void
220scrollBar_t::update_data () 243scrollBar_t::update_data ()
221{ 244{
222#if defined(PLAIN_SCROLLBAR) 245#if defined(PLAIN_SCROLLBAR)
223 if (style == R_SB_PLAIN) 246 if (style == R_SB_PLAIN)
224 { 247 {
225 beg = 0; 248 beg = 0;
226 end = term->szHint.height; 249 end = term->szHint.height;
227 update = &rxvt_term::scrollbar_show_plain; 250 update = &scrollBar_t::show_plain;
228 } 251 }
229#endif 252#endif
230#if defined(XTERM_SCROLLBAR) 253#if defined(XTERM_SCROLLBAR)
231 if (style == R_SB_XTERM) 254 if (style == R_SB_XTERM)
232 { 255 {
233 beg = 0; 256 beg = 0;
234 end = term->szHint.height; 257 end = term->szHint.height;
235 update = &rxvt_term::scrollbar_show_xterm; 258 update = &scrollBar_t::show_xterm;
236 } 259 }
237#endif 260#endif
238#if defined(NEXT_SCROLLBAR) 261#if defined(NEXT_SCROLLBAR)
239 if (style == R_SB_NEXT) 262 if (style == R_SB_NEXT)
240 { 263 {
241 beg = 0; 264 beg = 0;
242 end = term->szHint.height - (SB_BUTTON_TOTAL_HEIGHT + SB_PADDING); 265 end = term->szHint.height - (SB_BUTTON_TOTAL_HEIGHT + SB_PADDING);
243 update = &rxvt_term::scrollbar_show_next; 266 update = &scrollBar_t::show_next;
244 } 267 }
245#endif 268#endif
246#if defined(RXVT_SCROLLBAR) 269#if defined(RXVT_SCROLLBAR)
247 if (style == R_SB_RXVT) 270 if (style == R_SB_RXVT)
248 { 271 {
249 beg = (width + 1) + shadow; 272 beg = (width + 1) + shadow;
250 end = term->szHint.height - beg - (2 * shadow); 273 end = term->szHint.height - beg - (2 * shadow);
251 update = &rxvt_term::scrollbar_show_rxvt; 274 update = &scrollBar_t::show_rxvt;
252 } 275 }
253#endif 276#endif
254} 277}
255 278
256/*----------------------- end-of-file (C source) -----------------------*/ 279/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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