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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.32 by root, Thu Jun 7 07:53:12 2012 UTC vs.
Revision 1.90 by root, Thu Jun 14 19:44:45 2012 UTC

…		…
2	#include "../config.h"	2	#include "../config.h"
3	#include "rxvt.h"	3	#include "rxvt.h"
4		4
5	#if HAVE_IMG	5	#if HAVE_IMG
6		6
		7	#if 0
		8	struct pict
		9	{
		10	Display *dpy;
		11	Picture pic;
		12
		13	operator Picture () const
		14	{
		15	return pic;
		16	}
		17
		18	pict ()
		19	: pic (0)
		20	{
		21	}
		22
		23	pict (rxvt_img img, XRenderPictFormat format = 0)
		24	: dpy (img->s->display->dpy)
		25	{
		26	XRenderPictureAttributes pa;
		27	pa.repeat = img->repeat;
		28	pic = XRenderCreatePicture (dpy, img->pm, format ? format : img->format, CPRepeat, &pa);
		29	}
		30
		31	~pict ()
		32	{
		33	if (pic)
		34	XRenderFreePicture (dpy, pic);
		35	}
		36	};
		37	#endif
		38
		39	static XRenderPictFormat *
		40	find_alpha_format_for (Display dpy, XRenderPictFormat format)
		41	{
		42	if (format->direct.alphaMask)
		43	return format; // already has alpha
		44
		45	// try to find a suitable alpha format, one bit alpha is enough for our purposes
		46	if (format->type == PictTypeDirect)
		47	for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
		48	if (f->direct.alphaMask
		49	&& f->type == PictTypeDirect
		50	&& ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
		51	&& ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
		52	&& ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
		53	return f;
		54
		55	// should be a very good fallback
		56	return XRenderFindStandardFormat (dpy, PictStandardARGB32);
		57	}
		58
7	rxvt_img::rxvt_img (rxvt_screen screen, XRenderPictFormat format, int width, int height)	59	rxvt_img::rxvt_img (rxvt_screen screen, XRenderPictFormat format, int x, int y, int width, int height, int repeat)
8	: s(screen), x(0), y(0), w(width), h(height), format(format), repeat(RepeatNormal),	60	: s(screen), x(x), y(y), w(width), h(height), format(format), repeat(repeat),
9	pm(0), refcnt(0)	61	pm(0), ref(0)
10	{	62	{
11	}	63	}
12		64
13	rxvt_img::rxvt_img (const rxvt_img &img)	65	rxvt_img::rxvt_img (const rxvt_img &img)
14	: s(img.s), x(img.x), y(img.y), w(img.w), h(img.h), format(img.format), repeat(img.repeat), pm(img.pm), refcnt(img.refcnt)	66	: s(img.s), x(img.x), y(img.y), w(img.w), h(img.h), format(img.format), repeat(img.repeat), pm(img.pm), ref(img.ref)
15	{	67	{
16	if (refcnt)
17	++*refcnt;	68	++ref->cnt;
18	}	69	}
19
20	#if 0
21	rxvt_img::rxvt_img (rxvt_screen screen, XRenderPictFormat format, int width, int height, Pixmap pixmap)
22	: s(screen), x(0), y(0), w(width), h(height), format(format), repeat(RepeatNormal), shared(false), pm(pixmap)
23	{
24	}
25	#endif
26		70
27	rxvt_img *	71	rxvt_img *
28	rxvt_img::new_from_root (rxvt_screen *s)	72	rxvt_img::new_from_root (rxvt_screen *s)
29	{	73	{
30	Display *dpy = s->display->dpy;	74	Display *dpy = s->display->dpy;
…		…
44	return 0;	88	return 0;
45		89
46	rxvt_img *img = new rxvt_img (	90	rxvt_img *img = new rxvt_img (
47	s,	91	s,
48	XRenderFindVisualFormat (dpy, DefaultVisual (dpy, s->display->screen)),	92	XRenderFindVisualFormat (dpy, DefaultVisual (dpy, s->display->screen)),
		93	0,
		94	0,
49	root_pm_w,	95	root_pm_w,
50	root_pm_h	96	root_pm_h
51	);	97	);
52		98
53	img->pm = root_pixmap;	99	img->pm = root_pixmap;
		100	img->ref = new pixref (root_pm_w, root_pm_h);
		101	img->ref->ours = false;
		102
		103	return img;
		104	}
		105
		106	# if HAVE_PIXBUF
		107
		108	rxvt_img *
		109	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)
		110	{
		111	Display *dpy = s->display->dpy;
		112
		113	int width = gdk_pixbuf_get_width (pb);
		114	int height = gdk_pixbuf_get_height (pb);
		115
		116	if (width > 32767 \|\| height > 32767) // well, we could upload in chunks
		117	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n");
		118
		119	// since we require rgb24/argb32 formats from xrender we assume
		120	// that both 24 and 32 bpp MUST be supported by any screen that supports xrender
		121
		122	int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
		123
		124	XImage xi;
		125
		126	xi.width = width;
		127	xi.height = height;
		128	xi.xoffset = 0;
		129	xi.format = ZPixmap;
		130	xi.byte_order = ImageByteOrder (dpy);
		131	xi.bitmap_unit = 0; //XY only, unused
		132	xi.bitmap_bit_order = 0; //XY only, unused
		133	xi.bitmap_pad = BitmapPad (dpy);
		134	xi.depth = 32;
		135	xi.bytes_per_line = 0;
		136	xi.bits_per_pixel = 32; //Z only
		137	xi.red_mask = 0x00000000; //Z only, unused
		138	xi.green_mask = 0x00000000; //Z only, unused
		139	xi.blue_mask = 0x00000000; //Z only, unused
		140	xi.obdata = 0; // probably unused
		141
		142	bool byte_order_mismatch = byte_order != xi.byte_order;
		143
		144	if (!XInitImage (&xi))
		145	rxvt_fatal ("unable to initialise ximage, please report.\n");
		146
		147	if (height > INT_MAX / xi.bytes_per_line)
		148	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");
		149
		150	xi.data = (char )rxvt_malloc (height xi.bytes_per_line);
		151
		152	int rowstride = gdk_pixbuf_get_rowstride (pb);
		153	bool pb_has_alpha = gdk_pixbuf_get_has_alpha (pb);
		154	unsigned char *row = gdk_pixbuf_get_pixels (pb);
		155
		156	char *line = xi.data;
		157
		158	for (int y = 0; y < height; y++)
		159	{
		160	unsigned char *src = row;
		161	uint32_t dst = (uint32_t )line;
		162
		163	if (!pb_has_alpha)
		164	for (int x = 0; x < width; x++)
		165	{
		166	uint8_t r = *src++;
		167	uint8_t g = *src++;
		168	uint8_t b = *src++;
		169
		170	uint32_t v = (255 << 24) \| (r << 16) \| (g << 8) \| b;
		171
		172	if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
		173	v = ecb_bswap32 (v);
		174
		175	*dst++ = v;
		176	}
		177	else
		178	for (int x = 0; x < width; x++)
		179	{
		180	uint32_t v = (uint32_t )src; src += 4;
		181
		182	if (ecb_big_endian ())
		183	v = ecb_bswap32 (v);
		184
		185	v = ecb_rotl32 (v, 8); // abgr to bgra
		186
		187	if (!byte_order_mismatch)
		188	v = ecb_bswap32 (v);
		189
		190	*dst++ = v;
		191	}
		192
		193	row += rowstride;
		194	line += xi.bytes_per_line;
		195	}
		196
		197	rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, PictStandardARGB32), 0, 0, width, height);
		198	img->alloc ();
		199
		200	GC gc = XCreateGC (dpy, img->pm, 0, 0);
		201	XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);
		202	XFreeGC (dpy, gc);
		203
		204	free (xi.data);
