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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.55 by root, Thu Jun 7 20:26:21 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 x, int y, int width, int height, int repeat)	59	rxvt_img::rxvt_img (rxvt_screen screen, XRenderPictFormat format, int x, int y, int width, int height, int repeat)
8	: s(screen), x(x), y(y), w(width), h(height), format(format), repeat(repeat),	60	: s(screen), x(x), y(y), w(width), h(height), format(format), repeat(repeat),
9	pm(0), ref(0)	61	pm(0), ref(0)
10	{	62	{
11	}	63	}
…		…
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), ref(img.ref)	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	++ref->cnt;	68	++ref->cnt;
17	}	69	}
18
19	#if 0
20	rxvt_img::rxvt_img (rxvt_screen screen, XRenderPictFormat format, int width, int height, Pixmap pixmap)
21	: s(screen), x(0), y(0), w(width), h(height), format(format), repeat(RepeatNormal), shared(false), pm(pixmap)
22	{
23	}
24	#endif
25		70
26	rxvt_img *	71	rxvt_img *
27	rxvt_img::new_from_root (rxvt_screen *s)	72	rxvt_img::new_from_root (rxvt_screen *s)
28	{	73	{
29	Display *dpy = s->display->dpy;	74	Display *dpy = s->display->dpy;
…		…
56	img->ref->ours = false;	101	img->ref->ours = false;
57		102
58	return img;	103	return img;
59	}	104	}
60		105
		106	# if HAVE_PIXBUF
		107
61	rxvt_img *	108	rxvt_img *
62	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)	109	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)
63	{	110	{
64	Display *dpy = s->display->dpy;	111	Display *dpy = s->display->dpy;
65		112
…		…
69	if (width > 32767 \|\| height > 32767) // well, we could upload in chunks	116	if (width > 32767 \|\| height > 32767) // well, we could upload in chunks
70	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n");	117	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n");
71		118
72	// since we require rgb24/argb32 formats from xrender we assume	119	// since we require rgb24/argb32 formats from xrender we assume
73	// that both 24 and 32 bpp MUST be supported by any screen that supports xrender	120	// that both 24 and 32 bpp MUST be supported by any screen that supports xrender
74	int depth = gdk_pixbuf_get_has_alpha (pb) ? 32 : 24;
75		121
76	int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;	122	int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
77		123
78	XImage xi;	124	XImage xi;
79		125
…		…
83	xi.format = ZPixmap;	129	xi.format = ZPixmap;
84	xi.byte_order = ImageByteOrder (dpy);	130	xi.byte_order = ImageByteOrder (dpy);
85	xi.bitmap_unit = 0; //XY only, unused	131	xi.bitmap_unit = 0; //XY only, unused
86	xi.bitmap_bit_order = 0; //XY only, unused	132	xi.bitmap_bit_order = 0; //XY only, unused
87	xi.bitmap_pad = BitmapPad (dpy);	133	xi.bitmap_pad = BitmapPad (dpy);
88	xi.depth = depth;	134	xi.depth = 32;
89	xi.bytes_per_line = 0;	135	xi.bytes_per_line = 0;
90	xi.bits_per_pixel = 32; //Z only	136	xi.bits_per_pixel = 32; //Z only
91	xi.red_mask = 0x00000000; //Z only, unused	137	xi.red_mask = 0x00000000; //Z only, unused
92	xi.green_mask = 0x00000000; //Z only, unused	138	xi.green_mask = 0x00000000; //Z only, unused
93	xi.blue_mask = 0x00000000; //Z only, unused	139	xi.blue_mask = 0x00000000; //Z only, unused
…		…
102	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");	148	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");
103		149
104	xi.data = (char )rxvt_malloc (height xi.bytes_per_line);	150	xi.data = (char )rxvt_malloc (height xi.bytes_per_line);
105		151
106	int rowstride = gdk_pixbuf_get_rowstride (pb);	152	int rowstride = gdk_pixbuf_get_rowstride (pb);
107		153	bool pb_has_alpha = gdk_pixbuf_get_has_alpha (pb);
108	assert (3 + (depth == 32) == gdk_pixbuf_get_n_channels (pb));
109	unsigned char *row = gdk_pixbuf_get_pixels (pb);	154	unsigned char *row = gdk_pixbuf_get_pixels (pb);
		155
