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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.13 by root, Mon Jun 4 15:30:41 2012 UTC vs.
Revision 1.31 by sf-exg, Thu Jun 7 06:08:09 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 width, int height)
10	: s(screen), w(width), h(height), format(format), shared(false)	8	: s(screen), x(0), y(0), w(width), h(height), format(format), repeat(RepeatNormal), shared(false)
11	{	9	{
12	pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);	10	pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);
13	}	11	}
14		12
15	rxvt_img::rxvt_img (rxvt_screen screen, XRenderPictFormat format, int width, int height, Pixmap pixmap)	13	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)	14	: s(screen), x(0), y(0), w(width), h(height), format(format), repeat(RepeatNormal), shared(false), pm(pixmap)
17	{	15	{
		16	}
		17
		18	rxvt_img *
		19	rxvt_img::new_from_root (rxvt_screen *s)
		20	{
		21	Display *dpy = s->display->dpy;
		22	unsigned int root_pm_w, root_pm_h;
		23	Pixmap root_pixmap = s->display->get_pixmap_property (s->display->xa[XA_XROOTPMAP_ID]);
		24	if (root_pixmap == None)
		25	root_pixmap = s->display->get_pixmap_property (s->display->xa[XA_ESETROOT_PMAP_ID]);
		26
		27	if (root_pixmap == None)
		28	return 0;
		29
		30	Window wdummy;
		31	int idummy;
		32	unsigned int udummy;
		33
		34	if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pm_w, &root_pm_h, &udummy, &udummy))
		35	return 0;
		36
		37	rxvt_img *img = new rxvt_img (
		38	s,
		39	XRenderFindVisualFormat (dpy, DefaultVisual (dpy, s->display->screen)),
		40	root_pm_w,
		41	root_pm_h,
		42	root_pixmap
		43	);
		44
		45	img->shared = true;
		46
		47	return img;
18	}	48	}
19		49
20	rxvt_img *	50	rxvt_img *
21	rxvt_img::new_from_file (rxvt_screen s, const char filename)	51	rxvt_img::new_from_file (rxvt_screen s, const char filename)
22	{	52	{
…		…
31	XRenderFindStandardFormat (s->display->dpy, gdk_pixbuf_get_has_alpha (pb) ? PictStandardARGB32 : PictStandardRGB24),	61	XRenderFindStandardFormat (s->display->dpy, gdk_pixbuf_get_has_alpha (pb) ? PictStandardARGB32 : PictStandardRGB24),
32	gdk_pixbuf_get_width (pb),	62	gdk_pixbuf_get_width (pb),
33	gdk_pixbuf_get_height (pb)	63	gdk_pixbuf_get_height (pb)
34	);	64	);
35		65
36	img->render (pb, 0, 0, img->w, img->h, 0, 0);	66	img->render_pixbuf (pb, 0, 0, img->w, img->h, 0, 0);
		67
		68	g_object_unref (pb);
37		69
38	return img;	70	return img;
39	}	71	}
40		72
41	rxvt_img::~rxvt_img ()	73	rxvt_img::~rxvt_img ()
…		…
87		119
88	for (int i = 0; i < width; i++)	120	for (int i = 0; i < width; i++)
89	params[i+2] = XDoubleToFixed (kernel[i] / sum);	121	params[i+2] = XDoubleToFixed (kernel[i] / sum);
90	}	122	}
91		123
92	void	124	rxvt_img *
93	rxvt_img::blur (int rh, int rv)	125	rxvt_img::blur (int rh, int rv)
94	{	126	{
95	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))	127	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
96	return;	128	return clone ();
97		129
98	Display *dpy = s->display->dpy;	130	Display *dpy = s->display->dpy;
99	int size = max (rh, rv) * 2 + 1;	131	int size = max (rh, rv) * 2 + 1;
100	double kernel = (double )malloc (size * sizeof (double));	132	double kernel = (double )malloc (size * sizeof (double));
101	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	133	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
		134	rxvt_img *img = new rxvt_img (s, format, w, h);
102		135
103	XRenderPictureAttributes pa;	136	XRenderPictureAttributes pa;
104		137
105	pa.repeat = RepeatPad;	138	pa.repeat = RepeatPad;
106	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);	139	Picture src = XRenderCreatePicture (dpy, pm , format, CPRepeat, &pa);
		140	Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa);
		141