54		205
55	return img;	206	return img;
56	}	207	}
57		208
58	rxvt_img *	209	rxvt_img *
…		…
62	GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);	213	GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);
63		214
64	if (!pb)	215	if (!pb)
65	rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);	216	rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);
66		217
67	rxvt_img *img = new rxvt_img (	218	rxvt_img *img = new_from_pixbuf (s, pb);
68	s,
69	XRenderFindStandardFormat (s->display->dpy, gdk_pixbuf_get_has_alpha (pb) ? PictStandardARGB32 : PictStandardRGB24),
70	gdk_pixbuf_get_width (pb),
71	gdk_pixbuf_get_height (pb)
72	);
73	img->alloc ();
74	img->render_pixbuf (pb, 0, 0, img->w, img->h, 0, 0);
75		219
76	g_object_unref (pb);	220	g_object_unref (pb);
77		221
78	return img;	222	return img;
79	}	223	}
		224
		225	# endif
80		226
81	void	227	void
82	rxvt_img::destroy ()	228	rxvt_img::destroy ()
83	{	229	{
84	if (!refcnt \|\| --*refcnt)	230	if (--ref->cnt)
85	return;	231	return;
86		232
87	if (pm)	233	if (pm && ref->ours)
88	XFreePixmap (s->display->dpy, pm);	234	XFreePixmap (s->display->dpy, pm);
89		235
90	delete refcnt;	236	delete ref;
91	}	237	}
92		238
93	rxvt_img::~rxvt_img ()	239	rxvt_img::~rxvt_img ()
94	{	240	{
95	destroy ();	241	destroy ();
…		…
97		243
98	void	244	void
99	rxvt_img::alloc ()	245	rxvt_img::alloc ()
100	{	246	{
101	pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);	247	pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);
102	refcnt = new int (1);	248	ref = new pixref (w, h);
		249	}
		250
		251	Picture
		252	rxvt_img::picture ()
		253	{
		254	Display *dpy = s->display->dpy;
		255
		256	XRenderPictureAttributes pa;
		257	pa.repeat = repeat;
		258	Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
		259
		260	return pic;
103	}	261	}
104		262
105	void	263	void
106	rxvt_img::unshare ()	264	rxvt_img::unshare ()
107	{	265	{
108	if (refcnt && *refcnt == 1)	266	if (ref->cnt == 1 && ref->ours)
109	return;	267	return;
110		268
111	Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);	269	Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);
112	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);	270	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
113	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, w, h, 0, 0);	271	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
114	XFreeGC (s->display->dpy, gc);	272	XFreeGC (s->display->dpy, gc);
115		273
116	destroy ();	274	destroy ();
117		275
118	pm = pm2;	276	pm = pm2;
119	refcnt = new int (1);	277	ref = new pixref (ref->w, ref->h);
120	}	278	}
121		279
122	void	280	void
123	rxvt_img::fill (const rxvt_color &c)	281	rxvt_img::fill (const rgba &c)
124	{	282	{
125	XGCValues gcv;	283	XRenderColor rc = { c.r, c.g, c.b, c.a };
126	gcv.foreground = c;	284
127	GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv);	285	Display *dpy = s->display->dpy;
128	XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h);	286	Picture src = picture ();
129	XFreeGC (s->display->dpy, gc);	287	XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h);
		288	XRenderFreePicture (dpy, src);
		289	}
		290
		291	void
		292	rxvt_img::add_alpha ()
		293	{
		294	if (format->direct.alphaMask)
		295	return;
		296
		297	Display *dpy = s->display->dpy;
		298
		299	rxvt_img *img = new rxvt_img (s, find_alpha_format_for (dpy, format), x, y, w, h, repeat);
		300	img->alloc ();
		301
		302	Picture src = picture ();
		303	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
		304
		305	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		306
		307	XRenderFreePicture (dpy, src);
		308	XRenderFreePicture (dpy, dst);
		309
		310	::swap (img->ref, ref);
		311	::swap (img->pm , pm );
		312
		313	delete img;
130	}	314	}
131		315
132	static void	316	static void
133	get_gaussian_kernel (int radius, int width, double kernel, XFixed params)	317	get_gaussian_kernel (int radius, int width, rxvt_img::nv kernel, XFixed params)
134	{	318	{
135	double sigma = radius / 2.0;	319	rxvt_img::nv sigma = radius / 2.0;
136	double scale = sqrt (2.0 * M_PI) * sigma;	320	rxvt_img::nv scale = sqrt (2.0 * M_PI) * sigma;
137	double sum = 0.0;	321	rxvt_img::nv sum = 0.0;
138		322
139	for (int i = 0; i < width; i++)	323	for (int i = 0; i < width; i++)
140	{	324	{
141	double x = i - width / 2;	325	rxvt_img::nv x = i - width / 2;
142	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;	326	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
143	sum += kernel[i];	327	sum += kernel[i];
144	}	328	}
145		329
146	params[0] = XDoubleToFixed (width);	330	params[0] = XDoubleToFixed (width);
…		…
156	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))	340	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
157	return clone ();	341	return clone ();
158		342
159	Display *dpy = s->display->dpy;	343	Display *dpy = s->display->dpy;
160	int size = max (rh, rv) * 2 + 1;	344	int size = max (rh, rv) * 2 + 1;
161	double kernel = (double )malloc (size * sizeof (double));	345	nv kernel = (nv )malloc (size * sizeof (nv));
162	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	346	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
163	rxvt_img *img = new rxvt_img (s, format, w, h);	347	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
164	img->alloc ();	348	img->alloc ();
165		349
166	XRenderPictureAttributes pa;	350	XRenderPictureAttributes pa;
167
168	pa.repeat = RepeatPad;	351	pa.repeat = RepeatPad;
169	Picture src = XRenderCreatePicture (dpy, pm , format, CPRepeat, &pa);	352	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
170	Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa);	353	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
171		354
172	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);	355	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
173	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);	356	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
174	XFreePixmap (dpy, tmp_pm);	357	XFreePixmap (dpy, tmp_pm);
175		358
…		…
191		374
192	size = rv * 2 + 1;	375	size = rv * 2 + 1;
193	get_gaussian_kernel (rv, size, kernel, params);	376	get_gaussian_kernel (rv, size, kernel, params);
194	::swap (params[0], params[1]);	377	::swap (params[0], params[1]);
195		378
196	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);	379	XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
197	XRenderComposite (dpy,	380	XRenderComposite (dpy,
198	PictOpSrc,	381	PictOpSrc,
199	tmp,	382	tmp,
200	None,	383	None,
201	dst,	384	dst,
…		…
205	w, h);	388	w, h);
206	}	389	}
207		390
208	free (kernel);	391	free (kernel);
209	free (params);	392	free (params);
		393