110	char *line = xi.data;	156	char *line = xi.data;
111		157
112	for (int y = 0; y < height; y++)	158	for (int y = 0; y < height; y++)
113	{	159	{
114	unsigned char *src = row;	160	unsigned char *src = row;
115	uint32_t dst = (uint32_t )line;	161	uint32_t dst = (uint32_t )line;
116		162
117	if (depth == 24)	163	if (!pb_has_alpha)
118	for (int x = 0; x < width; x++)	164	for (int x = 0; x < width; x++)
119	{	165	{
120	uint8_t r = *src++;	166	uint8_t r = *src++;
121	uint8_t g = *src++;	167	uint8_t g = *src++;
122	uint8_t b = *src++;	168	uint8_t b = *src++;
123		169
124	uint32_t v = (r << 16) \| (g << 8) \| b;	170	uint32_t v = (255 << 24) \| (r << 16) \| (g << 8) \| b;
125		171
126	if (ecb_big_endian ())	172	if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
127	v = ecb_bswap32 (v);
128
129	if (byte_order_mismatch)
130	v = ecb_bswap32 (v);	173	v = ecb_bswap32 (v);
131		174
132	*dst++ = v;	175	*dst++ = v;
133	}	176	}
134	else	177	else
135	for (int x = 0; x < width; x++)	178	for (int x = 0; x < width; x++)
136	{	179	{
137	uint32_t v = (uint32_t )src; src += 4;	180	uint32_t v = (uint32_t )src; src += 4;
138		181
139	if (ecb_little_endian ())	182	if (ecb_big_endian ())
140	v = ecb_bswap32 (v);	183	v = ecb_bswap32 (v);
141		184
142	v = ecb_rotr32 (v, 8);	185	v = ecb_rotl32 (v, 8); // abgr to bgra
143		186
144	if (byte_order_mismatch)	187	if (!byte_order_mismatch)
145	v = ecb_bswap32 (v);	188	v = ecb_bswap32 (v);
146		189
147	*dst++ = v;	190	*dst++ = v;
148	}	191	}
149		192
150	row += rowstride;	193	row += rowstride;
151	line += xi.bytes_per_line;	194	line += xi.bytes_per_line;
152	}	195	}
153		196
154	rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, depth == 24 ? PictStandardRGB24 : PictStandardARGB32), 0, 0, width, height);	197	rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, PictStandardARGB32), 0, 0, width, height);
155	img->alloc ();	198	img->alloc ();
156		199
157	GC gc = XCreateGC (dpy, img->pm, 0, 0);	200	GC gc = XCreateGC (dpy, img->pm, 0, 0);
158	XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);	201	XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);
159	XFreeGC (dpy, gc);	202	XFreeGC (dpy, gc);
…		…
177	g_object_unref (pb);	220	g_object_unref (pb);
178		221
179	return img;	222	return img;
180	}	223	}
181		224
		225	# endif
		226
