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

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

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.21 by sf-exg, Tue Jun 5 14:59:44 2012 UTC vs. Revision 1.56 by root, Thu Jun 7 20:31:26 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.21 by sf-exg, Tue Jun 5 14:59:44 2012 UTC vs.
Revision 1.56 by root, Thu Jun 7 20:31:26 2012 UTC