210	XRenderFreePicture (dpy, src);	394	XRenderFreePicture (dpy, src);
211	XRenderFreePicture (dpy, dst);	395	XRenderFreePicture (dpy, dst);
212	XRenderFreePicture (dpy, tmp);	396	XRenderFreePicture (dpy, tmp);
213		397
214	return img;	398	return img;
215	}	399	}
216		400
217	static Picture	401	static Picture
218	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb)	402	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
219	{	403	{
220	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);	404	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
221		405
222	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);	406	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
223	XRenderPictureAttributes pa;	407	XRenderPictureAttributes pa;
224	pa.repeat = True;	408	pa.repeat = RepeatNormal;
		409	pa.component_alpha = component_alpha;
225	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);	410	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat \| CPComponentAlpha, &pa);
226		411
227	XFreePixmap (dpy, pixmap);	412	XFreePixmap (dpy, pixmap);
228		413
229	return mask;	414	return mask;
230	}	415	}
231		416
		417	static void
		418	extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
		419	{
		420	int32_t x = clamp (c, cl0, cl1);
		421	c -= x;
		422	xc = x;
		423	}
		424
		425	static bool
		426	extract (int32_t cl0, int32_t cl1, int32_t &r, int32_t &g, int32_t &b, int32_t &a, unsigned short &xr, unsigned short &xg, unsigned short &xb, unsigned short &xa)
		427	{
		428	extract (cl0, cl1, r, xr);
		429	extract (cl0, cl1, g, xg);
		430	extract (cl0, cl1, b, xb);
		431	extract (cl0, cl1, a, xa);
		432
		433	return xr \| xg \| xb \| xa;
		434	}
		435
