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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.20 by root, Tue Jun 5 14:07:47 2012 UTC vs.
Revision 1.53 by root, Thu Jun 7 20:22:40 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)	8	: s(screen), x(x), y(y), w(width), h(height), format(format), repeat(repeat),
		9	pm(0), ref(0)
11	{	10	{
12	pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);
13	}	11	}
14		12
		13	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)
		15	{
		16	++ref->cnt;
		17	}
		18
		19	#if 0
15	rxvt_img::rxvt_img (rxvt_screen screen, XRenderPictFormat format, int width, int height, Pixmap pixmap)	20	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)	21	: s(screen), x(0), y(0), w(width), h(height), format(format), repeat(RepeatNormal), shared(false), pm(pixmap)
17	{	22	{
		23	}
		24	#endif
		25
		26	rxvt_img *
		27	rxvt_img::new_from_root (rxvt_screen *s)
		28	{
		29	Display *dpy = s->display->dpy;
		30	unsigned int root_pm_w, root_pm_h;
		31	Pixmap root_pixmap = s->display->get_pixmap_property (s->display->xa[XA_XROOTPMAP_ID]);
		32	if (root_pixmap == None)
		33	root_pixmap = s->display->get_pixmap_property (s->display->xa[XA_ESETROOT_PMAP_ID]);
		34
		35	if (root_pixmap == None)
		36	return 0;
		37
		38	Window wdummy;
		39	int idummy;
		40	unsigned int udummy;
		41
		42	if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pm_w, &root_pm_h, &udummy, &udummy))
		43	return 0;
		44
		45	rxvt_img *img = new rxvt_img (
		46	s,
		47	XRenderFindVisualFormat (dpy, DefaultVisual (dpy, s->display->screen)),
		48	0,
		49	0,
		50	root_pm_w,
		51	root_pm_h
		52	);
		53
		54	img->pm = root_pixmap;
		55	img->ref = new pixref (root_pm_w, root_pm_h);
		56	img->ref->ours = false;
		57
		58	return img;
		59	}
		60
		61	rxvt_img *
		62	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)
		63	{
		64	Display *dpy = s->display->dpy;
		65
		66	int width = gdk_pixbuf_get_width (pb);
		67	int height = gdk_pixbuf_get_height (pb);
		68
		69	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");
		71
		72	// 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
		74	int depth = gdk_pixbuf_get_has_alpha (pb) ? 32 : 24;
		75
		76	XImage xi;
		77
		78	xi.width = width;
		79	xi.height = height;
		80	xi.xoffset = 0;
		81	xi.format = ZPixmap;
		82	xi.byte_order = LSBFirst; // maybe go for host byte order, because servers are usually local?
		83	xi.bitmap_unit = 32; //XY only, unused
		84	xi.bitmap_bit_order = LSBFirst; //XY only, unused
		85	xi.bitmap_pad = BitmapPad (dpy);
		86	xi.depth = depth;
		87	xi.bytes_per_line = 0;
		88	xi.bits_per_pixel = 32; //Z only
		89	xi.red_mask = 0x00000000; //Z only, unused
		90	xi.green_mask = 0x00000000; //Z only, unused
		91	xi.blue_mask = 0x00000000; //Z only, unused
		92	xi.obdata = 0; // probably unused
		93
		94	if (!XInitImage (&xi))
		95	rxvt_fatal ("unable to initialise ximage, please report.\n");
		96
		97	if (height > INT_MAX / xi.bytes_per_line)
		98	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");
		99
		100	xi.data = (char )rxvt_malloc (height xi.bytes_per_line);
		101
		102	int rowstride = gdk_pixbuf_get_rowstride (pb);
		103
		104	assert (3 + (depth == 32) == gdk_pixbuf_get_n_channels (pb));
		105	unsigned char *row = gdk_pixbuf_get_pixels (pb);
		106	char *line = xi.data;
		107
		108	for (int y = 0; y < height; y++)
		109	{
		110	unsigned char *src = row;
		111	uint32_t dst = (uint32_t )line;
		112
		113	if (depth == 24)
		114	for (int x = 0; x < width; x++)
		115	{
		116	uint8_t r = *src++;
		117	uint8_t g = *src++;
		118	uint8_t b = *src++;
		119
		120	uint32_t v = (r << 16) \| (g << 8) \| b;
		121
		122	if (ecb_big_endian ())
		123	v = ecb_bswap32 (v);
		124
		125	*dst++ = v;
		126	}
		127	else
		128	for (int x = 0; x < width; x++)
		129	{
		130	uint32_t v = (uint32_t )src; src += 4;
		131
		132	if (ecb_little_endian ())
		133	v = ecb_bswap32 (v);
		134
		135	v = ecb_rotr32 (v, 8);
		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, depth == 24 ? PictStandardRGB24 : 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;
18	}	154	}
19		155
20	rxvt_img *	156	rxvt_img *
21	rxvt_img::new_from_file (rxvt_screen s, const char filename)	157	rxvt_img::new_from_file (rxvt_screen s, const char filename)
22	{	158	{
…		…
24	GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);	160	GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);
25		161
26	if (!pb)	162	if (!pb)
27	rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);	163	rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);
28		164
29	rxvt_img *img = new rxvt_img (	165	rxvt_img *img = new_from_pixbuf (s, pb);
30	s,
31	XRenderFindStandardFormat (s->display->dpy, gdk_pixbuf_get_has_alpha (pb) ? PictStandardARGB32 : PictStandardRGB24),
32	gdk_pixbuf_get_width (pb),
33	gdk_pixbuf_get_height (pb)
34	);
35		166
36	img->render_pixbuf (pb, 0, 0, img->w, img->h, 0, 0);	167	g_object_unref (pb);
37		168
		169	return img;
		170	}
		171
		172	void
		173	rxvt_img::destroy ()
		174	{
		175	if (--ref->cnt)
38	return img;	176	return;
		177
		178	if (pm && ref->ours)
		179	XFreePixmap (s->display->dpy, pm);
		180
		181	delete ref;
39	}	182	}
40		183
41	rxvt_img::~rxvt_img ()	184	rxvt_img::~rxvt_img ()
42	{	185	{
43	if (!shared)	186	destroy ();
44	XFreePixmap (s->display->dpy, pm);	187	}
		188
		189	void
		190	rxvt_img::alloc ()
		191	{
		192	pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);
		193	ref = new pixref (w, h);
		194	}
		195
		196	Picture
		197	rxvt_img::src_picture ()
		198	{
		199	Display *dpy = s->display->dpy;
		200
		201	XRenderPictureAttributes pa;
		202	pa.repeat = repeat;
		203	Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
		204
		205	return pic;
45	}	206	}
46		207
47	void	208	void
48	rxvt_img::unshare ()	209	rxvt_img::unshare ()
49	{	210	{
50	if (!shared)	211	if (ref->cnt == 1 && ref->ours)
51	return;	212	return;
52		213
53	rxvt_img *img = clone ();	214	//TODO: maybe should reify instead
		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);
		218	XFreeGC (s->display->dpy, gc);
54		219
55	::swap (pm , img->pm);	220	destroy ();
56	::swap (shared, img->shared);
57		221
58	delete img;	222	pm = pm2;
		223	ref = new pixref (ref->w, ref->h);
59	}	224	}
60		225
61	void	226	void
62	rxvt_img::fill (const rxvt_color &c)	227	rxvt_img::fill (const rxvt_color &c)
63	{	228	{
…		…
87		252
88	for (int i = 0; i < width; i++)	253	for (int i = 0; i < width; i++)
89	params[i+2] = XDoubleToFixed (kernel[i] / sum);	254	params[i+2] = XDoubleToFixed (kernel[i] / sum);
90	}	255	}
91		256
92	void	257	rxvt_img *
93	rxvt_img::blur (int rh, int rv)	258	rxvt_img::blur (int rh, int rv)
94	{	259	{
95	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))	260	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
96	return;	261	return clone ();
97		262
98	Display *dpy = s->display->dpy;	263	Display *dpy = s->display->dpy;
99	int size = max (rh, rv) * 2 + 1;	264	int size = max (rh, rv) * 2 + 1;
100	double kernel = (double )malloc (size * sizeof (double));	265	double kernel = (double )malloc (size * sizeof (double));
101	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 ();
		269
		270	Picture src = src_picture ();
