[ViewVC] Diff of: cvs/rxvt-unicode/src/scrollbar.C

Comparing rxvt-unicode/src/scrollbar.C (file contents):
Revision 1.33 by root, Tue Jan 24 19:40:12 2006 UTC vs.
Revision 1.78 by sf-exg, Sun Oct 14 12:31:59 2012 UTC

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

Diff Legend

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

Comparing rxvt-unicode/src/scrollbar.C (file contents): Revision 1.33 by root, Tue Jan 24 19:40:12 2006 UTC vs. Revision 1.78 by sf-exg, Sun Oct 14 12:31:59 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/scrollbar.C (file contents):
Revision 1.33 by root, Tue Jan 24 19:40:12 2006 UTC vs.
Revision 1.78 by sf-exg, Sun Oct 14 12:31:59 2012 UTC