107	Pixmap tmp = XCreatePixmap (dpy, pm, w, h, format->depth);	142	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
108	Picture dst = XRenderCreatePicture (dpy, tmp, format, CPRepeat, &pa);	143	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
109	XFreePixmap (dpy, tmp);	144	XFreePixmap (dpy, tmp_pm);
110		145
111	if (kernel && params)	146	if (kernel && params)
112	{	147	{
113	size = rh * 2 + 1;	148	size = rh * 2 + 1;
114	get_gaussian_kernel (rh, size, kernel, params);	149	get_gaussian_kernel (rh, size, kernel, params);
…		…
116	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);	151	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
117	XRenderComposite (dpy,	152	XRenderComposite (dpy,
118	PictOpSrc,	153	PictOpSrc,
119	src,	154	src,
120	None,	155	None,
121	dst,	156	tmp,
122	0, 0,	157	0, 0,
123	0, 0,	158	0, 0,
124	0, 0,	159	0, 0,
125	w, h);	160	w, h);
126
127	::swap (src, dst);
128		161
129	size = rv * 2 + 1;	162	size = rv * 2 + 1;
130	get_gaussian_kernel (rv, size, kernel, params);	163	get_gaussian_kernel (rv, size, kernel, params);
131	::swap (params[0], params[1]);	164	::swap (params[0], params[1]);
132		165
133	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);	166	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
134	XRenderComposite (dpy,	167	XRenderComposite (dpy,
135	PictOpSrc,	168	PictOpSrc,
136	src,	169	tmp,
137	None,	170	None,
138	dst,	171	dst,
139	0, 0,	172	0, 0,
140	0, 0,	173	0, 0,
141	0, 0,	174	0, 0,
…		…
144		177
145	free (kernel);	178	free (kernel);
146	free (params);	179	free (params);
147	XRenderFreePicture (dpy, src);	180	XRenderFreePicture (dpy, src);
148	XRenderFreePicture (dpy, dst);	181	XRenderFreePicture (dpy, dst);
		182	XRenderFreePicture (dpy, tmp);
		183
		184	return img;
149	}	185	}
150		186
151	static Picture	187	static Picture
152	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb)	188	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb)
153	{	189	{
…		…
162		198
163	return mask;	199	return mask;
164	}	200	}
165		201
166	void	202	void
167	rxvt_img::brightness (double r, double g, double b, double a)	203	rxvt_img::brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a)
168	{	204	{
169	Display *dpy = s->display->dpy;	205	Display *dpy = s->display->dpy;
170	Picture src = create_xrender_mask (dpy, pm, True);	206	Picture src = create_xrender_mask (dpy, pm, True);
171	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	207	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
172		208
173	XRenderColor mask_c;	209	XRenderColor mask_c;
174	mask_c.red = float_to_component (r);	210	mask_c.red = r;
175	mask_c.green = float_to_component (g);	211	mask_c.green = g;
176	mask_c.blue = float_to_component (b);	212	mask_c.blue = b;
177	mask_c.alpha = float_to_component (a);	213	mask_c.alpha = a;
178	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	214	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
179		215
180	XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	216	XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		217
		218	XRenderFreePicture (dpy, src);
		219	XRenderFreePicture (dpy, dst);
181	}	220	}
182		221
183	void	222	void
184	rxvt_img::contrast (double r, double g, double b, double a)	223	rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a)
185	{	224	{
186	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))	225	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
187	return;	226	return;
188		227
189	Display *dpy = s->display->dpy;	228	Display *dpy = s->display->dpy;
190	Picture src = create_xrender_mask (dpy, pm, True);	229	Picture src = create_xrender_mask (dpy, pm, True);
191	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	230	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
192		231
193	XRenderColor mask_c;	232	XRenderColor mask_c;
194	mask_c.red = float_to_component (r);	233	mask_c.red = r;
195	mask_c.green = float_to_component (g);	234	mask_c.green = g;
196	mask_c.blue = float_to_component (b);	235	mask_c.blue = b;
197	mask_c.alpha = float_to_component (a);	236	mask_c.alpha = a;
198	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	237	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
199		238
200	XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	239	XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
201	}
202		240
203	void	241	XRenderFreePicture (dpy, src);
		242	XRenderFreePicture (dpy, dst);
		243	}
		244
		245	bool