232	void	436	void
233	rxvt_img::brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a)	437	rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
234	{	438	{
		439	unshare ();
		440
235	Display *dpy = s->display->dpy;	441	Display *dpy = s->display->dpy;
236	Picture src = create_xrender_mask (dpy, pm, True);
237	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	442	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
238		443
		444	// loop should not be needed for brightness, as only -1..1 makes sense
		445	//while (r \| g \| b \| a)
		446	{
		447	unsigned short xr, xg, xb, xa;
239	XRenderColor mask_c;	448	XRenderColor mask_c;
240	mask_c.red = r;	449
241	mask_c.green = g;	450	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
242	mask_c.blue = b;
243	mask_c.alpha = a;
244	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	451	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
245		452
246	XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	453	if (extract (-65535, 0, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
		454	{
		455	XRenderColor mask_w = { 65535, 65535, 65535, 65535 };
		456	XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
		457	mask_c.red = -mask_c.red; //TODO: verify that doing clamp, assign, and negation does the right thing
		458	mask_c.green = -mask_c.green;
		459	mask_c.blue = -mask_c.blue;
		460	mask_c.alpha = -mask_c.alpha;
		461	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
		462	XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
		463	}
		464	}
247		465
248	XRenderFreePicture (dpy, src);
249	XRenderFreePicture (dpy, dst);	466	XRenderFreePicture (dpy, dst);
250	}	467	}
251		468
252	void	469	void
253	rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a)	470	rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
254	{	471	{
255	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))	472	if (r < 0 \|\| g < 0 \|\| b < 0 \|\| a < 0)
256	return;	473	rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
257		474
		475	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
		476	img->alloc ();
		477	img->fill (rgba (0, 0, 0, 0));
		478
		479	// premultiply (yeah, these are not exact, sue me or fix it)
		480	r = (r * (a >> 8)) >> 8;
		481	g = (g * (a >> 8)) >> 8;
		482	b = (b * (a >> 8)) >> 8;
		483
258	Display *dpy = s->display->dpy;	484	Display *dpy = s->display->dpy;
259	Picture src = create_xrender_mask (dpy, pm, True);	485
		486	Picture src = picture ();
260	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	487	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
		488	Picture mul = create_xrender_mask (dpy, pm, True, True);
261		489
		490	//TODO: this operator does not yet implement some useful contrast
		491	while (r \| g \| b \| a)
		492	{
		493	unsigned short xr, xg, xb, xa;
262	XRenderColor mask_c;	494	XRenderColor mask_c;
263	mask_c.red = r;
264	mask_c.green = g;
265	mask_c.blue = b;
266	mask_c.alpha = a;
267	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
268		495
269	XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	496	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
270
271	XRenderFreePicture (dpy, src);
272	XRenderFreePicture (dpy, dst);
273	}
274
275	bool
276	rxvt_img::render_pixbuf (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y)
277	{
278	Display *dpy = s->display->dpy;
279
280	if (s->visual->c_class != TrueColor)
281	return false;
282
283	uint32_t red_mask, green_mask, blue_mask, alpha_mask;
284
285	red_mask = (uint32_t)format->direct.redMask << format->direct.red;
286	green_mask = (uint32_t)format->direct.greenMask << format->direct.green;
287	blue_mask = (uint32_t)format->direct.blueMask << format->direct.blue;
288	alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha;
289
290	int width_r = ecb_popcount32 (red_mask);
291	int width_g = ecb_popcount32 (green_mask);
292	int width_b = ecb_popcount32 (blue_mask);
293	int width_a = ecb_popcount32 (alpha_mask);
294
295	if (width_r > 8 \|\| width_g > 8 \|\| width_b > 8 \|\| width_a > 8)
296	return false;
297
298	int sh_r = ecb_ctz32 (red_mask);
299	int sh_g = ecb_ctz32 (green_mask);
300	int sh_b = ecb_ctz32 (blue_mask);
301	int sh_a = ecb_ctz32 (alpha_mask);
302
303	if (width > 32767 \|\| height > 32767)
304	return false;
305
306	XImage *ximage = XCreateImage (dpy, s->visual, format->depth, ZPixmap, 0, 0,
307	width, height, 32, 0);
308	if (!ximage)
309	return false;
310
311	if (height > INT_MAX / ximage->bytes_per_line
312	\|\| !(ximage->data = (char )malloc (height ximage->bytes_per_line)))
313	{
314	XDestroyImage (ximage);
315	return false;
316	}
317
318	GC gc = XCreateGC (dpy, pm, 0, 0);
319
320	ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
321
322	int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
323	int channels = gdk_pixbuf_get_n_channels (pixbuf);
324	unsigned char row = gdk_pixbuf_get_pixels (pixbuf) + src_y rowstride + src_x * channels;
325	char *line = ximage->data;
326
327	for (int y = 0; y < height; y++)
328	{
329	for (int x = 0; x < width; x++)
330	{	497	{
331	unsigned char pixel = row + x channels;	498	XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1);
332	uint32_t value;	499	XRenderComposite (dpy, PictOpAdd, src, mul, dst, 0, 0, 0, 0, 0, 0, w, h);
333	unsigned char r, g, b, a;
334
335	if (channels == 4)
336	{
337	a = pixel[3];
338	r = pixel[0] * a / 0xff;
339	g = pixel[1] * a / 0xff;
340	b = pixel[2] * a / 0xff;
341	}
342	else
343	{
344	a = 0xff;
345	r = pixel[0];
346	g = pixel[1];
347	b = pixel[2];
348	}
349
350	value = ((r >> (8 - width_r)) << sh_r)
351	\| ((g >> (8 - width_g)) << sh_g)
352	\| ((b >> (8 - width_b)) << sh_b)
353	\| ((a >> (8 - width_a)) << sh_a);
354
355	if (ximage->bits_per_pixel == 32)
356	((uint32_t *)line)[x] = value;
357	else
358	XPutPixel (ximage, x, y, value);
359	}	500	}
		501	}
360		502
361	row += rowstride;	503	XRenderFreePicture (dpy, mul);
362	line += ximage->bytes_per_line;	504	XRenderFreePicture (dpy, dst);
		505	XRenderFreePicture (dpy, src);
		506
		507	::swap (img->ref, ref);
		508	::swap (img->pm , pm );
		509
		510	delete img;
		511	}
		512
		513	void
		514	rxvt_img::draw (rxvt_img *img, int op, nv mask)
		515	{
		516	unshare ();
		517
		518	Display *dpy = s->display->dpy;
		519	Picture src = img->picture ();
		520	Picture dst = picture ();
		521	Picture mask_p = 0;
		522
		523	if (mask != 1.)
363	}	524	{
		525	mask_p = create_xrender_mask (dpy, img->pm, False, False);
		526	XRenderColor mask_c = { 0, 0, 0, float_to_component (mask) };
		527	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
		528	}
