[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.36 by ayin, Tue Feb 19 10:46:03 2008 UTC

…		…
1	/---------------------------------C----------------------------------	1	/----------------------------------------------------------------------
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-2006 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	static void
32	/* INTPROTO */	31	draw_shadow (rxvt_term *term, int x, int y, int w, int h)
33	void
34	rxvt_Draw_button(pR_ int x, int y, int state, int dirn)
35	{	32	{
		33	int shadow;
		34
		35	shadow = (w == 0 \|\| h == 0) ? 1 : SHADOW_WIDTH;
		36	w += x - 1;
		37	h += y - 1;
		38
		39	for (; shadow-- > 0; x++, y++, w--, h--)
		40	{
		41	XDrawLine (term->dpy, term->scrollBar.win, term->topShadowGC, x, y, w , y );
		42	XDrawLine (term->dpy, term->scrollBar.win, term->topShadowGC, x, y, x , h );
		43	XDrawLine (term->dpy, term->scrollBar.win, term->botShadowGC, w, h, w , y + 1);
		44	XDrawLine (term->dpy, term->scrollBar.win, term->botShadowGC, w, h, x + 1, h );
		45	}
		46	}
		47
		48	/* draw triangular button with a shadow of 2 pixels */
		49	static void
		50	draw_button (rxvt_term *term, int x, int y, int dirn)
		51	{
36	unsigned int sz, sz2;	52	unsigned int sz, sz2;
37	XPoint pt[3];	53	XPoint pt[3];
38	GC top, bot;	54	GC top, bot;
39		55
40	sz = R->scrollBar.width;	56	sz = term->scrollBar.width;
41	sz2 = sz / 2;	57	sz2 = sz / 2;
42	switch (state) {	58
43	case +1:	59	if ((dirn == UP && term->scrollBar.state == STATE_UP)
44	top = R->h->topShadowGC;	60	\|\| (dirn == DN && term->scrollBar.state == STATE_DOWN))
45	bot = R->h->botShadowGC;
46	break;
47	case -1:
48	top = R->h->botShadowGC;
49	bot = R->h->topShadowGC;
50	break;
51	default:
52	top = bot = R->h->scrollbarGC;
53	break;
54	}	61	{
		62	top = term->botShadowGC;
		63	bot = term->topShadowGC;
		64	}
		65	else
		66	{
		67	top = term->topShadowGC;
		68	bot = term->botShadowGC;
		69	}
55		70
56	/* fill triangle */	71	/* fill triangle */
57	pt[0].x = x;	72	pt[0].x = x;
58	pt[1].x = x + sz - 1;	73	pt[1].x = x + sz - 1;
59	pt[2].x = x + sz2;	74	pt[2].x = x + sz2;
		75
60	if (dirn == UP) {	76	if (dirn == UP)
		77	{
61	pt[0].y = pt[1].y = y + sz - 1;	78	pt[0].y = pt[1].y = y + sz - 1;
62	pt[2].y = y;	79	pt[2].y = y;
63	} else {	80	}
		81	else
		82	{
64	pt[0].y = pt[1].y = y;	83	pt[0].y = pt[1].y = y;
65	pt[2].y = y + sz - 1;	84	pt[2].y = y + sz - 1;
66	}	85	}
		86
67	XFillPolygon(R->Xdisplay, R->scrollBar.win, R->h->scrollbarGC,	87	XFillPolygon (term->dpy, term->scrollBar.win, term->scrollbarGC,
68	pt, 3, Convex, CoordModeOrigin);	88	pt, 3, Convex, CoordModeOrigin);
69		89
70	/* draw base */	90	/* draw base */
71	XDrawLine(R->Xdisplay, R->scrollBar.win, (dirn == UP ? bot : top),	91	XDrawLine (term->dpy, term->scrollBar.win, (dirn == UP ? bot : top),
72	pt[0].x, pt[0].y, pt[1].x, pt[1].y);	92	pt[0].x, pt[0].y, pt[1].x, pt[1].y);
73		93
74	/* draw shadow on left */	94	/* draw shadow on left */
75	pt[1].x = x + sz2 - 1;	95	pt[1].x = x + sz2 - 1;
76	pt[1].y = y + (dirn == UP ? 0 : sz - 1);	96	pt[1].y = y + (dirn == UP ? 0 : sz - 1);
77	XDrawLine(R->Xdisplay, R->scrollBar.win, top,	97	XDrawLine (term->dpy, term->scrollBar.win, top,
78	pt[0].x, pt[0].y, pt[1].x, pt[1].y);	98	pt[0].x, pt[0].y, pt[1].x, pt[1].y);
79		99
80	#if (SHADOW > 1)	100	#if SHADOW_WIDTH > 1
81	/* doubled */	101	/* doubled */
82	pt[0].x++;	102	pt[0].x++;
		103
83	if (dirn == UP) {	104	if (dirn == UP)
84	pt[0].y--;
85	pt[1].y++;
86	} else {
87	pt[0].y++;
88	pt[1].y--;
89	}	105	{
		106	pt[0].y--;
		107	pt[1].y++;
		108	}
		109	else
		110	{
		111	pt[0].y++;
		112	pt[1].y--;
		113	}
		114
90	XDrawLine(R->Xdisplay, R->scrollBar.win, top,	115	XDrawLine (term->dpy, term->scrollBar.win, top,
91	pt[0].x, pt[0].y, pt[1].x, pt[1].y);	116	pt[0].x, pt[0].y, pt[1].x, pt[1].y);
92	#endif	117	#endif
		118
93	/* draw shadow on right */	119	/* draw shadow on right */
94	pt[1].x = x + sz - 1;	120	pt[1].x = x + sz - 1;
95	/* pt[2].x = x + sz2; */	121	/* pt[2].x = x + sz2; */
96	pt[1].y = y + (dirn == UP ? sz - 1 : 0);	122	pt[1].y = y + (dirn == UP ? sz - 1 : 0);
97	pt[2].y = y + (dirn == UP ? 0 : sz - 1);	123	pt[2].y = y + (dirn == UP ? 0 : sz - 1);
98	XDrawLine(R->Xdisplay, R->scrollBar.win, bot,	124	XDrawLine (term->dpy, term->scrollBar.win, bot,
99	pt[2].x, pt[2].y, pt[1].x, pt[1].y);	125	pt[2].x, pt[2].y, pt[1].x, pt[1].y);
		126
100	#if (SHADOW > 1)	127	#if SHADOW_WIDTH > 1
101	/* doubled */	128	/* doubled */
102	pt[1].x--;	129	pt[1].x--;
103	if (dirn == UP) {	130	if (dirn == UP)
104	pt[2].y++;
105	pt[1].y--;
106	} else {
107	pt[2].y--;
108	pt[1].y++;
109	}	131	{
		132	pt[2].y++;
		133	pt[1].y--;
		134	}
		135	else
		136	{
		137	pt[2].y--;
		138	pt[1].y++;
		139	}
		140
110	XDrawLine(R->Xdisplay, R->scrollBar.win, bot,	141	XDrawLine (term->dpy, term->scrollBar.win, bot,
111	pt[2].x, pt[2].y, pt[1].x, pt[1].y);	142	pt[2].x, pt[2].y, pt[1].x, pt[1].y);
112	#endif	143	#endif
113	}	144	}
114		145
115	/* EXTPROTO */
116	int	146	int
117	rxvt_scrollbar_show_rxvt(pR_ int update __attribute__((unused)), int last_top, int last_bot, int scrollbar_len)	147	rxvt_term::scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len)
118	{	148	{
119	int sbshadow = R->sb_shadow;	149	int sbshadow = scrollBar.shadow;
120	int sbwidth = (int)R->scrollBar.width;	150	int sbwidth = (int)scrollBar.width;
121		151
122	if ((R->scrollBar.init & R_SB_RXVT) == 0) {	152	if ((scrollBar.init & R_SB_RXVT) == 0)
123	XGCValues gcvalue;	153	{
		154	XGCValues gcvalue;
124		155
125	R->scrollBar.init \|= R_SB_RXVT;	156	scrollBar.init \|= R_SB_RXVT;
		157
126	gcvalue.foreground = R->PixColors[Color_trough];	158	gcvalue.foreground = pix_colors[Color_topShadow];
127	if (sbshadow) {	159	topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
128	XSetWindowBackground(R->Xdisplay, R->scrollBar.win,	160	gcvalue.foreground = pix_colors[Color_bottomShadow];
129	gcvalue.foreground);	161	botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
		162	gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
		163	scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
		164	if (sbshadow)
		165	{
		166	XSetWindowBackground (dpy, scrollBar.win, pix_colors_focused[Color_trough]);
130	XClearWindow(R->Xdisplay, R->scrollBar.win);	167	XClearWindow (dpy, scrollBar.win);
131	}	168	}
		169	}
		170	else
		171	{
		172	if (update)
		173	{
		174	if (last_top < scrollBar.top)
		175	XClearArea (dpy, scrollBar.win,
		176	sbshadow, last_top,
		177	sbwidth, (scrollBar.top - last_top),
		178	False);
		179
		180	if (scrollBar.bot < last_bot)
		181	XClearArea (dpy, scrollBar.win,
		182	sbshadow, scrollBar.bot,
		183	sbwidth, (last_bot - scrollBar.bot),
		184	False);
		185	}
132	} else {	186	else
133	/* instead of XClearWindow (R->Xdisplay, R->scrollBar.win); */	187	XClearWindow (dpy, 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	}	188	}
146		189
147	/* scrollbar slider */	190	/* scrollbar slider */
148	#ifdef SB_BORDER	191	#ifdef SB_BORDER
149	{	192	{
150	int xofs;	193	int xofs;
151		194
152	if (R->Options & Opt_scrollBar_right)	195	if (option (Opt_scrollBar_right))
153	xofs = 0;	196	xofs = 0;
154	else	197	else
155	xofs = sbshadow ? sbwidth : sbwidth - 1;	198	xofs = sbshadow ? sbwidth : sbwidth - 1;
156		199
157	XDrawLine(R->Xdisplay, R->scrollBar.win, R->h->botShadowGC,	200	XDrawLine (dpy, scrollBar.win, botShadowGC,
158	xofs, 0, xofs, R->scrollBar.end + sbwidth);	201	xofs, 0, xofs, scrollBar.end + sbwidth);
159	}	202	}
160	#endif	203	#endif
		204
161	XFillRectangle(R->Xdisplay, R->scrollBar.win, R->h->scrollbarGC,	205	XFillRectangle (dpy, scrollBar.win, scrollbarGC,
162	sbshadow, R->scrollBar.top, sbwidth,	206	sbshadow, scrollBar.top, sbwidth,
163	scrollbar_len);	207	scrollbar_len);
164		208
165	if (sbshadow)	209	if (sbshadow)
166	/* trough shadow */	210	/* trough shadow */
167	rxvt_Draw_Shadow(R->Xdisplay, R->scrollBar.win,	211	draw_shadow (this, 0, 0, sbwidth + 2 * sbshadow, scrollBar.end + (sbwidth + 1) + sbshadow);
168	R->h->botShadowGC, R->h->topShadowGC,	212
169	0, 0,
170	sbwidth + 2 * sbshadow, /* scrollbar_TotalWidth() */
171	R->scrollBar.end + (sbwidth + 1) + sbshadow);
172	/* shadow for scrollbar slider */	213	/* shadow for scrollbar slider */
173	rxvt_Draw_Shadow(R->Xdisplay, R->scrollBar.win,	214	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		215
178	/*
179	* Redraw scrollbar arrows	216	/* Redraw scrollbar arrows */
180	*/	217	draw_button (this, sbshadow, sbshadow, UP);
181	rxvt_Draw_button(aR_ sbshadow, sbshadow,
182	(scrollbar_isUp() ? -1 : +1), UP);
183	rxvt_Draw_button(aR_ sbshadow, (R->scrollBar.end + 1),	218	draw_button (this, sbshadow, scrollBar.end + 1, DN);
184	(scrollbar_isDn() ? -1 : +1), DN);	219
185	return 1;	220	return 1;
186	}	221	}
187	#endif /* RXVT_SCROLLBAR */	222	#endif /* RXVT_SCROLLBAR */
188	/----------------------- end-of-file (C source) -----------------------/	223	/----------------------- end-of-file (C source) -----------------------/
		224

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.36 by ayin, Tue Feb 19 10:46:03 2008 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.36 by ayin, Tue Feb 19 10:46:03 2008 UTC