204	rxvt_img::render (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y)	246	rxvt_img::render_pixbuf (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y)
205	{	247	{
206	//TODO	248	Display *dpy = s->display->dpy;
		249
		250	if (s->visual->c_class != TrueColor)
		251	return false;
		252
		253	uint32_t red_mask, green_mask, blue_mask, alpha_mask;
		254
		255	red_mask = (uint32_t)format->direct.redMask << format->direct.red;
		256	green_mask = (uint32_t)format->direct.greenMask << format->direct.green;
		257	blue_mask = (uint32_t)format->direct.blueMask << format->direct.blue;
		258	alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha;
		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;
		267
		268	int sh_r = ecb_ctz32 (red_mask);
		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
		273	if (width > 32767 \|\| height > 32767)
		274	return false;
		275
		276	XImage *ximage = XCreateImage (dpy, s->visual, format->depth, ZPixmap, 0, 0,
		277	width, height, 32, 0);
		278	if (!ximage)
		279	return false;
		280
		281	if (height > INT_MAX / ximage->bytes_per_line
		282	\|\| !(ximage->data = (char )malloc (height ximage->bytes_per_line)))
		283	{
		284	XDestroyImage (ximage);
		285	return false;
		286	}
		287
		288	GC gc = XCreateGC (dpy, pm, 0, 0);
		289
		290	ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
		291
		292	int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
		293	int channels = gdk_pixbuf_get_n_channels (pixbuf);
		294	unsigned char row = gdk_pixbuf_get_pixels (pixbuf) + src_y rowstride + src_x * channels;
		295	char *line = ximage->data;
		296
		297	for (int y = 0; y < height; y++)
		298	{
		299	for (int x = 0; x < width; x++)
		300	{
		301	unsigned char pixel = row + x channels;
		302	uint32_t value;
		303	unsigned char r, g, b, a;
		304
		305	if (channels == 4)
		306	{
		307	a = pixel[3];
		308	r = pixel[0] * a / 0xff;
		309	g = pixel[1] * a / 0xff;
		310	b = pixel[2] * a / 0xff;
		311	}
		312	else
		313	{
		314	a = 0xff;
		315	r = pixel[0];
		316	g = pixel[1];
		317	b = pixel[2];
		318	}
		319
		320	value = ((r >> (8 - width_r)) << sh_r)
		321	\| ((g >> (8 - width_g)) << sh_g)
		322	\| ((b >> (8 - width_b)) << sh_b)
		323	\| ((a >> (8 - width_a)) << sh_a);
		324
		325	if (ximage->bits_per_pixel == 32)
		326	((uint32_t *)line)[x] = value;
		327	else
		328	XPutPixel (ximage, x, y, value);
		329	}
		330
		331	row += rowstride;
		332	line += ximage->bytes_per_line;
		333	}
		334
		335	XPutImage (dpy, pm, gc, ximage, 0, 0, dst_x, dst_y, width, height);
		336	XDestroyImage (ximage);
		337	XFreeGC (dpy, gc);
		338
		339	return true;
207	}	340	}
208		341
209	rxvt_img *	342	rxvt_img *
210	rxvt_img::clone ()	343	rxvt_img::clone ()
211	{	344	{
		345	rxvt_img *img = new rxvt_img (s, format, w, h);
		346
212	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);	347	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);	348	XCopyArea (s->display->dpy, pm, img->pm, gc, 0, 0, w, h, 0, 0);
215	XFreeGC (s->display->dpy, gc);	349	XFreeGC (s->display->dpy, gc);
216	return new rxvt_img (s, format, w, h, pm2);
217	}
218		350
		351	return img;
		352	}
		353
219	rxvt_img *	354	rxvt_img *
220	rxvt_img::transform (int new_width, int new_height, int repeat, double matrix[9])	355	rxvt_img::sub_rect (int x, int y, int width, int height)
221	{	356	{
222	rxvt_img *img = new rxvt_img (s, format, new_width, new_height);	357	rxvt_img *img = new rxvt_img (s, format, width, height);
223		358
224	Display *dpy = s->display->dpy;	359	Display *dpy = s->display->dpy;
225	XRenderPictureAttributes pa;	360	XRenderPictureAttributes pa;
226	pa.repeat = repeat;	361	pa.repeat = repeat;
227	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);	362	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
228	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	363	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
229		364
		365	XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, width, height);
		366
		367	XRenderFreePicture (dpy, src);
		368	XRenderFreePicture (dpy, dst);
		369
		370	return img;
		371	}
		372
		373	rxvt_img *
		374	rxvt_img::transform (int new_width, int new_height, double matrix[9])
		375	{
		376	rxvt_img *img = new rxvt_img (s, format, new_width, new_height);
		377
		378	Display *dpy = s->display->dpy;
		379	XRenderPictureAttributes pa;
		380	pa.repeat = repeat;
		381	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
		382	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
		383
230	XTransform xfrm;	384	XTransform xfrm;
231		385
232	for (int i = 0; i < 3; ++i)	386	for (int i = 0; i < 3; ++i)
233	for (int j = 0; j < 3; ++j)	387	for (int j = 0; j < 3; ++j)
234	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);	388	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
235		389
		390	XRenderSetPictureFilter (dpy, src, "good", 0, 0);
