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

Diff Legend

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