102		271
103	XRenderPictureAttributes pa;	272	XRenderPictureAttributes pa;
104
105	pa.repeat = RepeatPad;	273	pa.repeat = RepeatPad;
106	Picture src = XRenderCreatePicture (dpy, pm , format, CPRepeat, &pa);	274	Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa);
		275
107	Pixmap tmp = XCreatePixmap (dpy, pm, w, h, format->depth);	276	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
108	Picture dst = XRenderCreatePicture (dpy, tmp, format, CPRepeat, &pa);	277	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
109	XFreePixmap (dpy, tmp);	278	XFreePixmap (dpy, tmp_pm);
110		279
111	if (kernel && params)	280	if (kernel && params)
112	{	281	{
113	size = rh * 2 + 1;	282	size = rh * 2 + 1;
114	get_gaussian_kernel (rh, size, kernel, params);	283	get_gaussian_kernel (rh, size, kernel, params);
…		…
116	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);	285	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
117	XRenderComposite (dpy,	286	XRenderComposite (dpy,
118	PictOpSrc,	287	PictOpSrc,
119	src,	288	src,
120	None,	289	None,
121	dst,	290	tmp,
122	0, 0,	291	0, 0,
123	0, 0,	292	0, 0,
124	0, 0,	293	0, 0,
125	w, h);	294	w, h);
126		295
127	::swap (src, dst);
128
129	size = rv * 2 + 1;	296	size = rv * 2 + 1;
130	get_gaussian_kernel (rv, size, kernel, params);	297	get_gaussian_kernel (rv, size, kernel, params);
131	::swap (params[0], params[1]);	298	::swap (params[0], params[1]);
132		299
133	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);	300	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
134	XRenderComposite (dpy,	301	XRenderComposite (dpy,
135	PictOpSrc,	302	PictOpSrc,
136	src,	303	tmp,
137	None,	304	None,
138	dst,	305	dst,
139	0, 0,	306	0, 0,
140	0, 0,	307	0, 0,
141	0, 0,	308	0, 0,
…		…
144		311
145	free (kernel);	312	free (kernel);
146	free (params);	313	free (params);
147	XRenderFreePicture (dpy, src);	314	XRenderFreePicture (dpy, src);
148	XRenderFreePicture (dpy, dst);	315	XRenderFreePicture (dpy, dst);
		316	XRenderFreePicture (dpy, tmp);
		317
		318	return img;
149	}	319	}
150		320
151	static Picture	321	static Picture
152	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb)	322	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb)
153	{	323	{
…		…
162		332
163	return mask;	333	return mask;
164	}	334	}
165		335
166	void	336	void
167	rxvt_img::brightness (double r, double g, double b, double a)	337	rxvt_img::brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a)
168	{	338	{
169	Display *dpy = s->display->dpy;	339	Display *dpy = s->display->dpy;
170	Picture src = create_xrender_mask (dpy, pm, True);	340	Picture src = create_xrender_mask (dpy, pm, True);
171	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	341	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
172		342
173	XRenderColor mask_c;	343	XRenderColor mask_c;
174	mask_c.red = float_to_component (r);	344	mask_c.red = r;
175	mask_c.green = float_to_component (g);	345	mask_c.green = g;
176	mask_c.blue = float_to_component (b);	346	mask_c.blue = b;
177	mask_c.alpha = float_to_component (a);	347	mask_c.alpha = a;
178	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	348	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
179		349
180	XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	350	XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		351
		352	XRenderFreePicture (dpy, src);
		353	XRenderFreePicture (dpy, dst);
181	}	354	}
182		355
183	void	356	void
184	rxvt_img::contrast (double r, double g, double b, double a)	357	rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a)
185	{	358	{
186	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))	359	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
187	return;	360	return;
188		361
189	Display *dpy = s->display->dpy;	362	Display *dpy = s->display->dpy;
190	Picture src = create_xrender_mask (dpy, pm, True);	363	Picture src = create_xrender_mask (dpy, pm, True);
191	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	364	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
192		365
193	XRenderColor mask_c;	366	XRenderColor mask_c;
194	mask_c.red = float_to_component (r);	367	mask_c.red = r;
195	mask_c.green = float_to_component (g);	368	mask_c.green = g;
196	mask_c.blue = float_to_component (b);	369	mask_c.blue = b;
197	mask_c.alpha = float_to_component (a);	370	mask_c.alpha = a;
198	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	371	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
199		372
200	XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	373	XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
201	}
202		374
203	bool	375	XRenderFreePicture (dpy, src);
204	rxvt_img::render_pixbuf (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y)	376	XRenderFreePicture (dpy, dst);
205	{	377	}
206	Display *dpy = s->display->dpy;
207		378
208	if (s->visual->c_class != TrueColor)	379	rxvt_img *
		380	rxvt_img::clone ()
		381	{
		382	return new rxvt_img (*this);
		383	}
		384
		385	static XRenderPictFormat *
		386	find_alpha_format_for (Display dpy, XRenderPictFormat format)
		387	{
		388	if (format->direct.alphaMask)
		389	return format; // already has alpha
		390
		391	// try to find a suitable alpha format, one bit alpha is enough for our purposes
		392	if (format->type == PictTypeDirect)
		393	for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
		394	if (f->direct.alphaMask
		395	&& f->type == PictTypeDirect
		396	&& ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
		397	&& ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
		398	&& ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
209	return false;	399	return f;
210		400
211	uint32_t red_mask, green_mask, blue_mask, alpha_mask;	401	// should be a very good fallback
		402	return XRenderFindStandardFormat (dpy, PictStandardARGB32);
		403	}
212		404
213	red_mask = (uint32_t)format->direct.redMask << format->direct.red;	405	rxvt_img *
214	green_mask = (uint32_t)format->direct.greenMask << format->direct.green;	406	rxvt_img::reify ()
215	blue_mask = (uint32_t)format->direct.blueMask << format->direct.blue;	407	{
216	alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha;	408	if (x == 0 && y == 0 && w == ref->w && h == ref->h)
217
218	int width_r = ecb_popcount32 (red_mask);
219	int width_g = ecb_popcount32 (green_mask);
220	int width_b = ecb_popcount32 (blue_mask);
221	int width_a = ecb_popcount32 (alpha_mask);
222
223	if (width_r > 8 \|\| width_g > 8 \|\| width_b > 8 \|\| width_a > 8)
224	return false;	409	return clone ();
225		410
226	int sh_r = ecb_ctz32 (red_mask);	411	Display *dpy = s->display->dpy;
227	int sh_g = ecb_ctz32 (green_mask);
228	int sh_b = ecb_ctz32 (blue_mask);
229	int sh_a = ecb_ctz32 (alpha_mask);
230		412
231	if (width > 32767 \|\| height > 32767)	413	bool alpha = !format->direct.alphaMask
232	return false;	414	&& (x \|\| y)
		415	&& repeat == RepeatNone;
233		416
234	XImage *ximage = XCreateImage (dpy, s->visual, format->depth, ZPixmap, 0, 0,	417	rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
235	width, height, 32, 0);	418	img->alloc ();
236	if (!ximage)
237	return false;
238		419
239	if (height > INT_MAX / ximage->bytes_per_line	420	Picture src = src_picture ();
240	\|\| !(ximage->data = (char )malloc (height ximage->bytes_per_line)))	421	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
		422
		423	if (alpha)
241	{	424	{
242	XDestroyImage (ximage);	425	XRenderColor rc = { 0, 0, 0, 0 };
243	return false;	426	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
		427	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h);
244	}	428	}
		429	else
		430	XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);