236	XRenderSetPictureTransform (dpy, src, &xfrm);	391	XRenderSetPictureTransform (dpy, src, &xfrm);
237	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);	392	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
238		393
239	XRenderFreePicture (dpy, src);	394	XRenderFreePicture (dpy, src);
240	XRenderFreePicture (dpy, dst);	395	XRenderFreePicture (dpy, dst);
…		…
244		399
245	rxvt_img *	400	rxvt_img *
246	rxvt_img::scale (int new_width, int new_height)	401	rxvt_img::scale (int new_width, int new_height)
247	{	402	{
248	double matrix[9] = {	403	double matrix[9] = {
249	new_width / (double)w, 0, 0,	404	w / (double)new_width, 0, 0,
250	0, new_height / (double)h, 0,	405	0, h / (double)new_height, 0,
251	0, 0, 1	406	0, 0, 1
252	};	407	};
253		408
254	return transform (new_width, new_height, RepeatNormal, matrix);	409	return transform (new_width, new_height, matrix);
255	}	410	}
256		411
257	rxvt_img *	412	rxvt_img *
		413	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)
		414	{
		415	double s = sin (phi);
		416	double c = cos (phi);
		417
		418	double matrix[9] = {
		419	c, -s, -c * x + s * y + x,
		420	s, c, -s * x - c * y + y,
		421	0, 0, 1
		422	};
		423
		424	return transform (new_width, new_height, matrix);
		425	}
		426
		427	rxvt_img *
258	rxvt_img::convert_to (XRenderPictFormat *new_format)	428	rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg)
259	{	429	{
260	rxvt_img *img = new rxvt_img (s, new_format, w, h);	430	rxvt_img *img = new rxvt_img (s, new_format, w, h);
261		431
262	Display *dpy = s->display->dpy;	432	Display *dpy = s->display->dpy;
263	Picture src = XRenderCreatePicture (dpy, pm, format, 0, 0);	433	Picture src = XRenderCreatePicture (dpy, pm, format, 0, 0);
264	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);	434	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
		435	int op = PictOpSrc;
265		436
		437	if (format->direct.alphaMask && !new_format->direct.alphaMask)
		438	{
		439	// does it have to be that complicated
		440	rgba c;
		441	bg.get (c);
		442
		443	XRenderColor rc = { c.r, c.g, c.b, 0xffff };
		444	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
		445
		446	op = PictOpOver;
		447	}
		448
266	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	449	XRenderComposite (dpy, op, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
267		450
268	XRenderFreePicture (dpy, src);
269	XRenderFreePicture (dpy, dst);	451	XRenderFreePicture (dpy, src);
		452	XRenderFreePicture (dpy, dst);
270		453
		454	return img;
		455	}
		456
		457	rxvt_img *
		458	rxvt_img::blend (rxvt_img *img, double factor)
		459	{
		460	rxvt_img *img2 = clone ();
		461	Display *dpy = s->display->dpy;
		462	Picture src = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
		463	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
		464	Picture mask = create_xrender_mask (dpy, img->pm, False);
		465
		466	XRenderColor mask_c;
		467
		468	mask_c.alpha = float_to_component (factor);
		469	mask_c.red =
		470	mask_c.green =
		471	mask_c.blue = 0;
		472	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
		473
		474	XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, w, h);
		475
		476	XRenderFreePicture (dpy, src);
		477	XRenderFreePicture (dpy, dst);
		478	XRenderFreePicture (dpy, mask);
		479
271	return img;	480	return img2;
272	}	481	}
273		482
274	#endif	483	#endif
275		484

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.13 by root, Mon Jun 4 15:30:41 2012 UTC vs. Revision 1.31 by sf-exg, Thu Jun 7 06:08:09 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.13 by root, Mon Jun 4 15:30:41 2012 UTC vs.
Revision 1.31 by sf-exg, Thu Jun 7 06:08:09 2012 UTC