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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.12 by root, Mon Jun 4 15:28:49 2012 UTC vs.
Revision 1.74 by root, Sat Jun 9 19:20:04 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	{
		11	}
		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	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))
		36	return 0;
		37
		38	rxvt_img *img = new rxvt_img (
		39	s,
		40	XRenderFindVisualFormat (dpy, DefaultVisual (dpy, s->display->screen)),
		41	0,
		42	0,
		43	root_pm_w,
		44	root_pm_h
		45	);
		46
		47	img->pm = root_pixmap;
		48	img->ref = new pixref (root_pm_w, root_pm_h);
		49	img->ref->ours = false;
		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;
18	}	155	}
19		156
20	rxvt_img *	157	rxvt_img *
21	rxvt_img::new_from_file (rxvt_screen s, const char filename)	158	rxvt_img::new_from_file (rxvt_screen s, const char filename)
22	{	159	{
…		…
24	GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);	161	GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);
25		162
26	if (!pb)	163	if (!pb)
27	rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);	164	rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);
28		165
29	rxvt_img *img = new rxvt_img (	166	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		167
36	img->render (pb, 0, 0, img->w, img->h, 0, 0);	168	g_object_unref (pb);
37		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 ();
44	XFreePixmap (s->display->dpy, pm);	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;
45	}	208	}
46		209
47	void	210	void
48	rxvt_img::unshare ()	211	rxvt_img::unshare ()
49	{	212	{
50	if (!shared)	213	if (ref->cnt == 1 && ref->ours)
51	return;	214	return;
52		215
53	rxvt_img *img = clone ();	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);
		219	XFreeGC (s->display->dpy, gc);
54		220
55	::swap (pm , img->pm);	221	destroy ();
56	::swap (shared, img->shared);
57		222
58	delete img;	223	pm = pm2;
		224	ref = new pixref (ref->w, ref->h);
59	}	225	}
60		226
61	void	227	void
62	rxvt_img::fill (const rxvt_color &c)	228	rxvt_img::fill (const rxvt_color &c)
63	{	229	{
…		…
87		253
88	for (int i = 0; i < width; i++)	254	for (int i = 0; i < width; i++)
89	params[i+2] = XDoubleToFixed (kernel[i] / sum);	255	params[i+2] = XDoubleToFixed (kernel[i] / sum);
90	}	256	}
91		257
92	void	258	rxvt_img *
93	rxvt_img::blur (int rh, int rv)	259	rxvt_img::blur (int rh, int rv)
94	{	260	{
95	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))	261	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
96	return;	262	return clone ();
97		263
98	Display *dpy = s->display->dpy;	264	Display *dpy = s->display->dpy;
99	int size = max (rh, rv) * 2 + 1;	265	int size = max (rh, rv) * 2 + 1;
100	double kernel = (double )malloc (size * sizeof (double));	266	double kernel = (double )malloc (size * sizeof (double));
101	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 ();
102		270
103	XRenderPictureAttributes pa;	271	XRenderPictureAttributes pa;
104
105	pa.repeat = RepeatPad;	272	pa.repeat = RepeatPad;
106	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
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);
115		284
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,
		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,
