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.1 by pcg, Mon Nov 24 17:28:08 2003 UTC vs.
Revision 1.8 by pcg, Sat Jan 31 00:20:21 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: scrollbar.c 2 * File: scrollbar.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: scrollbar.C,v 1.1 2003/11/24 17:28:08 pcg Exp $ 4 * $Id: scrollbar.C,v 1.8 2004/01/31 00:20:21 pcg Exp $
5 * 5 *
6 * Copyright (c) 1997,1998 mj olesen <olesen@me.QueensU.CA> 6 * Copyright (c) 1997,1998 mj olesen <olesen@me.QueensU.CA>
7 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 7 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
8 * - N*XTstep like scrollbars 8 * - N*XTstep like scrollbars
9 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com> 9 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com>
… …
30/*----------------------------------------------------------------------*/ 30/*----------------------------------------------------------------------*/
31 31
32/* 32/*
33 * Map or unmap a scrollbar. Returns non-zero upon change of state 33 * Map or unmap a scrollbar. Returns non-zero upon change of state
34 */ 34 */
35/* EXTPROTO */
36int 35int
37rxvt_scrollbar_mapping(pR_ int map) 36rxvt_term::scrollbar_mapping (int map)
38{ 37{
39 int change = 0; 38 int change = 0;
40#ifdef HAVE_SCROLLBARS
41 39
40#ifdef HAVE_SCROLLBARS
42 if (map && !scrollbar_visible(R)) { 41 if (map && !scrollbar_visible()) {
43 scrollbar_setIdle(); 42 scrollBar.setIdle ();
44 if (!R->scrollBar.win) 43 if (!scrollBar.win)
45 rxvt_Resize_scrollBar(aR); 44 resize_scrollbar ();
46 if (R->scrollBar.win) { 45 if (scrollBar.win) {
47 XMapWindow(R->Xdisplay, R->scrollBar.win); 46 XMapWindow(Xdisplay, scrollBar.win);
48 change = 1; 47 change = 1;
49 } 48 }
50 } else if (!map && scrollbar_visible(R)) { 49 } else if (!map && scrollbar_visible()) {
51 R->scrollBar.state = 0; 50 scrollBar.state = 0;
52 XUnmapWindow(R->Xdisplay, R->scrollBar.win); 51 XUnmapWindow(Xdisplay, scrollBar.win);
53 change = 1; 52 change = 1;
54 } 53 }
55#endif 54#endif
56 return change; 55 return change;
57} 56}
58 57
59/* EXTPROTO */
60void 58void
61rxvt_Resize_scrollBar(pR) 59rxvt_term::resize_scrollbar ()
62{ 60{
63#ifdef HAVE_SCROLLBARS 61#ifdef HAVE_SCROLLBARS
64 int delayed_init = 0; 62 int delayed_init = 0;
65 63
66#define R_SCROLLBEG_XTERM 0 64#define R_SCROLLBEG_XTERM 0
67#define R_SCROLLEND_XTERM R->szHint.height 65#define R_SCROLLEND_XTERM szHint.height
68#define R_SCROLLBEG_NEXT 0 66#define R_SCROLLBEG_NEXT 0
69#define R_SCROLLEND_NEXT R->szHint.height - (SB_BUTTON_TOTAL_HEIGHT + \ 67#define R_SCROLLEND_NEXT szHint.height - (SB_BUTTON_TOTAL_HEIGHT + \
70 SB_PADDING) 68 SB_PADDING)
71#define R_SCROLLBEG_RXVT (R->scrollBar.width + 1) + R->sb_shadow 69#define R_SCROLLBEG_RXVT (scrollBar.width + 1) + sb_shadow
72#define R_SCROLLEND_RXVT R->szHint.height - R_SCROLLBEG_RXVT - \ 70#define R_SCROLLEND_RXVT szHint.height - R_SCROLLBEG_RXVT - \
73 (2 * R->sb_shadow) 71 (2 * sb_shadow)
74 72
75#if defined(XTERM_SCROLLBAR) 73#if defined(XTERM_SCROLLBAR)
76 if (R->scrollBar.style == R_SB_XTERM) { 74 if (scrollBar.style == R_SB_XTERM) {
77 R->scrollBar.beg = R_SCROLLBEG_XTERM; 75 scrollBar.beg = R_SCROLLBEG_XTERM;
78 R->scrollBar.end = R_SCROLLEND_XTERM; 76 scrollBar.end = R_SCROLLEND_XTERM;
79 R->scrollBar.update = rxvt_scrollbar_show_xterm; 77 //scrollBar.update = rxvt_scrollbar_show_xterm;
80 } 78 }
81#endif 79#endif
82#if defined(NEXT_SCROLLBAR) 80#if defined(NEXT_SCROLLBAR)
83 if (R->scrollBar.style == R_SB_NEXT) { 81 if (scrollBar.style == R_SB_NEXT) {
84 R->scrollBar.beg = R_SCROLLBEG_NEXT; 82 scrollBar.beg = R_SCROLLBEG_NEXT;
85 R->scrollBar.end = R_SCROLLEND_NEXT; 83 scrollBar.end = R_SCROLLEND_NEXT;
86 R->scrollBar.update = rxvt_scrollbar_show_next; 84 //scrollBar.update = rxvt_scrollbar_show_next;
87 } 85 }
88#endif 86#endif
89#if defined(RXVT_SCROLLBAR) 87#if defined(RXVT_SCROLLBAR)
90 if (R->scrollBar.style == R_SB_RXVT) { 88 if (scrollBar.style == R_SB_RXVT) {
91 R->scrollBar.beg = R_SCROLLBEG_RXVT; 89 scrollBar.beg = R_SCROLLBEG_RXVT;
92 R->scrollBar.end = R_SCROLLEND_RXVT; 90 scrollBar.end = R_SCROLLEND_RXVT;
93 R->scrollBar.update = rxvt_scrollbar_show_rxvt; 91 //scrollBar.update = rxvt_scrollbar_show_rxvt;
94 } 92 }
95#endif 93#endif
96 94
97 if (!R->scrollBar.win) { 95 if (!scrollBar.win) {
98/* create the scrollbar window */ 96/* create the scrollbar window */
99 R->scrollBar.win = XCreateSimpleWindow(R->Xdisplay, 97 scrollBar.win = XCreateSimpleWindow(Xdisplay,
100 R->TermWin.parent[0], 98 TermWin.parent[0],
101 R->h->window_sb_x, 0, 99 window_sb_x, 0,
102 scrollbar_TotalWidth(), 100 scrollbar_TotalWidth(),
103 R->szHint.height, 101 szHint.height,
104 0, 102 0,
105 R->PixColors[Color_fg], 103 PixColors[Color_fg],
106 R->PixColors[Color_bg]); 104 PixColors[Color_bg]);
107#ifdef DEBUG_X 105#ifdef DEBUG_X
108 XStoreName(R->Xdisplay, R->scrollBar.win, "scrollbar"); 106 XStoreName(Xdisplay, scrollBar.win, "scrollbar");
109#endif 107#endif
110 XDefineCursor(R->Xdisplay, R->scrollBar.win, R->h->pointer_leftptr); 108 XDefineCursor(Xdisplay, scrollBar.win, leftptr_cursor);
111 XSelectInput(R->Xdisplay, R->scrollBar.win, 109 XSelectInput(Xdisplay, scrollBar.win,
112 (ExposureMask | ButtonPressMask | ButtonReleaseMask 110 (ExposureMask | ButtonPressMask | ButtonReleaseMask
113 | Button1MotionMask | Button2MotionMask 111 | Button1MotionMask | Button2MotionMask
114 | Button3MotionMask)); 112 | Button3MotionMask));
115 delayed_init = 1; 113 delayed_init = 1;
116 } 114 }
117 rxvt_scrollbar_show(aR_ 1); 115 scrollbar_show (1);
118 if (delayed_init) 116 if (delayed_init)
119 XMapWindow(R->Xdisplay, R->scrollBar.win); 117 XMapWindow (Xdisplay, scrollBar.win);
120#endif 118#endif
121} 119}
122 120
123/* 121/*
124 * Update current scrollbar view w.r.t. slider heights, etc. 122 * Update current scrollbar view w.r.t. slider heights, etc.
125 */ 123 */
126/* EXTPROTO */
127int 124int
128rxvt_scrollbar_show(pR_ int update) 125rxvt_term::scrollbar_show (int update)
129{ 126{
130 int ret = 0; 127 int ret = 0;
131#ifdef HAVE_SCROLLBARS 128#ifdef HAVE_SCROLLBARS
132 int top, bot, len, adj; 129 int top, bot, len, adj;
133 130
134 if (!scrollbar_visible(R)) 131 if (!scrollbar_visible())
135 return 0; 132 return 0;
136 133
137 if (update) { 134 if (update) {
138 top = (R->TermWin.nscrolled - R->TermWin.view_start); 135 top = (TermWin.nscrolled - TermWin.view_start);
139 bot = top + (R->TermWin.nrow - 1); 136 bot = top + (TermWin.nrow - 1);
140 len = max((R->TermWin.nscrolled + (R->TermWin.nrow - 1)), 1); 137 len = max((TermWin.nscrolled + (TermWin.nrow - 1)), 1);
141 adj = (((bot - top) * scrollbar_size()) % len) > 0 ? 1 : 0; 138 adj = (((bot - top) * scrollbar_size()) % len) > 0 ? 1 : 0;
142 139
143 R->scrollBar.top = (R->scrollBar.beg + (top * scrollbar_size()) / len); 140 scrollBar.top = (scrollBar.beg + (top * scrollbar_size()) / len);
144 R->h->scrollbar_len = ((bot - top) * scrollbar_size()) / len + 141 scrollbar_len = ((bot - top) * scrollbar_size()) / len +
145 scrollbar_minheight() + adj; 142 scrollbar_minheight() + adj;
146 R->scrollBar.bot = (R->scrollBar.top + R->h->scrollbar_len); 143 scrollBar.bot = (scrollBar.top + scrollbar_len);
147 /* no change */ 144 /* no change */
148 if (R->scrollBar.top == R->h->last_top 145 if (scrollBar.top == last_top
149 && R->scrollBar.bot == R->h->last_bot 146 && scrollBar.bot == last_bot
150 && (R->scrollBar.state == R->h->last_state || !scrollbar_isUpDn())) 147 && (scrollBar.state == last_state || !scrollbar_isUpDn()))
151 return 0; 148 return 0;
152 } 149 }
153 150
154 ret = R->scrollBar.update(aR_ update, R->h->last_top, R->h->last_bot, 151 ret = scrollbar_update (update, last_top, last_bot, scrollbar_len);
155 R->h->scrollbar_len);
156 152
157 R->h->last_top = R->scrollBar.top; 153 last_top = scrollBar.top;
158 R->h->last_bot = R->scrollBar.bot; 154 last_bot = scrollBar.bot;
159 R->h->last_state = R->scrollBar.state; 155 last_state = scrollBar.state;
160
161#endif 156#endif
157
162 return ret; 158 return ret;
163} 159}
164 160
165/* EXTPROTO */
166void 161void
167rxvt_setup_scrollbar(pR_ const char *scrollalign, const char *scrollstyle, const char *thickness) 162rxvt_term::setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness)
168{ 163{
169#ifdef HAVE_SCROLLBARS 164#ifdef HAVE_SCROLLBARS
170 int i; 165 int i;
171 short style, width; 166 short style, width;
172 167
… …
202 if (style != R_SB_NEXT) /* dishonour request - for now */ 197 if (style != R_SB_NEXT) /* dishonour request - for now */
203 if (thickness && (i = atoi(thickness)) >= SB_WIDTH_MINIMUM) 198 if (thickness && (i = atoi(thickness)) >= SB_WIDTH_MINIMUM)
204 width = min(i, SB_WIDTH_MAXIMUM); 199 width = min(i, SB_WIDTH_MAXIMUM);
205 200
206# if defined(RXVT_SCROLLBAR) 201# if defined(RXVT_SCROLLBAR)
207 if (!(R->Options & Opt_scrollBar_floating) && style == R_SB_RXVT) 202 if (!(Options & Opt_scrollBar_floating) && style == R_SB_RXVT)
208 R->sb_shadow = SHADOW; 203 sb_shadow = SHADOW;
209# endif 204# endif
210 205
211 R->scrollBar.style = style; 206 scrollBar.style = style;
212 R->scrollBar.width = width; 207 scrollBar.width = width;
213 208
214 /* R->h->scrollbar_align = R_SB_ALIGN_CENTRE; */ 209 /* scrollbar_align = R_SB_ALIGN_CENTRE; */
215 if (scrollalign) { 210 if (scrollalign) {
216 if (STRNCASECMP(scrollalign, "top", 3) == 0) 211 if (STRNCASECMP(scrollalign, "top", 3) == 0)
217 R->h->scrollbar_align = R_SB_ALIGN_TOP; 212 scrollbar_align = R_SB_ALIGN_TOP;
218 else if (STRNCASECMP(scrollalign, "bottom", 6) == 0) 213 else if (STRNCASECMP(scrollalign, "bottom", 6) == 0)
219 R->h->scrollbar_align = R_SB_ALIGN_BOTTOM; 214 scrollbar_align = R_SB_ALIGN_BOTTOM;
220 } 215 }
221#endif 216#endif
222} 217}
223 218
224/*----------------------- end-of-file (C source) -----------------------*/ 219/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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