364		529
365	XPutImage (dpy, pm, gc, ximage, 0, 0, dst_x, dst_y, width, height);	530	XRenderComposite (dpy, op, src, mask_p, dst, x - img->x, y - img->y, 0, 0, 0, 0, w, h);
366	XDestroyImage (ximage);
367	XFreeGC (dpy, gc);
368		531
369	return true;	532	XRenderFreePicture (dpy, src);
		533	XRenderFreePicture (dpy, dst);
		534
		535	if (mask_p)
		536	XRenderFreePicture (dpy, mask_p);
370	}	537	}
371		538
372	rxvt_img *	539	rxvt_img *
373	rxvt_img::clone ()	540	rxvt_img::clone ()
374	{	541	{
375	return new rxvt_img (*this);	542	return new rxvt_img (*this);
376	}	543	}
377		544
378	rxvt_img *	545	rxvt_img *
		546	rxvt_img::reify ()
		547	{
		548	if (x == 0 && y == 0 && w == ref->w && h == ref->h)
		549	return clone ();
		550
		551	Display *dpy = s->display->dpy;
		552
		553	// add an alpha channel if...
		554	bool alpha = !format->direct.alphaMask // pixmap has none yet
		555	&& (x \|\| y) // we need one because of non-zero offset
		556	&& repeat == RepeatNone; // and we have no good pixels to fill with
		557
		558	rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
		559	img->alloc ();
		560
		561	Picture src = picture ();
		562	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
		563
		564	if (alpha)
		565	{
		566	XRenderColor rc = { 0, 0, 0, 0 };
		567	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
		568	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, x, y, ref->w, ref->h);
		569	}
		570	else
		571	XRenderComposite (dpy, PictOpSrc, src, None, dst, -x, -y, 0, 0, 0, 0, w, h);
		572
		573	XRenderFreePicture (dpy, src);
		574	XRenderFreePicture (dpy, dst);
		575
		576	return img;
		577	}
		578
		579	rxvt_img *
