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.54 by ayin, Sun Feb 17 12:21:45 2008 UTC vs.
Revision 1.64 by root, Mon Feb 21 07:41:04 2011 UTC

… …
4 * 4 *
5 * Copyright (c) 1997,1998 mj olesen <olesen@me.QueensU.CA> 5 * Copyright (c) 1997,1998 mj olesen <olesen@me.QueensU.CA>
6 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 6 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
7 * - N*XTstep like scrollbars 7 * - N*XTstep like scrollbars
8 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com> 8 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com>
9 * Copyright (c) 2004-2006 Marc Lehmann <pcg@goof.com> 9 * Copyright (c) 2004-2006 Marc Lehmann <schmorp@schmorp.de>
10 * 10 *
11 * This program is free software; you can redistribute it and/or modify 11 * This program is free software; you can redistribute it and/or modify
12 * it under the terms of the GNU General Public License as published by 12 * it under the terms of the GNU General Public License as published by
13 * the Free Software Foundation; either version 2 of the License, or 13 * the Free Software Foundation; either version 2 of the License, or
14 * (at your option) any later version. 14 * (at your option) any later version.
… …
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.total_width (), 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 112
145 if (!scrollBar.state) 113 if (!state)
146 return 0; 114 return 0;
147 115
148 if (update) 116 if (refresh)
149 { 117 {
150 int top = view_start - top_row; 118 int sb_top = term->view_start - term->top_row;
151 int bot = top + (nrow - 1); 119 int sb_bot = sb_top + (term->nrow - 1);
152 int len = max (nrow - 1 - top_row, 1); 120 int sb_len = max (term->nrow - 1 - term->top_row, 1);
153 int adj = (((bot - top) * scrollBar.size ()) % len) > 0 ? 1 : 0; 121 int sb_size = (sb_bot - sb_top) * size ();
154 122
155 scrollBar.top = (scrollBar.beg + (top * scrollBar.size ()) / len); 123 top = beg + (sb_top * size ()) / sb_len;
156 scrollBar.len = ((bot - top) * scrollBar.size ()) / len + 124 bot = top + sb_size / sb_len + min_height () + (sb_size % sb_len > 0);
157 scrollBar.min_height () + adj;
158 scrollBar.bot = (scrollBar.top + scrollBar.len);
159 /* no change */ 125 /* no change */
160 if (scrollBar.top == scrollBar.last_top 126 if (top == last_top
161 && scrollBar.bot == scrollBar.last_bot 127 && bot == last_bot
162 && (scrollBar.state == scrollBar.last_state 128 && (state == last_state
163 || !(scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN))) 129 || !(state == STATE_UP || state == STATE_DOWN)))
164 return 0; 130 return 0;
165 } 131 }
166 132
167 ret = (this->*scrollBar.update) (update, scrollBar.last_top, scrollBar.last_bot, scrollBar.len); 133 ret = (this->*update) (refresh);
168 134
169 scrollBar.last_top = scrollBar.top; 135 last_top = top;
170 scrollBar.last_bot = scrollBar.bot; 136 last_bot = bot;
171 scrollBar.last_state = scrollBar.state; 137 last_state = state;
172 138
173 return ret; 139 return ret;
174} 140}
175 141
176void 142void
… …
226 192
227 if (style != R_SB_NEXT) /* dishonour request - for now */ 193 if (style != R_SB_NEXT) /* dishonour request - for now */
228 if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM) 194 if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM)
229 width = min (i, SB_WIDTH_MAXIMUM); 195 width = min (i, SB_WIDTH_MAXIMUM);
230 196
231# ifdef RXVT_SCROLLBAR
232 if (! term->option (Opt_scrollBar_floating) && style == R_SB_RXVT)
233 shadow = SHADOW_WIDTH;
234# endif
235
236 this->style = style; 197 this->style = style;
237 this->width = width; 198 this->width = width;
238 199
239 /* align = R_SB_ALIGN_CENTRE; */ 200 /* align = R_SB_ALIGN_CENTRE; */
240 if (scrollalign) 201 if (scrollalign)
… …
247 last_bot = last_state = -1; 208 last_bot = last_state = -1;
248 /* cursor scrollBar: Black-on-White */ 209 /* cursor scrollBar: Black-on-White */
249 leftptr_cursor = XCreateFontCursor (term->dpy, XC_left_ptr); 210 leftptr_cursor = XCreateFontCursor (term->dpy, XC_left_ptr);
250} 211}
251 212
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
243scrollBar_t::update_data ()
244{
245#if defined(PLAIN_SCROLLBAR)
246 if (style == R_SB_PLAIN)
247 {
248 beg = 0;
249 end = term->szHint.height;
250 update = &scrollBar_t::show_plain;
251 }
252#endif
253#if defined(XTERM_SCROLLBAR)
254 if (style == R_SB_XTERM)
255 {
256 beg = 0;
257 end = term->szHint.height;
258 update = &scrollBar_t::show_xterm;
259 }
260#endif
261#if defined(NEXT_SCROLLBAR)
262 if (style == R_SB_NEXT)
263 {
264 beg = 0;
265 end = term->szHint.height - (SB_BUTTON_TOTAL_HEIGHT + SB_PADDING);
266 update = &scrollBar_t::show_next;
267 }
268#endif
269#if defined(RXVT_SCROLLBAR)
270 if (style == R_SB_RXVT)
271 {
272 beg = (width + 1) + shadow;
273 end = term->szHint.height - beg - (2 * shadow);
274 update = &scrollBar_t::show_rxvt;
275 }
276#endif
277}
278
252/*----------------------- end-of-file (C source) -----------------------*/ 279/*----------------------- end-of-file (C source) -----------------------*/
253 280

Diff Legend

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