245		431
246	GC gc = XCreateGC (dpy, pm, 0, 0);	432	XRenderFreePicture (dpy, src);
		433	XRenderFreePicture (dpy, dst);
247		434
248	ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;	435	return img;
		436	}
249		437
250	int rowstride = gdk_pixbuf_get_rowstride (pixbuf);	438	rxvt_img *
251	int channels = gdk_pixbuf_get_n_channels (pixbuf);	439	rxvt_img::sub_rect (int x, int y, int width, int height)
252	unsigned char row = gdk_pixbuf_get_pixels (pixbuf) + src_y rowstride + src_x * channels;	440	{
253	char *line = ximage->data;	441	rxvt_img *img = clone ();
254		442
255	rgba c (0, 0, 0);	443	img->x += x;
		444	img->y += y;
256		445
257	if (channels == 4 && alpha_mask == 0)	446	if (w != width \|\| h != height)
258	{	447	{
259	//pix_colors[Color_bg].get (c);	448	img->w = width;
260	//TODO	449	img->h = height;
261	c.r = 0xffff; c.g = 0xc0c0; c.b = 0xcbcb;//D	450
262	c.r >>= 8;	451	rxvt_img *img2 = img->reify ();
263	c.g >>= 8;	452	delete img;
264	c.b >>= 8;	453	img = img2;
265	}	454	}
266		455
267	for (int y = 0; y < height; y++)
268	{
269	for (int x = 0; x < width; x++)
270	{
271	unsigned char pixel = row + x channels;
272	uint32_t value;
273	unsigned char r, g, b, a;
274
275	if (channels == 4)
276	{
277	a = pixel[3];
278	r = (pixel[0] * a + c.r * (0xff - a)) / 0xff;
279	g = (pixel[1] * a + c.g * (0xff - a)) / 0xff;
280	b = (pixel[2] * a + c.b * (0xff - a)) / 0xff;
281	}
282	else
283	{
284	a = 0xff;
285	r = pixel[0];
286	g = pixel[1];
287	b = pixel[2];
288	}
289
290	value = ((r >> (8 - width_r)) << sh_r)
291	\| ((g >> (8 - width_g)) << sh_g)
292	\| ((b >> (8 - width_b)) << sh_b)
293	\| ((a >> (8 - width_a)) << sh_a);
294
295	if (ximage->bits_per_pixel == 32)
296	((uint32_t *)line)[x] = value;
297	else
298	XPutPixel (ximage, x, y, value);
299	}
300
301	row += rowstride;
302	line += ximage->bytes_per_line;
303	}
304
305	XPutImage (dpy, pm, gc, ximage, 0, 0, dst_x, dst_y, width, height);
306	XDestroyImage (ximage);
307	XFreeGC (dpy, gc);
308
309	return true;
310	}
311
312	rxvt_img *
313	rxvt_img::clone ()
314	{
315	rxvt_img *img = new rxvt_img (s, format, w, h);
316
317	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
318	XCopyArea (s->display->dpy, pm, img->pm, gc, 0, 0, w, h, 0, 0);
319	XFreeGC (s->display->dpy, gc);
320
321	return img;	456	return img;
322	}	457	}
323		458
324	rxvt_img *	459	rxvt_img *
325	rxvt_img::sub_rect (int x, int y, int width, int height, int repeat)	460	rxvt_img::transform (int new_width, int new_height, double matrix[9])
326	{	461	{
327	rxvt_img *img = new rxvt_img (s, format, width, height);	462	rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat);
		463	img->alloc ();
328		464
329	Display *dpy = s->display->dpy;	465	Display *dpy = s->display->dpy;
330	XRenderPictureAttributes pa;	466	Picture src = src_picture ();
331	pa.repeat = repeat;
332	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
333	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	467	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
334
335	XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, width, height);
336
337	XRenderFreePicture (dpy, src);
338	XRenderFreePicture (dpy, dst);
339
340	return img;
341	}
342
343	rxvt_img *
344	rxvt_img::transform (int new_width, int new_height, double matrix[9], int repeat)
345	{
346	rxvt_img *img = new rxvt_img (s, format, new_width, new_height);
347
348	Display *dpy = s->display->dpy;
349	XRenderPictureAttributes pa;
350	pa.repeat = repeat;
351	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
352	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
353		468
354	XTransform xfrm;	469	XTransform xfrm;
355		470
356	for (int i = 0; i < 3; ++i)	471	for (int i = 0; i < 3; ++i)
357	for (int j = 0; j < 3; ++j)	472	for (int j = 0; j < 3; ++j)
358	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);	473	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
359		474
		475	#if 0
		476	xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
		477	xfrm.matrix [1][2] -= XDoubleToFixed (y);
		478	#endif
		479
