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.8 by pcg, Sat Jan 31 00:20:21 2004 UTC vs.
Revision 1.37 by root, Mon Feb 20 22:40:35 2006 UTC

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

Diff Legend

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