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

Diff Legend

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