120	None,	304	None,
121	dst,	305	dst,
122	0, 0,	306	0, 0,
123	0, 0,	307	0, 0,
124	0, 0,	308	0, 0,
125	w, h);	309	w, h);
126
127	::swap (src, dst);
128
129	size = rv * 2 + 1;
130	get_gaussian_kernel (rv, size, kernel, params);
131	::swap (params[0], params[1]);
132
133	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
134	XRenderComposite (dpy,
135	PictOpSrc,
136	src,
137	None,
138	dst,
139	0, 0,
140	0, 0,
141	0, 0,
142	w, h);
143	}	310	}
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	{
154	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);	324	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
155		325
156	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);	326	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
		327	XRenderPictureAttributes pa;
		328	pa.repeat = RepeatNormal;
		329	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
		330
		331	XFreePixmap (dpy, pixmap);
		332
		333	return mask;
		334	}
		335
		336	static void
		337	extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
		338	{
		339	int32_t x = clamp (c, cl0, cl1);
		340	c -= x;
		341	xc = x;
		342	}
		343
		344	static bool
		345	extract (int32_t cl0, int32_t cl1, int32_t &r, int32_t &g, int32_t &b, int32_t &a, unsigned short &xr, unsigned short &xg, unsigned short &xb, unsigned short &xa)
		346	{
		347	extract (cl0, cl1, r, xr);
		348	extract (cl0, cl1, g, xg);
		349	extract (cl0, cl1, b, xb);
		350	extract (cl0, cl1, a, xa);
		351
		352	return xr \| xg \| xb \| xa;
		353	}
		354
		355	void
		356	rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
		357	{
		358	unshare ();
		359
		360	Display *dpy = s->display->dpy;
		361	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
		362
		363	// loop should not be needed for brightness, as only -1..1 makes sense
		364	//while (r \| g \| b \| a)
		365	{
		366	unsigned short xr, xg, xb, xa;
		367	XRenderColor mask_c;
		368
		369	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
		370	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
		371
		372	if (extract (-65535, 0, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
		373	{
		374	XRenderColor mask_w = { 65535, 65535, 65535, 65535 };
		375	XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
		376	mask_c.red = -mask_c.red; //TODO: verify that doing clamp, assign, and negation does the right thing
		377	mask_c.green = -mask_c.green;
		378	mask_c.blue = -mask_c.blue;
		379	mask_c.alpha = -mask_c.alpha;
		380	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
		381	XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
		382	}
		383	}
		384
		385	XRenderFreePicture (dpy, dst);
		386	}
		387
		388	void
		389	rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
		390	{
		391	if (r < 0 \|\| g < 0 \|\| b < 0 \|\| a < 0)
		392	rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
		393
		394	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
		395	img->alloc ();
		396
		397	{
		398	rxvt_color empty;
		399	empty.set (s, rgba (0, 0, 0, 0));
		400	img->fill (empty);
		401	}
		402
		403	// premultiply (yeah, these are not exact, sue me or fix it)
		404	r = (r * (a >> 8)) >> 8;
		405	g = (g * (a >> 8)) >> 8;
		406	b = (b * (a >> 8)) >> 8;
		407
		408	Display *dpy = s->display->dpy;
		409
		410	Picture src = src_picture ();
		411	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
		412	Picture mul = create_xrender_mask (dpy, pm, True);
		413
		414	XRenderPictureAttributes pa;
		415	pa.component_alpha = 1;
		416	XRenderChangePicture (dpy, mul, CPComponentAlpha, &pa);
		417
		418	//TODO: this operator does not yet implement some useful contrast
		419	while (r \| g \| b \| a)
		420	{
		421	unsigned short xr, xg, xb, xa;
		422	XRenderColor mask_c;
		423
		424	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
		425	{
		426	XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1);
		427	XRenderComposite (dpy, PictOpAdd, src, mul, dst, 0, 0, 0, 0, 0, 0, w, h);
		428	}
		429	}
		430
		431	XRenderFreePicture (dpy, mul);
		432	XRenderFreePicture (dpy, dst);
		433	XRenderFreePicture (dpy, src);
		434
		435	::swap (img->ref, ref);
		436	::swap (img->pm , pm );
		437
		438	delete img;
		439	}
		440
		441	rxvt_img *
		442	rxvt_img::clone ()
		443	{
		444	return new rxvt_img (*this);
		445	}
		446
		447	static XRenderPictFormat *
		448	find_alpha_format_for (Display dpy, XRenderPictFormat format)
		449	{
		450	if (format->direct.alphaMask)
		451	return format; // already has alpha
		452
		453	// try to find a suitable alpha format, one bit alpha is enough for our purposes
		454	if (format->type == PictTypeDirect)
		455	for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
		456	if (f->direct.alphaMask
		457	&& f->type == PictTypeDirect
		458	&& ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
		459	&& ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
		460	&& ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
		461	return f;
		462
		463	// should be a very good fallback
		464	return XRenderFindStandardFormat (dpy, PictStandardARGB32);
		465	}
		466
		467	rxvt_img *
		468	rxvt_img::reify ()
		469	{
		470	if (x == 0 && y == 0 && w == ref->w && h == ref->h)
		471	return clone ();
		472
		473	Display *dpy = s->display->dpy;
		474
		475	// add an alpha channel if...
		476	bool alpha = !format->direct.alphaMask // pixmap has none yet
		477	&& (x \|\| y) // we need one because of non-zero offset
		478	&& repeat == RepeatNone; // and we have no good pixels to fill with
		479
		480	rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
		481	img->alloc ();
		482
		483	Picture src = src_picture ();
		484	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
		485
		486	if (alpha)
		487	{
		488	XRenderColor rc = { 0, 0, 0, 0 };
		489	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
		490	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h);
		491	}
		492	else
		493	XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);
		494
		495	XRenderFreePicture (dpy, src);
		496	XRenderFreePicture (dpy, dst);
		497
		498	return img;
		499	}
		500
		501	rxvt_img *
		502	rxvt_img::sub_rect (int x, int y, int width, int height)
		503	{
		504	rxvt_img *img = clone ();
		505
		506	img->x += x;
		507	img->y += y;
		508
		509	if (w != width \|\| h != height)
		510	{
		511	img->w = width;
		512	img->h = height;
		513
		514	rxvt_img *img2 = img->reify ();
		515	delete img;
		516	img = img2;
		517	}
		518
		519	return img;
		520	}
		521
		522	rxvt_img *
		523	rxvt_img::transform (int new_width, int new_height, double matrix[9])
		524	{
		525	rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat);
		526	img->alloc ();
		527
		528	Display *dpy = s->display->dpy;
		529	Picture src = src_picture ();
		530	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
		531
		532	XTransform xfrm;
		533
		534	for (int i = 0; i < 3; ++i)
		535	for (int j = 0; j < 3; ++j)
		536	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
		537
		538	xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
		539	xfrm.matrix [1][2] -= XDoubleToFixed (y);
		540
		541	XRenderSetPictureFilter (dpy, src, "good", 0, 0);
		542	XRenderSetPictureTransform (dpy, src, &xfrm);
		543	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
		544
		545	XRenderFreePicture (dpy, src);
		546	XRenderFreePicture (dpy, dst);
		547
		548	return img;
		549	}
		550
		551	rxvt_img *
		552	rxvt_img::scale (int new_width, int new_height)
		553	{
		554	if (w == new_width && h == new_height)
		555	return clone ();
		556
		557	double matrix[9] = {
		558	w / (double)new_width, 0, 0,
		559	0, h / (double)new_height, 0,
		560	0, 0, 1
		561	};
		562
		563	int old_repeat_mode = repeat;
		564	repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems
		565
		566	rxvt_img *img = transform (new_width, new_height, matrix);
		567
		568	repeat = old_repeat_mode;
		569	img->repeat = repeat;
		570
		571	return img;
		572	}
		573
		574	rxvt_img *
		575	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)
		576	{
		577	double s = sin (phi);
		578	double c = cos (phi);
		579
		580	double matrix[9] = {
		581	c, -s, -c * x + s * y + x,
		582	s, c, -s * x - c * y + y,
		583	0, 0, 1
		584	};
		585
		586	return transform (new_width, new_height, matrix);
		587	}
		588
		589	rxvt_img *
		590	rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)
		591	{
		592	if (new_format == format)
		593	return clone ();
		594
		595	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
		596	img->alloc ();
		597
		598	Display *dpy = s->display->dpy;
		599	Picture src = src_picture ();
		600	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
		601	int op = PictOpSrc;
		602
		603	if (format->direct.alphaMask && !new_format->direct.alphaMask)
		604	{
		605	// does it have to be that complicated
		606	rgba c;
		607	bg.get (c);
		608
		609	XRenderColor rc = { c.r, c.g, c.b, 0xffff };
		610	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
		611
		612	op = PictOpOver;
		613	}
		614
		615	XRenderComposite (dpy, op, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		616
		617	XRenderFreePicture (dpy, src);
		618	XRenderFreePicture (dpy, dst);
		619
		620	return img;
		621	}
		622
		623	rxvt_img *
		624	rxvt_img::blend (rxvt_img *img, double factor)
		625	{
		626	rxvt_img *img2 = clone ();
		627	Display *dpy = s->display->dpy;
		628	Picture src = img->src_picture ();
		629	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
		630
		631	Pixmap pixmap = XCreatePixmap (dpy, img->pm, 1, 1, 8);
		632	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, PictStandardA8);
157	XRenderPictureAttributes pa;	633	XRenderPictureAttributes pa;
158	pa.repeat = True;	634	pa.repeat = True;
159	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);	635	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
160
161	XFreePixmap (dpy, pixmap);	636	XFreePixmap (dpy, pixmap);
162		637
163	return mask;
164	}
165
166	void
167	rxvt_img::brightness (double r, double g, double b, double a)
168	{
169	Display *dpy = s->display->dpy;
170	Picture src = create_xrender_mask (dpy, pm, True);
171	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
172
173	XRenderColor mask_c;	638	XRenderColor mask_c;
174	mask_c.red = float_to_component (r);	639
175	mask_c.green = float_to_component (g);
176	mask_c.blue = float_to_component (b);
177	mask_c.alpha = float_to_component (a);	640	mask_c.alpha = float_to_component (factor);
		641	mask_c.red =
		642	mask_c.green =
		643	mask_c.blue = 0;
178	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	644	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
179		645
180	XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	646	XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, w, h);
181	}
182
183	void
184	rxvt_img::contrast (double r, double g, double b, double a)
185	{
186	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
187	return;
188
189	Display *dpy = s->display->dpy;
190	Picture src = create_xrender_mask (dpy, pm, True);
191	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
192
193	XRenderColor mask_c;
194	mask_c.red = float_to_component (r);
195	mask_c.green = float_to_component (g);
196	mask_c.blue = float_to_component (b);
197	mask_c.alpha = float_to_component (a);
198	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
199
200	XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
201	}
202
203	void
204	rxvt_img::render (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y)
205	{
206	//TODO
207	}
208
209	rxvt_img *
210	rxvt_img::clone ()
211	{
212	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
213	Pixmap pm2 = XCreatePixmap (s->display->dpy, pm, w, h, format->depth);
214	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, w, h, 0, 0);
215	XFreeGC (s->display->dpy, gc);
216	return new rxvt_img (s, format, w, h, pm2);
217	}
218
219	rxvt_img *
220	rxvt_img::transform (int new_width, int new_height, int repeat, double matrix[9])
221	{
222	rxvt_img *img = new rxvt_img (s, format, new_width, new_height);
223
224	Display *dpy = s->display->dpy;
225	Picture src = XRenderCreatePicture (dpy, pm, format, 0, 0);
226	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
227
228	XTransform xfrm;
229
230	for (int i = 0; i < 3; ++i)
231	for (int j = 0; j < 3; ++j)
232	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
233
234	XRenderSetPictureTransform (dpy, src, &xfrm);
235	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
236		647
237	XRenderFreePicture (dpy, src);	648	XRenderFreePicture (dpy, src);
238	XRenderFreePicture (dpy, dst);	649	XRenderFreePicture (dpy, dst);
		650	XRenderFreePicture (dpy, mask);
239		651
240	return img;	652	return img2;
241	}
242
243	rxvt_img *
244	rxvt_img::scale (int new_width, int new_height)
245	{
246	double matrix[9] = {
247	new_width / (double)w, 0, 0,
248	0, new_height / (double)h, 0,
249	0, 0, 1
250	};
251
252	return transform (new_width, new_height, RepeatNormal, matrix);
253	}
254
255	rxvt_img *
256	rxvt_img::convert_to (XRenderPictFormat *new_format)
257	{
258	rxvt_img *img = new rxvt_img (s, new_format, w, h);
259
260	Display *dpy = s->display->dpy;
261	Picture src = XRenderCreatePicture (dpy, pm, format, 0, 0);
262	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
263
264	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
265
266	XRenderFreePicture (dpy, src);
267	XRenderFreePicture (dpy, dst);
268
269	return img;
270	}	653	}
271		654
272	#endif	655	#endif
273		656

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.12 by root, Mon Jun 4 15:28:49 2012 UTC vs. Revision 1.74 by root, Sat Jun 9 19:20:04 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.12 by root, Mon Jun 4 15:28:49 2012 UTC vs.
Revision 1.74 by root, Sat Jun 9 19:20:04 2012 UTC