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

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

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.24 by sf-exg, Tue Jun 5 18:52:48 2012 UTC vs. Revision 1.54 by root, Thu Jun 7 20:24:39 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.24 by sf-exg, Tue Jun 5 18:52:48 2012 UTC vs.
Revision 1.54 by root, Thu Jun 7 20:24:39 2012 UTC