182	void	227	void
183	rxvt_img::destroy ()	228	rxvt_img::destroy ()
184	{	229	{
185	if (--ref->cnt)	230	if (--ref->cnt)
186	return;	231	return;
…		…
202	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);
203	ref = new pixref (w, h);	248	ref = new pixref (w, h);
204	}	249	}
205		250
206	Picture	251	Picture
207	rxvt_img::src_picture ()	252	rxvt_img::picture ()
208	{	253	{
209	Display *dpy = s->display->dpy;	254	Display *dpy = s->display->dpy;
210		255
211	XRenderPictureAttributes pa;	256	XRenderPictureAttributes pa;
212	pa.repeat = repeat;	257	pa.repeat = repeat;
…		…
219	rxvt_img::unshare ()	264	rxvt_img::unshare ()
220	{	265	{
221	if (ref->cnt == 1 && ref->ours)	266	if (ref->cnt == 1 && ref->ours)
222	return;	267	return;
223		268
224	//TODO: maybe should reify instead
225	Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);	269	Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);
226	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);	270	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
227	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);	271	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
228	XFreeGC (s->display->dpy, gc);	272	XFreeGC (s->display->dpy, gc);
229		273
…		…
232	pm = pm2;	276	pm = pm2;
233	ref = new pixref (ref->w, ref->h);	277	ref = new pixref (ref->w, ref->h);
234	}	278	}
235		279
236	void	280	void
237	rxvt_img::fill (const rxvt_color &c)	281	rxvt_img::fill (const rgba &c)
238	{	282	{
239	XGCValues gcv;	283	XRenderColor rc = { c.r, c.g, c.b, c.a };
240	gcv.foreground = c;	284
241	GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv);	285	Display *dpy = s->display->dpy;
242	XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h);	286	Picture src = picture ();
243	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;
244	}	314	}
245		315
246	static void	316	static void
247	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)
248	{	318	{
249	double sigma = radius / 2.0;	319	rxvt_img::nv sigma = radius / 2.0;
250	double scale = sqrt (2.0 * M_PI) * sigma;	320	rxvt_img::nv scale = sqrt (2.0 * M_PI) * sigma;
251	double sum = 0.0;	321	rxvt_img::nv sum = 0.0;
252		322
253	for (int i = 0; i < width; i++)	323	for (int i = 0; i < width; i++)
254	{	324	{
255	double x = i - width / 2;	325	rxvt_img::nv x = i - width / 2;
256	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;	326	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
257	sum += kernel[i];	327	sum += kernel[i];
258	}	328	}
259		329
260	params[0] = XDoubleToFixed (width);	330	params[0] = XDoubleToFixed (width);
…		…
270	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))	340	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
271	return clone ();	341	return clone ();
272		342
273	Display *dpy = s->display->dpy;	343	Display *dpy = s->display->dpy;
274	int size = max (rh, rv) * 2 + 1;	344	int size = max (rh, rv) * 2 + 1;
275	double kernel = (double )malloc (size * sizeof (double));	345	nv kernel = (nv )malloc (size * sizeof (nv));
276	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	346	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
277	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);	347	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
278	img->alloc ();	348	img->alloc ();
279		349
280	Picture src = src_picture ();
281
282	XRenderPictureAttributes pa;	350	XRenderPictureAttributes pa;
283	pa.repeat = RepeatPad;	351	pa.repeat = RepeatPad;
284	Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa);	352	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
		353	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
285		354
286	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);	355	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
287	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);	356	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
288	XFreePixmap (dpy, tmp_pm);	357	XFreePixmap (dpy, tmp_pm);
289		358
…		…
305		374
306	size = rv * 2 + 1;	375	size = rv * 2 + 1;
307	get_gaussian_kernel (rv, size, kernel, params);	376	get_gaussian_kernel (rv, size, kernel, params);
308	::swap (params[0], params[1]);	377	::swap (params[0], params[1]);
309		378
310	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);	379	XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
311	XRenderComposite (dpy,	380	XRenderComposite (dpy,
312	PictOpSrc,	381	PictOpSrc,
313	tmp,	382	tmp,
314	None,	383	None,
315	dst,	384	dst,
…		…
319	w, h);	388	w, h);
320	}	389	}
321		390
322	free (kernel);	391	free (kernel);
323	free (params);	392	free (params);
		393
