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

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

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.10 by sf-exg, Mon Jun 4 06:59:50 2012 UTC vs. Revision 1.75 by sf-exg, Sun Jun 10 07:51:45 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.10 by sf-exg, Mon Jun 4 06:59:50 2012 UTC vs.
Revision 1.75 by sf-exg, Sun Jun 10 07:51:45 2012 UTC