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

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

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.19 by root, Tue Jun 5 13:39:26 2012 UTC vs. Revision 1.72 by sf-exg, Sat Jun 9 16:21:16 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.19 by root, Tue Jun 5 13:39:26 2012 UTC vs.
Revision 1.72 by sf-exg, Sat Jun 9 16:21:16 2012 UTC