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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.3 by root, Sun Jun 3 10:14:44 2012 UTC vs.
Revision 1.31 by sf-exg, Thu Jun 7 06:08:09 2012 UTC

…		…
		1	#include <math.h>
1	#include "../config.h"	2	#include "../config.h"
2	#include "rxvt.h"	3	#include "rxvt.h"
3		4
4	#if HAVE_IMG	5	#if HAVE_IMG
5		6
6	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)
7	: s(screen), w(width), h(height), format(format)	8	: s(screen), x(0), y(0), w(width), h(height), format(format), repeat(RepeatNormal), shared(false)
8	{	9	{
9	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);
10	}	11	}
11		12
12	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)
13	: s(screen), pm(pixmap), w(width), h(height), format(format)	14	: s(screen), x(0), y(0), w(width), h(height), format(format), repeat(RepeatNormal), shared(false), pm(pixmap)
14	{	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;
		48	}
		49
		50	rxvt_img *
		51	rxvt_img::new_from_file (rxvt_screen s, const char filename)
		52	{
		53	GError *err = 0;
		54	GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);
		55
		56	if (!pb)
		57	rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);
		58
		59	rxvt_img *img = new rxvt_img (
		60	s,
		61	XRenderFindStandardFormat (s->display->dpy, gdk_pixbuf_get_has_alpha (pb) ? PictStandardARGB32 : PictStandardRGB24),
		62	gdk_pixbuf_get_width (pb),
		63	gdk_pixbuf_get_height (pb)
		64	);
		65
		66	img->render_pixbuf (pb, 0, 0, img->w, img->h, 0, 0);
		67
		68	g_object_unref (pb);
		69
		70	return img;
15	}	71	}
16		72
17	rxvt_img::~rxvt_img ()	73	rxvt_img::~rxvt_img ()
18	{	74	{
19	if (pm)	75	if (!shared)
20	XFreePixmap (s->display->dpy, pm);	76	XFreePixmap (s->display->dpy, pm);
		77	}
		78
		79	void
		80	rxvt_img::unshare ()
		81	{
		82	if (!shared)
		83	return;
		84
		85	rxvt_img *img = clone ();
		86
		87	::swap (pm , img->pm);
		88	::swap (shared, img->shared);
		89
		90	delete img;
21	}	91	}
22		92
23	void	93	void
24	rxvt_img::fill (const rxvt_color &c)	94	rxvt_img::fill (const rxvt_color &c)
25	{	95	{
28	GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv);	98	GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv);
29	XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h);	99	XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h);
30	XFreeGC (s->display->dpy, gc);	100	XFreeGC (s->display->dpy, gc);
31	}	101	}
32		102
		103	static void
		104	get_gaussian_kernel (int radius, int width, double kernel, XFixed params)
		105	{
		106	double sigma = radius / 2.0;
		107	double scale = sqrt (2.0 * M_PI) * sigma;
		108	double sum = 0.0;
		109
		110	for (int i = 0; i < width; i++)
		111	{
		112	double x = i - width / 2;
		113	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
		114	sum += kernel[i];
		115	}
		116
		117	params[0] = XDoubleToFixed (width);
		118	params[1] = XDoubleToFixed (1);
		119
		120	for (int i = 0; i < width; i++)
		121	params[i+2] = XDoubleToFixed (kernel[i] / sum);
		122	}
		123
		124	rxvt_img *
		125	rxvt_img::blur (int rh, int rv)
		126	{
		127	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
		128	return clone ();
		129
		130	Display *dpy = s->display->dpy;
		131	int size = max (rh, rv) * 2 + 1;
		132	double kernel = (double )malloc (size * sizeof (double));
		133	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
		134	rxvt_img *img = new rxvt_img (s, format, w, h);
		135
		136	XRenderPictureAttributes pa;
		137
		138	pa.repeat = RepeatPad;
		139	Picture src = XRenderCreatePicture (dpy, pm , format, CPRepeat, &pa);
		140	Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa);
		141
		142	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
		143	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
		144	XFreePixmap (dpy, tmp_pm);
		145
		146	if (kernel && params)
		147	{
		148	size = rh * 2 + 1;
		149	get_gaussian_kernel (rh, size, kernel, params);
		150
		151	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
		152	XRenderComposite (dpy,
		153	PictOpSrc,
		154	src,
		155	None,
		156	tmp,
		157	0, 0,
		158	0, 0,
		159	0, 0,
		160	w, h);
		161
		162	size = rv * 2 + 1;
		163	get_gaussian_kernel (rv, size, kernel, params);
		164	::swap (params[0], params[1]);
		165
		166	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
		167	XRenderComposite (dpy,
		168	PictOpSrc,
		169	tmp,
		170	None,
		171	dst,
		172	0, 0,
		173	0, 0,
		174	0, 0,
		175	w, h);
		176	}
		177
		178	free (kernel);
		179	free (params);
		180	XRenderFreePicture (dpy, src);
		181	XRenderFreePicture (dpy, dst);
		182	XRenderFreePicture (dpy, tmp);
		183
		184	return img;
		185	}
		186
		187	static Picture
		188	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb)
		189	{
		190	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
		191
		192	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
		193	XRenderPictureAttributes pa;
		194	pa.repeat = True;
		195	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
		196
		197	XFreePixmap (dpy, pixmap);
		198
		199	return mask;
		200	}
		201