379	rxvt_img::sub_rect (int x, int y, int width, int height)	580	rxvt_img::sub_rect (int x, int y, int width, int height)
380	{	581	{
		582	rxvt_img *img = clone ();
		583
		584	img->x -= x;
		585	img->y -= y;
		586
		587	if (w != width \|\| h != height)
		588	{
		589	img->w = width;
		590	img->h = height;
		591
		592	rxvt_img *img2 = img->reify ();
		593	delete img;
		594	img = img2;
		595	}
		596
		597	return img;
		598	}
		599
		600	static void
		601	mat_invert (rxvt_img::nv mat[3][3], rxvt_img::nv (&inv)[3][3])
		602	{
		603	rxvt_img::nv s0 = mat [2][2] * mat [1][1] - mat [2][1] * mat [1][2];
		604	rxvt_img::nv s1 = mat [2][1] * mat [0][2] - mat [2][2] * mat [0][1];
		605	rxvt_img::nv s2 = mat [1][2] * mat [0][1] - mat [1][1] * mat [0][2];
		606
		607	rxvt_img::nv invdet = 1. / (mat [0][0] * s0 + mat [1][0] * s1 + mat [2][0] * s2);
		608
		609	inv [0][0] = invdet * s0;
		610	inv [0][1] = invdet * s1;
		611	inv [0][2] = invdet * s2;
		612
		613	inv [1][0] = invdet * (mat [2][0] * mat [1][2] - mat [2][2] * mat [1][0]);
		614	inv [1][1] = invdet * (mat [2][2] * mat [0][0] - mat [2][0] * mat [0][2]);
		615	inv [1][2] = invdet * (mat [1][0] * mat [0][2] - mat [1][2] * mat [0][0]);
		616
		617	inv [2][0] = invdet * (mat [2][1] * mat [1][0] - mat [2][0] * mat [1][1]);
		618	inv [2][1] = invdet * (mat [2][0] * mat [0][1] - mat [2][1] * mat [0][0]);
		619	inv [2][2] = invdet * (mat [1][1] * mat [0][0] - mat [1][0] * mat [0][1]);
		620	}
		621
		622	static rxvt_img::nv
		623	mat_apply (rxvt_img::nv mat[3][3], int i, rxvt_img::nv x, rxvt_img::nv y)
		624	{
		625	rxvt_img::nv v = mat [i][0] * x + mat [i][1] * y + mat [i][2];
		626	rxvt_img::nv w = mat [2][0] * x + mat [2][1] * y + mat [2][2];
		627
		628	return v * (1. / w);
		629	}
		630
		631	rxvt_img *
		632	rxvt_img::transform (nv matrix[3][3])
		633	{
		634	// calculate new pixel bounding box coordinates
		635	nv rmin[2], rmax[2];
		636
		637	for (int i = 0; i < 2; ++i)
		638	{
		639	nv v;
		640
		641	v = mat_apply (matrix, i, 0+x, 0+y); rmin [i] = rmax [i] = v;
		642	v = mat_apply (matrix, i, w+x, 0+y); min_it (rmin [i], v); max_it (rmax [i], v);
		643	v = mat_apply (matrix, i, 0+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
		644	v = mat_apply (matrix, i, w+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
		645	}
		646
		647	// TODO: adjust matrix for subpixel accuracy
		648	int dx = floor (rmin [0]);
		649	int dy = floor (rmin [1]);
		650
		651	int new_width = ceil (rmax [0] - dx);
		652	int new_height = ceil (rmax [1] - dy);
		653
		654	nv inv[3][3];
		655	mat_invert (matrix, inv);
		656
381	rxvt_img *img = new rxvt_img (s, format, width, height);	657	rxvt_img *img = new rxvt_img (s, format, dx, dy, new_width, new_height, repeat);
382	img->alloc ();	658	img->alloc ();
383		659
384	Display *dpy = s->display->dpy;	660	Display *dpy = s->display->dpy;
385	XRenderPictureAttributes pa;	661	Picture src = picture ();
386	pa.repeat = repeat;
387	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
388	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	662	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
389
390	XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, width, height);
391
392	XRenderFreePicture (dpy, src);
393	XRenderFreePicture (dpy, dst);
394
395	return img;
396	}
397
398	rxvt_img *
399	rxvt_img::transform (int new_width, int new_height, double matrix[9])
400	{
401	rxvt_img *img = new rxvt_img (s, format, new_width, new_height);
402	img->alloc ();
403
404	Display *dpy = s->display->dpy;
405	XRenderPictureAttributes pa;
406	pa.repeat = repeat;
407	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
408	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
409		663
410	XTransform xfrm;	664	XTransform xfrm;
411		665
412	for (int i = 0; i < 3; ++i)	666	for (int i = 0; i < 3; ++i)
413	for (int j = 0; j < 3; ++j)	667	for (int j = 0; j < 3; ++j)
414	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);	668	xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
415		669
416	XRenderSetPictureFilter (dpy, src, "good", 0, 0);	670	XRenderSetPictureFilter (dpy, src, "good", 0, 0);
417	XRenderSetPictureTransform (dpy, src, &xfrm);	671	XRenderSetPictureTransform (dpy, src, &xfrm);
418	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);	672	XRenderComposite (dpy, PictOpSrc, src, None, dst, dx, dy, 0, 0, 0, 0, new_width, new_height);
419		673
420	XRenderFreePicture (dpy, src);	674	XRenderFreePicture (dpy, src);
421	XRenderFreePicture (dpy, dst);	675	XRenderFreePicture (dpy, dst);
422		676
423	return img;	677	return img;
424	}	678	}
425		679
426	rxvt_img *	680	rxvt_img *
427	rxvt_img::scale (int new_width, int new_height)	681	rxvt_img::scale (int new_width, int new_height)
428	{	682	{
429	double matrix[9] = {	683	if (w == new_width && h == new_height)
430	w / (double)new_width, 0, 0,	684	return clone ();
431	0, h / (double)new_height, 0,	685
		686	nv matrix[3][3] = {
		687	{ new_width / (nv)w, 0, 0 },
		688	{ 0, new_height / (nv)h, 0 },
432	0, 0, 1	689	{ 0, 0, 1 }
433	};	690	};
434		691
435	return transform (new_width, new_height, matrix);	692	int old_repeat_mode = repeat;
436	}	693	repeat = RepeatPad; // not right, but xrender can't properly scale it seems
437		694
		695	rxvt_img *img = transform (matrix);
		696
		697	repeat = old_repeat_mode;
		698	img->repeat = repeat;
		699
		700	return img;
		701	}
		702