360	XRenderSetPictureFilter (dpy, src, "good", 0, 0);	480	XRenderSetPictureFilter (dpy, src, "good", 0, 0);
361	XRenderSetPictureTransform (dpy, src, &xfrm);	481	XRenderSetPictureTransform (dpy, src, &xfrm);
362	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);	482	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
363		483
364	XRenderFreePicture (dpy, src);	484	XRenderFreePicture (dpy, src);
…		…
368	}	488	}
369		489
370	rxvt_img *	490	rxvt_img *
371	rxvt_img::scale (int new_width, int new_height)	491	rxvt_img::scale (int new_width, int new_height)
372	{	492	{
		493	if (w == new_width && h == new_height)
		494	return clone ();
		495
373	double matrix[9] = {	496	double matrix[9] = {
374	w / (double)new_width, 0, 0,	497	w / (double)new_width, 0, 0,
375	0, h / (double)new_height, 0,	498	0, h / (double)new_height, 0,
376	0, 0, 1	499	0, 0, 1
377	};	500	};
378		501
		502	int old_repeat_mode = repeat;
		503	repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems
		504
379	return transform (new_width, new_height, matrix);	505	rxvt_img *img = transform (new_width, new_height, matrix);
380	}
381		506
		507	repeat = old_repeat_mode;
		508	img->repeat = repeat;
		509
		510	return img;
		511	}
		512
