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.7 by pcg, Thu Dec 18 14:11:47 2003 UTC vs.
Revision 1.33 by root, Tue Jan 24 19:40:12 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: scrollbar.c 2 * File: scrollbar.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: scrollbar.C,v 1.7 2003/12/18 14:11:47 pcg Exp $
5 * 4 *
6 * Copyright (c) 1997,1998 mj olesen <olesen@me.QueensU.CA> 5 * Copyright (c) 1997,1998 mj olesen <olesen@me.QueensU.CA>
7 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 6 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
8 * - N*XTstep like scrollbars 7 * - N*XTstep like scrollbars
9 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com> 8 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com>
9 * Copyright (c) 2004 Marc Lehmann <pcg@goof.com>
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.
… …
23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
24 *----------------------------------------------------------------------*/ 24 *----------------------------------------------------------------------*/
25 25
26#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
27#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
28#include "scrollbar.intpro" /* PROTOS for internal routines */
29 28
30/*----------------------------------------------------------------------*/ 29/*----------------------------------------------------------------------*/
31 30
32/* 31/*
33 * 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
34 */ 33 */
35/* EXTPROTO */
36int 34int
37rxvt_scrollbar_mapping(pR_ int map) 35rxvt_term::scrollbar_mapping (int map)
38{ 36{
39 int change = 0; 37 int change = 0;
40 38
41#ifdef HAVE_SCROLLBARS 39#ifdef HAVE_SCROLLBARS
42 if (map && !scrollbar_visible(R)) { 40 if (map)
41 {
43 R->scrollBar.setIdle (); 42 scrollBar.setIdle ();
43
44 if (!R->scrollBar.win) 44 if (!scrollBar.win)
45 R->resize_scrollbar (); 45 resize_scrollbar ();
46
46 if (R->scrollBar.win) { 47 if (scrollBar.win)
48 {
47 XMapWindow(R->Xdisplay, R->scrollBar.win); 49 XMapWindow (display->display, scrollBar.win);
50 change = 1;
51 }
52 }
53 else
54 {
55 scrollBar.state = 0;
56 XUnmapWindow (display->display, scrollBar.win);
48 change = 1; 57 change = 1;
49 }
50 } else if (!map && scrollbar_visible(R)) {
51 R->scrollBar.state = 0;
52 XUnmapWindow(R->Xdisplay, R->scrollBar.win);
53 change = 1;
54 } 58 }
55#endif 59#endif
56 return change; 60 return change;
57} 61}
58 62
59void 63void
60rxvt_term::resize_scrollbar () 64rxvt_term::resize_scrollbar ()
61{ 65{
62#ifdef HAVE_SCROLLBARS 66#ifdef HAVE_SCROLLBARS
63 int delayed_init = 0; 67 int delayed_init = 0;
64 68
65#define R_SCROLLBEG_XTERM 0 69#define R_SCROLLBEG_XTERM 0
66#define R_SCROLLEND_XTERM szHint.height 70#define R_SCROLLEND_XTERM szHint.height
67#define R_SCROLLBEG_NEXT 0 71#define R_SCROLLBEG_NEXT 0
68#define R_SCROLLEND_NEXT szHint.height - (SB_BUTTON_TOTAL_HEIGHT + \ 72#define R_SCROLLEND_NEXT szHint.height - (SB_BUTTON_TOTAL_HEIGHT + \
69 SB_PADDING) 73 SB_PADDING)
70#define R_SCROLLBEG_RXVT (scrollBar.width + 1) + sb_shadow 74#define R_SCROLLBEG_RXVT (scrollBar.width + 1) + sb_shadow
71#define R_SCROLLEND_RXVT szHint.height - R_SCROLLBEG_RXVT - \ 75#define R_SCROLLEND_RXVT szHint.height - R_SCROLLBEG_RXVT - \
72 (2 * sb_shadow) 76 (2 * sb_shadow)
73 77
78#if defined(PLAIN_SCROLLBAR)
79 if (scrollBar.style == R_SB_PLAIN)
80 {
81 scrollBar.beg = R_SCROLLBEG_XTERM;
82 scrollBar.end = R_SCROLLEND_XTERM;
83 scrollBar.update = &rxvt_term::scrollbar_show_plain;
84 }
85#endif
74#if defined(XTERM_SCROLLBAR) 86#if defined(XTERM_SCROLLBAR)
75 if (scrollBar.style == R_SB_XTERM) { 87 if (scrollBar.style == R_SB_XTERM)
88 {
76 scrollBar.beg = R_SCROLLBEG_XTERM; 89 scrollBar.beg = R_SCROLLBEG_XTERM;
77 scrollBar.end = R_SCROLLEND_XTERM; 90 scrollBar.end = R_SCROLLEND_XTERM;
78 scrollBar.update = rxvt_scrollbar_show_xterm; 91 scrollBar.update = &rxvt_term::scrollbar_show_xterm;
79 } 92 }
80#endif 93#endif
81#if defined(NEXT_SCROLLBAR) 94#if defined(NEXT_SCROLLBAR)
82 if (scrollBar.style == R_SB_NEXT) { 95 if (scrollBar.style == R_SB_NEXT)
96 {
83 scrollBar.beg = R_SCROLLBEG_NEXT; 97 scrollBar.beg = R_SCROLLBEG_NEXT;
84 scrollBar.end = R_SCROLLEND_NEXT; 98 scrollBar.end = R_SCROLLEND_NEXT;
85 scrollBar.update = rxvt_scrollbar_show_next; 99 scrollBar.update = &rxvt_term::scrollbar_show_next;
86 } 100 }
87#endif 101#endif
88#if defined(RXVT_SCROLLBAR) 102#if defined(RXVT_SCROLLBAR)
89 if (scrollBar.style == R_SB_RXVT) { 103 if (scrollBar.style == R_SB_RXVT)
104 {
90 scrollBar.beg = R_SCROLLBEG_RXVT; 105 scrollBar.beg = R_SCROLLBEG_RXVT;
91 scrollBar.end = R_SCROLLEND_RXVT; 106 scrollBar.end = R_SCROLLEND_RXVT;
92 scrollBar.update = rxvt_scrollbar_show_rxvt; 107 scrollBar.update = &rxvt_term::scrollbar_show_rxvt;
93 } 108 }
94#endif 109#endif
95 110
96 if (!scrollBar.win) { 111 if (!scrollBar.win)
112 {
97/* create the scrollbar window */ 113 /* create the scrollbar window */
98 scrollBar.win = XCreateSimpleWindow(Xdisplay, 114 scrollBar.win = XCreateSimpleWindow (display->display,
99 TermWin.parent[0], 115 parent[0],
100 window_sb_x, 0, 116 window_sb_x, 0,
101 scrollbar_TotalWidth(), 117 scrollbar_TotalWidth (),
102 szHint.height, 118 szHint.height,
103 0, 119 0,
104 PixColors[Color_fg], 120 pix_colors[Color_fg],
105 PixColors[Color_bg]); 121 pix_colors[Color_border]);
106#ifdef DEBUG_X
107 XStoreName(Xdisplay, scrollBar.win, "scrollbar");
108#endif
109 XDefineCursor(Xdisplay, scrollBar.win, leftptr_cursor); 122 XDefineCursor (display->display, scrollBar.win, leftptr_cursor);
123
110 XSelectInput(Xdisplay, scrollBar.win, 124 XSelectInput (display->display, scrollBar.win,
111 (ExposureMask | ButtonPressMask | ButtonReleaseMask 125 ExposureMask | ButtonPressMask | ButtonReleaseMask
112 | Button1MotionMask | Button2MotionMask 126 | Button1MotionMask | Button2MotionMask
113 | Button3MotionMask)); 127 | Button3MotionMask);
128 scrollbar_ev.start (display, scrollBar.win);
129
114 delayed_init = 1; 130 delayed_init = 1;
115 } 131 }
132
116 rxvt_scrollbar_show (this, 1); 133 scrollbar_show (1);
134
117 if (delayed_init) 135 if (delayed_init)
118 XMapWindow (Xdisplay, scrollBar.win); 136 XMapWindow (display->display, scrollBar.win);
119#endif 137#endif
120} 138}
121 139
122/* 140/*
123 * Update current scrollbar view w.r.t. slider heights, etc. 141 * Update current scrollbar view w.r.t. slider heights, etc.
124 */ 142 */
125/* EXTPROTO */
126int 143int
127rxvt_scrollbar_show(pR_ int update) 144rxvt_term::scrollbar_show (int update)
128{ 145{
129 int ret = 0; 146 int ret = 0;
130#ifdef HAVE_SCROLLBARS 147#ifdef HAVE_SCROLLBARS
131 int top, bot, len, adj; 148 int top, bot, len, adj;
132 149
133 if (!scrollbar_visible(R)) 150 if (!scrollBar.state)
134 return 0;
135
136 if (update) {
137 top = (R->TermWin.nscrolled - R->TermWin.view_start);
138 bot = top + (R->TermWin.nrow - 1);
139 len = max((R->TermWin.nscrolled + (R->TermWin.nrow - 1)), 1);
140 adj = (((bot - top) * scrollbar_size()) % len) > 0 ? 1 : 0;
141
142 R->scrollBar.top = (R->scrollBar.beg + (top * scrollbar_size()) / len);
143 R->scrollbar_len = ((bot - top) * scrollbar_size()) / len +
144 scrollbar_minheight() + adj;
145 R->scrollBar.bot = (R->scrollBar.top + R->scrollbar_len);
146 /* no change */
147 if (R->scrollBar.top == R->last_top
148 && R->scrollBar.bot == R->last_bot
149 && (R->scrollBar.state == R->last_state || !scrollbar_isUpDn()))
150 return 0; 151 return 0;
152
153 if (update)
151 } 154 {
155 top = view_start - top_row;
156 bot = top + (nrow - 1);
157 len = max (nrow - 1 - top_row, 1);
158 adj = (((bot - top) * scrollbar_size ()) % len) > 0 ? 1 : 0;
152 159
153 ret = R->scrollBar.update(aR_ update, R->last_top, R->last_bot, 160 scrollBar.top = (scrollBar.beg + (top * scrollbar_size ()) / len);
154 R->scrollbar_len); 161 scrollbar_len = ((bot - top) * scrollbar_size ()) / len +
162 scrollbar_minheight () + adj;
163 scrollBar.bot = (scrollBar.top + scrollbar_len);
164 /* no change */
165 if (scrollBar.top == last_top
166 && scrollBar.bot == last_bot
167 && (scrollBar.state == last_state || !scrollbar_isUpDn ()))
168 return 0;
169 }
155 170
171 ret = (this->*scrollBar.update) (update, last_top, last_bot, scrollbar_len);
172
156 R->last_top = R->scrollBar.top; 173 last_top = scrollBar.top;
157 R->last_bot = R->scrollBar.bot; 174 last_bot = scrollBar.bot;
158 R->last_state = R->scrollBar.state; 175 last_state = scrollBar.state;
159#endif 176#endif
160 177
161 return ret; 178 return ret;
162} 179}
163 180
164/* EXTPROTO */
165void 181void
166rxvt_setup_scrollbar(pR_ const char *scrollalign, const char *scrollstyle, const char *thickness) 182rxvt_term::setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness)
167{ 183{
168#ifdef HAVE_SCROLLBARS 184#ifdef HAVE_SCROLLBARS
169 int i; 185 int i;
170 short style, width; 186 short style, width;
171 187
172# if defined(RXVT_SCROLLBAR) || !(defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)) 188# if defined(RXVT_SCROLLBAR)
173 style = R_SB_RXVT; 189 style = R_SB_RXVT;
190# elif defined(XTERM_SCROLLBAR)
191 style = R_SB_XTERM;
192# elif defined(NEXT_SCROLLBAR)
193 style = R_SB_NEXT;
194# elif defined(PLAIN_SCROLLBAR)
195 style = R_SB_PLAIN;
174# else 196#else
197 style = R_SB_RXVT;
198# endif
199
200# if (defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR))
201 if (scrollstyle)
202 {
175# ifdef NEXT_SCROLLBAR 203# ifdef NEXT_SCROLLBAR
204 if (strncasecmp (scrollstyle, "next", 4) == 0)
176 style = R_SB_NEXT; 205 style = R_SB_NEXT;
177# elif defined(XTERM_SCROLLBAR)
178 style = R_SB_XTERM;
179# endif
180# endif
181
182# if (defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR))
183 if (scrollstyle) {
184# ifdef NEXT_SCROLLBAR
185 if (STRNCASECMP(scrollstyle, "next", 4) == 0)
186 style = R_SB_NEXT;
187# endif 206# endif
188# ifdef XTERM_SCROLLBAR 207# ifdef XTERM_SCROLLBAR
189 if (STRNCASECMP(scrollstyle, "xterm", 5) == 0) 208 if (strncasecmp (scrollstyle, "xterm", 5) == 0)
190 style = R_SB_XTERM; 209 style = R_SB_XTERM;
191# endif 210# endif
211# ifdef PLAIN_SCROLLBAR
212 if (strncasecmp (scrollstyle, "plain", 5) == 0)
213 style = R_SB_PLAIN;
214# endif
215
192 } 216 }
193# endif 217# endif
194 if (style == R_SB_NEXT) 218 if (style == R_SB_NEXT)
195 width = SB_WIDTH_NEXT; 219 width = SB_WIDTH_NEXT;
196 else if (style == R_SB_XTERM) 220 else if (style == R_SB_XTERM)
197 width = SB_WIDTH_XTERM; 221 width = SB_WIDTH_XTERM;
222 else if (style == R_SB_PLAIN)
223 width = SB_WIDTH_PLAIN;
198 else /* if (style == R_SB_RXVT) */ 224 else /* if (style == R_SB_RXVT) */
199 width = SB_WIDTH_RXVT; 225 width = SB_WIDTH_RXVT;
200 226
201 if (style != R_SB_NEXT) /* dishonour request - for now */ 227 if (style != R_SB_NEXT) /* dishonour request - for now */
202 if (thickness && (i = atoi(thickness)) >= SB_WIDTH_MINIMUM) 228 if (thickness && (i = atoi (thickness)) >= SB_WIDTH_MINIMUM)
203 width = min(i, SB_WIDTH_MAXIMUM); 229 width = min (i, SB_WIDTH_MAXIMUM);
204 230
205# if defined(RXVT_SCROLLBAR) 231# ifdef RXVT_SCROLLBAR
206 if (!(R->Options & Opt_scrollBar_floating) && style == R_SB_RXVT) 232 if (! OPTION (Opt_scrollBar_floating) && style == R_SB_RXVT)
207 R->sb_shadow = SHADOW; 233 sb_shadow = 2;
208# endif 234# endif
209 235
210 R->scrollBar.style = style; 236 scrollBar.style = style;
211 R->scrollBar.width = width; 237 scrollBar.width = width;
212 238
213 /* R->scrollbar_align = R_SB_ALIGN_CENTRE; */ 239 /* scrollbar_align = R_SB_ALIGN_CENTRE; */
214 if (scrollalign) { 240 if (scrollalign)
215 if (STRNCASECMP(scrollalign, "top", 3) == 0) 241 {
242 if (strncasecmp (scrollalign, "top", 3) == 0)
216 R->scrollbar_align = R_SB_ALIGN_TOP; 243 scrollbar_align = R_SB_ALIGN_TOP;
217 else if (STRNCASECMP(scrollalign, "bottom", 6) == 0) 244 else if (strncasecmp (scrollalign, "bottom", 6) == 0)
218 R->scrollbar_align = R_SB_ALIGN_BOTTOM; 245 scrollbar_align = R_SB_ALIGN_BOTTOM;
219 } 246 }
220#endif 247#endif
221} 248}
222 249
223/*----------------------- end-of-file (C source) -----------------------*/ 250/*----------------------- end-of-file (C source) -----------------------*/
251

Diff Legend

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