438	rxvt_img *	703	rxvt_img *
439	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)	704	rxvt_img::rotate (int cx, int cy, nv phi)
440	{	705	{
441	double s = sin (phi);	706	nv s = sin (phi);
442	double c = cos (phi);	707	nv c = cos (phi);
443		708
444	double matrix[9] = {	709	nv matrix[3][3] = {
445	c, -s, -c * x + s * y + x,	710	{ c, -s, cx - c * cx + s * cy + 200 },
446	s, c, -s * x - c * y + y,	711	{ s, c, cy - s * cx - c * cy },
447	0, 0, 1	712	{ 0, 0, 1 }
		713	//{ c, -s, 0 },
		714	//{ s, c, 0 },
		715	//{ 0, 0, 1 }
448	};	716	};
449		717
450	return transform (new_width, new_height, matrix);	718	//move (-cx, -cy);
451	}	719	rxvt_img *img = transform (matrix);
		720	//move ( cx, cy);
		721	//img->move (cx, cy);
452		722
		723	return img;
		724	}
		725
453	rxvt_img *	726	rxvt_img *
454	rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg)	727	rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)
455	{	728	{
456	if (new_format == format)	729	if (new_format == format)
457	return clone ();	730	return clone ();
458		731
459	rxvt_img *img = new rxvt_img (s, new_format, w, h);	732	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
460	img->alloc ();	733	img->alloc ();
461		734
462	Display *dpy = s->display->dpy;	735	Display *dpy = s->display->dpy;
463	Picture src = XRenderCreatePicture (dpy, pm, format, 0, 0);	736	Picture src = picture ();
464	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);	737	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
465	int op = PictOpSrc;	738	int op = PictOpSrc;
466		739
467	if (format->direct.alphaMask && !new_format->direct.alphaMask)	740	if (format->direct.alphaMask && !new_format->direct.alphaMask)
468	{	741	{
469	// does it have to be that complicated	742	// does it have to be that complicated
470	rgba c;
471	bg.get (c);
472
473	XRenderColor rc = { c.r, c.g, c.b, 0xffff };	743	XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };
474	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);	744	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
475		745
476	op = PictOpOver;	746	op = PictOpOver;
477	}	747	}
478		748
…		…
483		753
484	return img;	754	return img;
485	}	755	}
486		756
487	rxvt_img *	757	rxvt_img *
488	rxvt_img::blend (rxvt_img *img, double factor)	758	rxvt_img::blend (rxvt_img *img, nv factor)
489	{	759	{
490	rxvt_img *img2 = clone ();	760	rxvt_img *img2 = clone ();
491	Display *dpy = s->display->dpy;	761	Display *dpy = s->display->dpy;
492	Picture src = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	762	Picture src = img->picture ();
493	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);	763	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
494	Picture mask = create_xrender_mask (dpy, img->pm, False);	764	Picture mask = create_xrender_mask (dpy, img->pm, False, False);
495		765
496	XRenderColor mask_c;	766	XRenderColor mask_c;
497		767
498	mask_c.alpha = float_to_component (factor);	768	mask_c.alpha = float_to_component (factor);
499	mask_c.red =	769	mask_c.red =

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.32 by root, Thu Jun 7 07:53:12 2012 UTC vs. Revision 1.90 by root, Thu Jun 14 19:44:45 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.32 by root, Thu Jun 7 07:53:12 2012 UTC vs.
Revision 1.90 by root, Thu Jun 14 19:44:45 2012 UTC