324	XRenderFreePicture (dpy, src);	394	XRenderFreePicture (dpy, src);
325	XRenderFreePicture (dpy, dst);	395	XRenderFreePicture (dpy, dst);
326	XRenderFreePicture (dpy, tmp);	396	XRenderFreePicture (dpy, tmp);
327		397
328	return img;	398	return img;
329	}	399	}
330		400
331	static Picture	401	static Picture
332	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb)	402	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
333	{	403	{
334	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);	404	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
335		405
336	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);	406	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
337	XRenderPictureAttributes pa;	407	XRenderPictureAttributes pa;
338	pa.repeat = True;	408	pa.repeat = RepeatNormal;
		409	pa.component_alpha = component_alpha;
339	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);	410	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat \| CPComponentAlpha, &pa);
340		411
341	XFreePixmap (dpy, pixmap);	412	XFreePixmap (dpy, pixmap);
342		413
343	return mask;	414	return mask;
344	}	415	}
345		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
346	void	436	void
347	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)
348	{	438	{
		439	unshare ();
		440
349	Display *dpy = s->display->dpy;	441	Display *dpy = s->display->dpy;
350	Picture src = create_xrender_mask (dpy, pm, True);
351	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	442	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
352		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;
353	XRenderColor mask_c;	448	XRenderColor mask_c;
354	mask_c.red = r;	449
355	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))
356	mask_c.blue = b;
357	mask_c.alpha = a;
358	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	451	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
359		452
360	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	}
361		465
362	XRenderFreePicture (dpy, src);
363	XRenderFreePicture (dpy, dst);	466	XRenderFreePicture (dpy, dst);
364	}	467	}
365		468
366	void	469	void
367	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)
368	{	471	{
369	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))	472	if (r < 0 \|\| g < 0 \|\| b < 0 \|\| a < 0)
370	return;	473	rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
371		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
372	Display *dpy = s->display->dpy;	484	Display *dpy = s->display->dpy;
373	Picture src = create_xrender_mask (dpy, pm, True);	485
		486	Picture src = picture ();
374	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);
375		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;
376	XRenderColor mask_c;	494	XRenderColor mask_c;
377	mask_c.red = r;	495
378	mask_c.green = g;	496	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
379	mask_c.blue = b;	497	{
380	mask_c.alpha = a;
381	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	498	XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1);
382
383	XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	499	XRenderComposite (dpy, PictOpAdd, src, mul, dst, 0, 0, 0, 0, 0, 0, w, h);
		500	}
		501	}
384		502
		503	XRenderFreePicture (dpy, mul);
385	XRenderFreePicture (dpy, src);	504	XRenderFreePicture (dpy, dst);
386	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.)
		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	}
		529
		530	XRenderComposite (dpy, op, src, mask_p, dst, x - img->x, y - img->y, 0, 0, 0, 0, w, h);
		531
		532	XRenderFreePicture (dpy, src);
		533	XRenderFreePicture (dpy, dst);
		534
		535	if (mask_p)
		536	XRenderFreePicture (dpy, mask_p);
