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

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

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.9 by root, Sun Jun 3 20:47:00 2012 UTC vs. Revision 1.76 by root, Sun Jun 10 10:29:26 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.9 by root, Sun Jun 3 20:47:00 2012 UTC vs.
Revision 1.76 by root, Sun Jun 10 10:29:26 2012 UTC