33	void	202	void
34	rxvt_img::blur (int rh, int rv)	203	rxvt_img::brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a)
35	{	204	{
36	//TODO	205	Display *dpy = s->display->dpy;
		206	Picture src = create_xrender_mask (dpy, pm, True);
		207	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
		208
		209	XRenderColor mask_c;
		210	mask_c.red = r;
		211	mask_c.green = g;
		212	mask_c.blue = b;
		213	mask_c.alpha = a;
		214	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
		215
		216	XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		217
		218	XRenderFreePicture (dpy, src);
		219	XRenderFreePicture (dpy, dst);
37	}	220	}
38		221
39	void	222	void
40	rxvt_img::brightness (double r, double g, double b, double a)	223	rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a)
41	{	224	{
42	//TODO	225	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
43	}	226	return;
44		227
45	void	228	Display *dpy = s->display->dpy;
46	rxvt_img::contrast (double r, double g, double b, double a)	229	Picture src = create_xrender_mask (dpy, pm, True);
47	{	230	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
48	//TODO
49	}
50		231
51	void	232	XRenderColor mask_c;
		233	mask_c.red = r;
		234	mask_c.green = g;
		235	mask_c.blue = b;
		236	mask_c.alpha = a;
		237	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
		238
		239	XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		240
		241	XRenderFreePicture (dpy, src);
		242	XRenderFreePicture (dpy, dst);
		243	}
		244
		245	bool
52	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)
53	{	247	{
54	//TODO	248	Display *dpy = s->display->dpy;
55	}
56		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;
		340	}
		341
57	rxvt_img *	342	rxvt_img *
58	rxvt_img::copy ()	343	rxvt_img::clone ()
59	{	344	{
		345	rxvt_img *img = new rxvt_img (s, format, w, h);
		346
60	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);	347	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
61	Pixmap pm2 = XCreatePixmap (s->display->dpy, pm, w, h, format->depth);
62	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);
63	XFreeGC (s->display->dpy, gc);	349	XFreeGC (s->display->dpy, gc);
64	return new rxvt_img (s, format, w, h, pm2);
65	}
66		350
		351	return img;
		352	}
		353
67	rxvt_img *	354	rxvt_img *
		355	rxvt_img::sub_rect (int x, int y, int width, int height)
		356	{
		357	rxvt_img *img = new rxvt_img (s, format, width, height);
		358
		359	Display *dpy = s->display->dpy;
		360	XRenderPictureAttributes pa;
		361	pa.repeat = repeat;
		362	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
		363	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
		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 *
68	rxvt_img::transform (int new_width, int new_height, double matrix[16])	374	rxvt_img::transform (int new_width, int new_height, double matrix[9])
69	{	375	{
70	//TODO	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
		384	XTransform xfrm;
		385
		386	for (int i = 0; i < 3; ++i)
		387	for (int j = 0; j < 3; ++j)
		388	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
		389
		390	XRenderSetPictureFilter (dpy, src, "good", 0, 0);
		391	XRenderSetPictureTransform (dpy, src, &xfrm);
		392	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
		393
		394	XRenderFreePicture (dpy, src);
		395	XRenderFreePicture (dpy, dst);
		396
		397	return img;
71	}	398	}
72		399
73	rxvt_img *	400	rxvt_img *
74	rxvt_img::scale (int new_width, int new_height)	401	rxvt_img::scale (int new_width, int new_height)
75	{	402	{
76	// use transform	403	double matrix[9] = {
77	//TODO	404	w / (double)new_width, 0, 0,
78	}	405	0, h / (double)new_height, 0,
		406	0, 0, 1
		407	};
79		408
		409	return transform (new_width, new_height, matrix);
		410	}
		411
		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 *
		428	rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg)
		429	{
		430	rxvt_img *img = new rxvt_img (s, new_format, w, h);
		431
		432	Display *dpy = s->display->dpy;
		433	Picture src = XRenderCreatePicture (dpy, pm, format, 0, 0);
		434	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
		435	int op = PictOpSrc;
		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
		449	XRenderComposite (dpy, op, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		450
		451	XRenderFreePicture (dpy, src);
		452	XRenderFreePicture (dpy, dst);
		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
		480	return img2;
		481	}
80		482
81	#endif	483	#endif
82		484

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.3 by root, Sun Jun 3 10:14:44 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.3 by root, Sun Jun 3 10:14:44 2012 UTC vs.
Revision 1.31 by sf-exg, Thu Jun 7 06:08:09 2012 UTC