387	}	537	}
388		538
389	rxvt_img *	539	rxvt_img *
390	rxvt_img::clone ()	540	rxvt_img::clone ()
391	{	541	{
392	return new rxvt_img (*this);	542	return new rxvt_img (*this);
393	}
394
395	static XRenderPictFormat *
396	find_alpha_format_for (Display dpy, XRenderPictFormat format)
397	{
398	if (format->direct.alphaMask)
399	return format; // already has alpha
400
401	// try to find a suitable alpha format, one bit alpha is enough for our purposes
402	if (format->type == PictTypeDirect)
403	for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
404	if (f->direct.alphaMask
405	&& f->type == PictTypeDirect
406	&& ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
407	&& ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
408	&& ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
409	return f;
410
411	// should be a very good fallback
412	return XRenderFindStandardFormat (dpy, PictStandardARGB32);
413	}	543	}
414		544
415	rxvt_img *	545	rxvt_img *
416	rxvt_img::reify ()	546	rxvt_img::reify ()
417	{	547	{
418	if (x == 0 && y == 0 && w == ref->w && h == ref->h)	548	if (x == 0 && y == 0 && w == ref->w && h == ref->h)
419	return clone ();	549	return clone ();
420		550
421	Display *dpy = s->display->dpy;	551	Display *dpy = s->display->dpy;
422		552
		553	// add an alpha channel if...
423	bool alpha = !format->direct.alphaMask	554	bool alpha = !format->direct.alphaMask // pixmap has none yet
424	&& (x \|\| y)	555	&& (x \|\| y) // we need one because of non-zero offset
425	&& repeat == RepeatNone;	556	&& repeat == RepeatNone; // and we have no good pixels to fill with
426		557
427	rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);	558	rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
428	img->alloc ();	559	img->alloc ();
429		560
430	Picture src = src_picture ();	561	Picture src = picture ();
431	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	562	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
432		563
433	if (alpha)	564	if (alpha)
434	{	565	{
435	XRenderColor rc = { 0, 0, 0, 0 };	566	XRenderColor rc = { 0, 0, 0, 0 };
436	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles	567	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
437	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h);	568	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, x, y, ref->w, ref->h);
438	}	569	}
439	else	570	else
440	XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);	571	XRenderComposite (dpy, PictOpSrc, src, None, dst, -x, -y, 0, 0, 0, 0, w, h);
441		572
442	XRenderFreePicture (dpy, src);	573	XRenderFreePicture (dpy, src);
443	XRenderFreePicture (dpy, dst);	574	XRenderFreePicture (dpy, dst);
444		575
445	return img;	576	return img;
…		…
448	rxvt_img *	579	rxvt_img *
449	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)
450	{	581	{
451	rxvt_img *img = clone ();	582	rxvt_img *img = clone ();
452		583
453	img->x += x;	584	img->x -= x;
454	img->y += y;	585	img->y -= y;
455		586
456	if (w != width \|\| h != height)	587	if (w != width \|\| h != height)
457	{	588	{
458	img->w = width;	589	img->w = width;
459	img->h = height;	590	img->h = height;
…		…
464	}	595	}
465		596
466	return img;	597	return img;
467	}	598	}
468		599
469	rxvt_img *	600	static void
470	rxvt_img::transform (int new_width, int new_height, double matrix[9])	601	mat_invert (rxvt_img::nv mat[3][3], rxvt_img::nv (&inv)[3][3])
471	{	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
472	rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat);	657	rxvt_img *img = new rxvt_img (s, format, dx, dy, new_width, new_height, repeat);
473	img->alloc ();	658	img->alloc ();
474		659
475	Display *dpy = s->display->dpy;	660	Display *dpy = s->display->dpy;
476	Picture src = src_picture ();	661	Picture src = picture ();
477	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	662	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
478		663
479	XTransform xfrm;	664	XTransform xfrm;
480		665
481	for (int i = 0; i < 3; ++i)	666	for (int i = 0; i < 3; ++i)
482	for (int j = 0; j < 3; ++j)	667	for (int j = 0; j < 3; ++j)
483	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);	668	xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
484
485	#if 0
486	xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
487	xfrm.matrix [1][2] -= XDoubleToFixed (y);
488	#endif
489		669
490	XRenderSetPictureFilter (dpy, src, "good", 0, 0);	670	XRenderSetPictureFilter (dpy, src, "good", 0, 0);
491	XRenderSetPictureTransform (dpy, src, &xfrm);	671	XRenderSetPictureTransform (dpy, src, &xfrm);
492	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);
493		673
494	XRenderFreePicture (dpy, src);	674	XRenderFreePicture (dpy, src);
495	XRenderFreePicture (dpy, dst);	675	XRenderFreePicture (dpy, dst);
496		676
497	return img;	677	return img;
…		…
501	rxvt_img::scale (int new_width, int new_height)	681	rxvt_img::scale (int new_width, int new_height)
502	{	682	{
503	if (w == new_width && h == new_height)	683	if (w == new_width && h == new_height)
504	return clone ();	684	return clone ();
505		685
506	double matrix[9] = {	686	nv matrix[3][3] = {
507	w / (double)new_width, 0, 0,	687	{ new_width / (nv)w, 0, 0 },
508	0, h / (double)new_height, 0,	688	{ 0, new_height / (nv)h, 0 },
509	0, 0, 1	689	{ 0, 0, 1 }
510	};	690	};
511		691
512	int old_repeat_mode = repeat;	692	int old_repeat_mode = repeat;
513	repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems	693	repeat = RepeatPad; // not right, but xrender can't properly scale it seems
514		694
515	rxvt_img *img = transform (new_width, new_height, matrix);	695	rxvt_img *img = transform (matrix);
516		696
517	repeat = old_repeat_mode;	697	repeat = old_repeat_mode;
518	img->repeat = repeat;	698	img->repeat = repeat;
519		699
520	return img;	700	return img;
521	}	701	}
522		702
523	rxvt_img *	703	rxvt_img *
524	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)
525	{	705	{
526	double s = sin (phi);	706	nv s = sin (phi);
527	double c = cos (phi);	707	nv c = cos (phi);
528		708
529	double matrix[9] = {	709	nv matrix[3][3] = {
530	c, -s, -c * x + s * y + x,	710	{ c, -s, cx - c * cx + s * cy + 200 },
531	s, c, -s * x - c * y + y,	711	{ s, c, cy - s * cx - c * cy },
532	0, 0, 1	712	{ 0, 0, 1 }
		713	//{ c, -s, 0 },
		714	//{ s, c, 0 },
		715	//{ 0, 0, 1 }
533	};	716	};
534		717
535	return transform (new_width, new_height, matrix);	718	//move (-cx, -cy);
536	}	719	rxvt_img *img = transform (matrix);
		720	//move ( cx, cy);
		721	//img->move (cx, cy);
537		722
		723	return img;
		724	}
		725
