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

Comparing rxvt-unicode/src/scrollbar-rxvt.C (file contents):
Revision 1.2 by pcg, Mon Nov 24 17:31:28 2003 UTC vs.
Revision 1.24 by root, Mon Jan 16 18:10:07 2006 UTC

…		…
1	/---------------------------------C----------------------------------	1	/---------------------------------C----------------------------------
2	* File: scrollbar-rxvt.c	2	* File: scrollbar-rxvt.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	* $Id: scrollbar-rxvt.C,v 1.2 2003/11/24 17:31:28 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) 1999-2001 Geoff Wing <gcw@pobox.com>	6	* Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com>
		7	* Copyright (c) 2004 Marc Lehmann <pcg@goof.com>
8	*	8	*
9	* This program is free software; you can redistribute it and/or modify	9	* This program is free software; you can redistribute it and/or modify
10	* it under the terms of the GNU General Public License as published by	10	* it under the terms of the GNU General Public License as published by
11	* the Free Software Foundation; either version 2 of the License, or	11	* the Free Software Foundation; either version 2 of the License, or
12	* (at your option) any later version.	12	* (at your option) any later version.
21	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	21	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22	----------------------------------------------------------------------/	22	----------------------------------------------------------------------/
23		23
24	#include "../config.h" /* NECESSARY */	24	#include "../config.h" /* NECESSARY */
25	#include "rxvt.h" /* NECESSARY */	25	#include "rxvt.h" /* NECESSARY */
26	#include "scrollbar-rxvt.intpro" /* PROTOS for internal routines */
27		26
28	/----------------------------------------------------------------------/	27	/----------------------------------------------------------------------/
29	#if defined(RXVT_SCROLLBAR)	28	#if defined(RXVT_SCROLLBAR)
30		29
31	/* draw triangular button with a shadow of SHADOW (1 or 2) pixels */	30	#define SHADOW_WIDTH 1
32	/* INTPROTO */	31
33	void	32	static void
34	rxvt_Draw_button(pR_ int x, int y, int state, int dirn)	33	draw_shadow (rxvt_term *term, int x, int y, int w, int h)
35	{	34	{
		35	int shadow;
		36
		37	shadow = (w == 0 \|\| h == 0) ? 1 : SHADOW_WIDTH;
		38	w += x - 1;
		39	h += y - 1;
		40
		41	for (; shadow-- > 0; x++, y++, w--, h--)
		42	{
		43	XDrawLine (term->display->display, term->scrollBar.win, term->topShadowGC, x, y, w, y);
		44	XDrawLine (term->display->display, term->scrollBar.win, term->topShadowGC, x, y, x, h);
		45	XDrawLine (term->display->display, term->scrollBar.win, term->botShadowGC, w, h, w, y + 1);
		46	XDrawLine (term->display->display, term->scrollBar.win, term->botShadowGC, w, h, x + 1, h);
		47	}
		48	}
		49
		50	/* draw triangular button with a shadow of 2 pixels */
		51	static void
		52	draw_button (rxvt_term *term, int x, int y, int state, int dirn)
		53	{
36	unsigned int sz, sz2;	54	unsigned int sz, sz2;
37	XPoint pt[3];	55	XPoint pt[3];
38	GC top, bot;	56	GC top, bot;
39		57
40	sz = R->scrollBar.width;	58	sz = term->scrollBar.width;
41	sz2 = sz / 2;	59	sz2 = sz / 2;
42	switch (state) {	60	switch (state)
		61	{
43	case +1:	62	case +1:
44	top = R->h->topShadowGC;	63	top = term->topShadowGC;
45	bot = R->h->botShadowGC;	64	bot = term->botShadowGC;
46	break;	65	break;
47	case -1:	66	case -1:
48	top = R->h->botShadowGC;	67	top = term->botShadowGC;
49	bot = R->h->topShadowGC;	68	bot = term->topShadowGC;
50	break;	69	break;
51	default:	70	default:
52	top = bot = R->h->scrollbarGC;	71	top = bot = term->scrollbarGC;
53	break;	72	break;
54	}	73	}
55		74
56	/* fill triangle */	75	/* fill triangle */
57	pt[0].x = x;	76	pt[0].x = x;
58	pt[1].x = x + sz - 1;	77	pt[1].x = x + sz - 1;
59	pt[2].x = x + sz2;	78	pt[2].x = x + sz2;
60	if (dirn == UP) {	79	if (dirn == UP)
		80	{
61	pt[0].y = pt[1].y = y + sz - 1;	81	pt[0].y = pt[1].y = y + sz - 1;
62	pt[2].y = y;	82	pt[2].y = y;
63	} else {	83	}
		84	else
		85	{
64	pt[0].y = pt[1].y = y;	86	pt[0].y = pt[1].y = y;
65	pt[2].y = y + sz - 1;	87	pt[2].y = y + sz - 1;
66	}	88	}
		89
67	XFillPolygon(R->Xdisplay, R->scrollBar.win, R->h->scrollbarGC,	90	XFillPolygon (term->display->display, term->scrollBar.win, term->scrollbarGC,
68	pt, 3, Convex, CoordModeOrigin);	91	pt, 3, Convex, CoordModeOrigin);
69		92
70	/* draw base */	93	/* draw base */
71	XDrawLine(R->Xdisplay, R->scrollBar.win, (dirn == UP ? bot : top),	94	XDrawLine (term->display->display, term->scrollBar.win, (dirn == UP ? bot : top),
72	pt[0].x, pt[0].y, pt[1].x, pt[1].y);	95	pt[0].x, pt[0].y, pt[1].x, pt[1].y);
73		96
74	/* draw shadow on left */	97	/* draw shadow on left */
75	pt[1].x = x + sz2 - 1;	98	pt[1].x = x + sz2 - 1;
76	pt[1].y = y + (dirn == UP ? 0 : sz - 1);	99	pt[1].y = y + (dirn == UP ? 0 : sz - 1);
77	XDrawLine(R->Xdisplay, R->scrollBar.win, top,	100	XDrawLine (term->display->display, term->scrollBar.win, top,
78	pt[0].x, pt[0].y, pt[1].x, pt[1].y);	101	pt[0].x, pt[0].y, pt[1].x, pt[1].y);
79		102
80	#if (SHADOW > 1)	103	#if SHADOW_WIDTH > 1
81	/* doubled */	104	/* doubled */
82	pt[0].x++;	105	pt[0].x++;
		106
83	if (dirn == UP) {	107	if (dirn == UP)
84	pt[0].y--;
85	pt[1].y++;
86	} else {
87	pt[0].y++;
88	pt[1].y--;
89	}	108	{
		109	pt[0].y--;
		110	pt[1].y++;
		111	}
		112	else
		113	{
		114	pt[0].y++;
		115	pt[1].y--;
		116	}
		117
90	XDrawLine(R->Xdisplay, R->scrollBar.win, top,	118	XDrawLine (term->display->display, term->scrollBar.win, top,
91	pt[0].x, pt[0].y, pt[1].x, pt[1].y);	119	pt[0].x, pt[0].y, pt[1].x, pt[1].y);
92	#endif	120	#endif
		121
93	/* draw shadow on right */	122	/* draw shadow on right */
94	pt[1].x = x + sz - 1;	123	pt[1].x = x + sz - 1;
95	/* pt[2].x = x + sz2; */	124	/* pt[2].x = x + sz2; */
96	pt[1].y = y + (dirn == UP ? sz - 1 : 0);	125	pt[1].y = y + (dirn == UP ? sz - 1 : 0);
97	pt[2].y = y + (dirn == UP ? 0 : sz - 1);	126	pt[2].y = y + (dirn == UP ? 0 : sz - 1);
98	XDrawLine(R->Xdisplay, R->scrollBar.win, bot,	127	XDrawLine (term->display->display, term->scrollBar.win, bot,
99	pt[2].x, pt[2].y, pt[1].x, pt[1].y);	128	pt[2].x, pt[2].y, pt[1].x, pt[1].y);
		129
100	#if (SHADOW > 1)	130	#if SHADOW_WIDTH > 1
101	/* doubled */	131	/* doubled */
102	pt[1].x--;	132	pt[1].x--;
103	if (dirn == UP) {	133	if (dirn == UP)
104	pt[2].y++;
105	pt[1].y--;
106	} else {
107	pt[2].y--;
108	pt[1].y++;
109	}	134	{
		135	pt[2].y++;
		136	pt[1].y--;
		137	}
		138	else
		139	{
		140	pt[2].y--;
		141	pt[1].y++;
		142	}
		143
110	XDrawLine(R->Xdisplay, R->scrollBar.win, bot,	144	XDrawLine (term->display->display, term->scrollBar.win, bot,
111	pt[2].x, pt[2].y, pt[1].x, pt[1].y);	145	pt[2].x, pt[2].y, pt[1].x, pt[1].y);
112	#endif	146	#endif
113	}	147	}
114		148
115	/* EXTPROTO */
116	int	149	int
117	rxvt_scrollbar_show_rxvt(pR_ int update __attribute__((unused)), int last_top, int last_bot, int scrollbar_len)	150	rxvt_term::scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len)
118	{	151	{
119	int sbshadow = R->sb_shadow;	152	int sbshadow = sb_shadow;
120	int sbwidth = (int)R->scrollBar.width;	153	int sbwidth = (int)scrollBar.width;
121		154
122	if ((R->scrollBar.init & R_SB_RXVT) == 0) {	155	if ((scrollBar.init & R_SB_RXVT) == 0)
123	XGCValues gcvalue;	156	{
124
125	R->scrollBar.init \|= R_SB_RXVT;	157	scrollBar.init \|= R_SB_RXVT;
126	gcvalue.foreground = R->PixColors[Color_trough];	158
127	if (sbshadow) {	159	if (sbshadow)
128	XSetWindowBackground(R->Xdisplay, R->scrollBar.win,	160	{
129	gcvalue.foreground);	161	XSetWindowBackground (display->display, scrollBar.win, pix_colors_focused[Color_trough]);
		162	XClearWindow (display->display, scrollBar.win);
		163	}
		164	}
		165	else
		166	{
		167	if (update)
		168	{
		169	if (last_top < scrollBar.top)
		170	XClearArea (display->display, scrollBar.win,
		171	sbshadow, last_top,
		172	sbwidth, (scrollBar.top - last_top),
		173	False);
		174
		175	if (scrollBar.bot < last_bot)
		176	XClearArea (display->display, scrollBar.win,
		177	sbshadow, scrollBar.bot,
		178	sbwidth, (last_bot - scrollBar.bot),
		179	False);
		180	}
		181	else
130	XClearWindow(R->Xdisplay, R->scrollBar.win);	182	XClearWindow (display->display, scrollBar.win);
131	}
132	} else {
133	/* instead of XClearWindow (R->Xdisplay, R->scrollBar.win); */
134	if (last_top < R->scrollBar.top)
135	XClearArea(R->Xdisplay, R->scrollBar.win,
136	sbshadow, last_top,
137	sbwidth, (R->scrollBar.top - last_top),
138	False);
139
140	if (R->scrollBar.bot < last_bot)
141	XClearArea(R->Xdisplay, R->scrollBar.win,
142	sbshadow, R->scrollBar.bot,
143	sbwidth, (last_bot - R->scrollBar.bot),
144	False);
145	}	183	}
146		184
147	/* scrollbar slider */	185	/* scrollbar slider */
148	#ifdef SB_BORDER	186	#ifdef SB_BORDER
149	{	187	{
150	int xofs;	188	int xofs;
151		189
152	if (R->Options & Opt_scrollBar_right)	190	if (OPTION (Opt_scrollBar_right))
153	xofs = 0;	191	xofs = 0;
154	else	192	else
155	xofs = sbshadow ? sbwidth : sbwidth - 1;	193	xofs = sbshadow ? sbwidth : sbwidth - 1;
156		194
157	XDrawLine(R->Xdisplay, R->scrollBar.win, R->h->botShadowGC,	195	XDrawLine (display->display, scrollBar.win, botShadowGC,
158	xofs, 0, xofs, R->scrollBar.end + sbwidth);	196	xofs, 0, xofs, scrollBar.end + sbwidth);
159	}	197	}
160	#endif	198	#endif
		199
161	XFillRectangle(R->Xdisplay, R->scrollBar.win, R->h->scrollbarGC,	200	XFillRectangle (display->display, scrollBar.win, scrollbarGC,
162	sbshadow, R->scrollBar.top, sbwidth,	201	sbshadow, scrollBar.top, sbwidth,
163	scrollbar_len);	202	scrollbar_len);
164		203
165	if (sbshadow)	204	if (sbshadow)
166	/* trough shadow */	205	/* trough shadow */
167	rxvt_Draw_Shadow(R->Xdisplay, R->scrollBar.win,	206	draw_shadow (this, 0, 0, sbwidth + 2 * sbshadow, scrollBar.end + (sbwidth + 1) + sbshadow);
168	R->h->botShadowGC, R->h->topShadowGC,	207
169	0, 0,
170	sbwidth + 2 * sbshadow, /* scrollbar_TotalWidth() */
171	R->scrollBar.end + (sbwidth + 1) + sbshadow);
172	/* shadow for scrollbar slider */	208	/* shadow for scrollbar slider */
173	rxvt_Draw_Shadow(R->Xdisplay, R->scrollBar.win,	209	draw_shadow (this, sbshadow, scrollBar.top, sbwidth, scrollbar_len);
174	R->h->topShadowGC, R->h->botShadowGC,
175	sbshadow, R->scrollBar.top, sbwidth,
176	scrollbar_len);
177		210
178	/*
179	* Redraw scrollbar arrows	211	/* Redraw scrollbar arrows */
180	*/	212	draw_button (this, sbshadow, sbshadow, (scrollbar_isUp () ? -1 : +1), UP);
181	rxvt_Draw_button(aR_ sbshadow, sbshadow,	213	draw_button (this, sbshadow, scrollBar.end + 1, (scrollbar_isDn () ? -1 : +1), DN);
182	(scrollbar_isUp() ? -1 : +1), UP);	214
183	rxvt_Draw_button(aR_ sbshadow, (R->scrollBar.end + 1),
184	(scrollbar_isDn() ? -1 : +1), DN);
185	return 1;	215	return 1;
186	}	216	}
187	#endif /* RXVT_SCROLLBAR */	217	#endif /* RXVT_SCROLLBAR */
188	/----------------------- end-of-file (C source) -----------------------/	218	/----------------------- end-of-file (C source) -----------------------/
		219

Diff Legend

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

Comparing rxvt-unicode/src/scrollbar-rxvt.C (file contents): Revision 1.2 by pcg, Mon Nov 24 17:31:28 2003 UTC vs. Revision 1.24 by root, Mon Jan 16 18:10:07 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/scrollbar-rxvt.C (file contents):
Revision 1.2 by pcg, Mon Nov 24 17:31:28 2003 UTC vs.
Revision 1.24 by root, Mon Jan 16 18:10:07 2006 UTC