382	rxvt_img *	513	rxvt_img *
383	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi, int repeat)	514	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)
384	{	515	{
385	double s = sin (phi);	516	double s = sin (phi);
386	double c = cos (phi);	517	double c = cos (phi);
387		518
388	double matrix[9] = {	519	double matrix[9] = {
389	c, -s, -c * x + s * y + x,	520	c, -s, -c * x + s * y + x,
390	s, c, -s * x - c * y + y,	521	s, c, -s * x - c * y + y,
391	0, 0, 1	522	0, 0, 1
392	};	523	};
393		524
394	return transform (new_width, new_height, matrix, repeat);	525	return transform (new_width, new_height, matrix);
395	}	526	}
396		527
397	rxvt_img *	528	rxvt_img *
398	rxvt_img::convert_to (XRenderPictFormat *new_format)	529	rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)
399	{	530	{
		531	if (new_format == format)
		532	return clone ();
		533
400	rxvt_img *img = new rxvt_img (s, new_format, w, h);	534	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
		535	img->alloc ();
401		536
402	Display *dpy = s->display->dpy;	537	Display *dpy = s->display->dpy;
403	Picture src = XRenderCreatePicture (dpy, pm, format, 0, 0);	538	Picture src = src_picture ();
404	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);	539	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
		540	int op = PictOpSrc;
405		541
		542	if (format->direct.alphaMask && !new_format->direct.alphaMask)
		543	{
		544	// does it have to be that complicated
		545	rgba c;
		546	bg.get (c);
		547
		548	XRenderColor rc = { c.r, c.g, c.b, 0xffff };
		549	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
		550
		551	op = PictOpOver;
		552	}
		553
406	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	554	XRenderComposite (dpy, op, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
407		555
408	XRenderFreePicture (dpy, src);
409	XRenderFreePicture (dpy, dst);	556	XRenderFreePicture (dpy, src);
		557	XRenderFreePicture (dpy, dst);
410		558
		559	return img;
		560	}
		561
		562	rxvt_img *
		563	rxvt_img::blend (rxvt_img *img, double factor)
		564	{
		565	rxvt_img *img2 = clone ();
		566	Display *dpy = s->display->dpy;
		567	Picture src = img->src_picture ();
		568	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
		569	Picture mask = create_xrender_mask (dpy, img->pm, False);
		570
		571	XRenderColor mask_c;
		572
		573	mask_c.alpha = float_to_component (factor);
		574	mask_c.red =
		575	mask_c.green =
		576	mask_c.blue = 0;
		577	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
		578
		579	XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, w, h);
		580
		581	XRenderFreePicture (dpy, src);
		582	XRenderFreePicture (dpy, dst);
		583	XRenderFreePicture (dpy, mask);
		584
411	return img;	585	return img2;
412	}	586	}
413		587
414	#endif	588	#endif
415		589

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.20 by root, Tue Jun 5 14:07:47 2012 UTC vs. Revision 1.53 by root, Thu Jun 7 20:22:40 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.20 by root, Tue Jun 5 14:07:47 2012 UTC vs.
Revision 1.53 by root, Thu Jun 7 20:22:40 2012 UTC