538	rxvt_img *	726	rxvt_img *
539	rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)	727	rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)
540	{	728	{
541	if (new_format == format)	729	if (new_format == format)
542	return clone ();	730	return clone ();
543		731
544	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);	732	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
545	img->alloc ();	733	img->alloc ();
546		734
547	Display *dpy = s->display->dpy;	735	Display *dpy = s->display->dpy;
548	Picture src = src_picture ();	736	Picture src = picture ();
549	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);	737	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
550	int op = PictOpSrc;	738	int op = PictOpSrc;
551		739
552	if (format->direct.alphaMask && !new_format->direct.alphaMask)	740	if (format->direct.alphaMask && !new_format->direct.alphaMask)
553	{	741	{
554	// does it have to be that complicated	742	// does it have to be that complicated
555	rgba c;
556	bg.get (c);
557
558	XRenderColor rc = { c.r, c.g, c.b, 0xffff };	743	XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };
559	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);	744	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
560		745
561	op = PictOpOver;	746	op = PictOpOver;
562	}	747	}
563		748
…		…
568		753
569	return img;	754	return img;
570	}	755	}
571		756
572	rxvt_img *	757	rxvt_img *
573	rxvt_img::blend (rxvt_img *img, double factor)	758	rxvt_img::blend (rxvt_img *img, nv factor)
574	{	759	{
575	rxvt_img *img2 = clone ();	760	rxvt_img *img2 = clone ();
576	Display *dpy = s->display->dpy;	761	Display *dpy = s->display->dpy;
577	Picture src = img->src_picture ();	762	Picture src = img->picture ();
578	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);	763	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
579	Picture mask = create_xrender_mask (dpy, img->pm, False);	764	Picture mask = create_xrender_mask (dpy, img->pm, False, False);
580		765
581	XRenderColor mask_c;	766	XRenderColor mask_c;
582		767
583	mask_c.alpha = float_to_component (factor);	768	mask_c.alpha = float_to_component (factor);
584	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.55 by root, Thu Jun 7 20:26:21 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.55 by root, Thu Jun 7 20:26:21 2012 UTC vs.
Revision 1.90 by root, Thu Jun 14 19:44:45 2012 UTC