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

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

Diff Legend

Comparing rxvt-unicode/src/scrollbar.C (file contents):
Revision 1.57 by ayin, Mon Feb 18 11:41:39 2008 UTC vs.
Revision 1.75 by sf-exg, Thu Sep 1 08:16:07 2011 UTC