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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.14 by root, Mon Jun 4 15:53:12 2012 UTC vs.
Revision 1.67 by root, Sat Jun 9 11:13:14 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);
		314	XRenderFreePicture (dpy, tmp);
		315
		316	return img;
149	}	317	}
150		318
151	static Picture	319	static Picture
152	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb)	320	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb)
153	{	321	{
…		…
161	XFreePixmap (dpy, pixmap);	329	XFreePixmap (dpy, pixmap);
162		330
163	return mask;	331	return mask;
164	}	332	}
165		333
		334	static void
		335	extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
		336	{
		337	int32_t x = clamp (c, cl0, cl1);
		338	c -= x;
		339	xc = x;
		340	}
		341
		342	static bool
		343	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)
		344	{
		345	extract (cl0, cl1, r, xr);
		346	extract (cl0, cl1, g, xg);
		347	extract (cl0, cl1, b, xb);
		348	extract (cl0, cl1, a, xa);
		349
		350	return xr \| xg \| xb \| xa;
		351	}
		352
166	void	353	void
167	rxvt_img::brightness (double r, double g, double b, double a)	354	rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
168	{	355	{
		356	unshare ();
		357
		358	Display *dpy = s->display->dpy;
		359	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
		360
		361	while (r \| g \| b \| a)
		362	{
		363	unsigned short xr, xg, xb, xa;
		364	XRenderColor mask_c;
		365
		366	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
		367	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
		368
		369	if (extract (-65535, 0, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
		370	{
		371	XRenderColor mask_w = { 65535, 65535, 65535, 65535 };
		372	XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
		373	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
		374	XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
		375	}
		376	}
		377
		378
		379	XRenderFreePicture (dpy, dst);
		380	}
		381
		382	void
		383	rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
		384	{
		385	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
		386	{
		387	rxvt_warn ("rxvt_img::contrast operation not supported on this display, RENDER extension too old.\n");
		388	return;
		389	}
		390
		391	unshare ();
		392
169	Display *dpy = s->display->dpy;	393	Display *dpy = s->display->dpy;
170	Picture src = create_xrender_mask (dpy, pm, True);	394	Picture src = create_xrender_mask (dpy, pm, True);
171	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	395	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
172		396
173	XRenderColor mask_c;	397	XRenderColor mask_c;
174	mask_c.red = float_to_component (r);	398	mask_c.red = r;
175	mask_c.green = float_to_component (g);	399	mask_c.green = g;
176	mask_c.blue = float_to_component (b);	400	mask_c.blue = b;
177	mask_c.alpha = float_to_component (a);	401	mask_c.alpha = a;
178	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	402	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
179		403
180	XRenderComposite (dpy, PictOpAdd, src, None, 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);	404	XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
201	}
202		405
203	bool	406	XRenderFreePicture (dpy, src);
204	rxvt_img::render_pixbuf (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y)	407	XRenderFreePicture (dpy, dst);
205	{	408	}
206	bool argb = format->id == PictStandardARGB32;
207		409
208	Display *dpy = s->display->dpy;	410	rxvt_img *
		411	rxvt_img::clone ()
		412	{
		413	return new rxvt_img (*this);
		414	}
209		415
210	if (s->visual->c_class != TrueColor)	416	static XRenderPictFormat *
		417	find_alpha_format_for (Display dpy, XRenderPictFormat format)
		418	{
		419	if (format->direct.alphaMask)
		420	return format; // already has alpha
		421
		422	// try to find a suitable alpha format, one bit alpha is enough for our purposes
		423	if (format->type == PictTypeDirect)
		424	for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
		425	if (f->direct.alphaMask
		426	&& f->type == PictTypeDirect
		427	&& ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
		428	&& ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
		429	&& ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
211	return false;	430	return f;
212		431
213	uint32_t red_mask, green_mask, blue_mask, alpha_mask;	432	// should be a very good fallback
		433	return XRenderFindStandardFormat (dpy, PictStandardARGB32);
		434	}
214		435
215	if (argb)	436	rxvt_img *
		437	rxvt_img::reify ()
		438	{
		439	if (x == 0 && y == 0 && w == ref->w && h == ref->h)
		440	return clone ();
		441
		442	Display *dpy = s->display->dpy;
		443
		444	// add an alpha channel if...
		445	bool alpha = !format->direct.alphaMask // pixmap has none yet
		446	&& (x \|\| y) // we need one because of non-zero offset
		447	&& repeat == RepeatNone; // and we have no good pixels to fill with
		448
		449	rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
		450	img->alloc ();
		451
		452	Picture src = src_picture ();
		453	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
		454
		455	if (alpha)
216	{	456	{
217	red_mask = 0xff << 16;	457	XRenderColor rc = { 0, 0, 0, 0 };
218	green_mask = 0xff << 8;	458	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
219	blue_mask = 0xff;	459	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h);
220	alpha_mask = 0xff << 24;
221	}	460	}
222	else	461	else
223	{	462	XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);
224	red_mask = s->visual->red_mask;	463
225	green_mask = s->visual->green_mask;	464	XRenderFreePicture (dpy, src);
226	blue_mask = s->visual->blue_mask;	465	XRenderFreePicture (dpy, dst);
227	alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha;	466
		467	return img;
		468	}
		469
		470	rxvt_img *
		471	rxvt_img::sub_rect (int x, int y, int width, int height)
		472	{
		473	rxvt_img *img = clone ();
		474
		475	img->x += x;
		476	img->y += y;
		477
		478	if (w != width \|\| h != height)
228	}	479	{
		480	img->w = width;
		481	img->h = height;
229		482
230	int width_r = ecb_popcount32 (red_mask);	483	rxvt_img *img2 = img->reify ();
231	int width_g = ecb_popcount32 (green_mask);	484	delete img;
232	int width_b = ecb_popcount32 (blue_mask);	485	img = img2;
233	int width_a = ecb_popcount32 (alpha_mask);
234
235	if (width_r > 8 \|\| width_g > 8 \|\| width_b > 8 \|\| width_a > 8)
236	return false;
237
238	int sh_r = ecb_ctz32 (red_mask);
239	int sh_g = ecb_ctz32 (green_mask);
240	int sh_b = ecb_ctz32 (blue_mask);
241	int sh_a = ecb_ctz32 (alpha_mask);
242
243	if (width > 32767 \|\| height > 32767)
244	return false;
245
246	XImage *ximage = XCreateImage (dpy, s->visual, argb ? 32 : format->depth, ZPixmap, 0, 0,
247	width, height, 32, 0);
248	if (!ximage)
249	return false;
250
251	if (height > INT_MAX / ximage->bytes_per_line
252	\|\| !(ximage->data = (char )malloc (height ximage->bytes_per_line)))
253	{	486	}
254	XDestroyImage (ximage);
255	return false;
256	}
257		487
258	GC gc = XCreateGC (dpy, pm, 0, 0);	488	return img;
259
260	ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
261
262	int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
263	int channels = gdk_pixbuf_get_n_channels (pixbuf);
264	unsigned char row = gdk_pixbuf_get_pixels (pixbuf) + src_y rowstride + src_x * channels;
265	char *line = ximage->data;
266
267	rgba c (0, 0, 0);
268
269	if (channels == 4 && alpha_mask == 0)
270	{
271	//pix_colors[Color_bg].get (c);
272	//TODO
273	c.r >>= 8;
274	c.g >>= 8;
275	c.b >>= 8;
276	}
277
278	for (int y = 0; y < height; y++)
279	{
280	for (int x = 0; x < width; x++)
281	{
282	unsigned char pixel = row + x channels;
283	uint32_t value;
284	unsigned char r, g, b, a;
285
286	if (channels == 4)
287	{
288	a = pixel[3];
289	r = (pixel[0] * a + c.r * (0xff - a)) / 0xff;
290	g = (pixel[1] * a + c.g * (0xff - a)) / 0xff;
291	b = (pixel[2] * a + c.b * (0xff - a)) / 0xff;
292	}
293	else
294	{
295	a = 0xff;
296	r = pixel[0];
297	g = pixel[1];
298	b = pixel[2];
299	}
300
301	value = ((r >> (8 - width_r)) << sh_r)
302	\| ((g >> (8 - width_g)) << sh_g)
303	\| ((b >> (8 - width_b)) << sh_b)
304	\| ((a >> (8 - width_a)) << sh_a);
305
306	if (ximage->bits_per_pixel == 32)
307	((uint32_t *)line)[x] = value;
308	else
309	XPutPixel (ximage, x, y, value);
310	}
311
312	row += rowstride;
313	line += ximage->bytes_per_line;
314	}
315
316	XPutImage (dpy, pm, gc, ximage, 0, 0, dst_x, dst_y, width, height);
317	XDestroyImage (ximage);
318	XFreeGC (dpy, gc);
319
320	return true;
321	}	489	}
322		490
323	rxvt_img *	491	rxvt_img *
324	rxvt_img::clone ()
325	{
326	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
327	Pixmap pm2 = XCreatePixmap (s->display->dpy, pm, w, h, format->depth);
328	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, w, h, 0, 0);
329	XFreeGC (s->display->dpy, gc);
330	return new rxvt_img (s, format, w, h, pm2);
331	}
332
333	rxvt_img *
334	rxvt_img::transform (int new_width, int new_height, int repeat, double matrix[9])	492	rxvt_img::transform (int new_width, int new_height, double matrix[9])
335	{	493	{
336	rxvt_img *img = new rxvt_img (s, format, new_width, new_height);	494	rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat);
		495	img->alloc ();
337		496
338	Display *dpy = s->display->dpy;	497	Display *dpy = s->display->dpy;
339	XRenderPictureAttributes pa;	498	Picture src = src_picture ();
340	pa.repeat = repeat;
341	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
342	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	499	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
343		500
344	XTransform xfrm;	501	XTransform xfrm;
345		502
346	for (int i = 0; i < 3; ++i)	503	for (int i = 0; i < 3; ++i)
347	for (int j = 0; j < 3; ++j)	504	for (int j = 0; j < 3; ++j)
348	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);	505	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
349		506
		507	xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
		508	xfrm.matrix [1][2] -= XDoubleToFixed (y);
		509
		510	XRenderSetPictureFilter (dpy, src, "good", 0, 0);
350	XRenderSetPictureTransform (dpy, src, &xfrm);	511	XRenderSetPictureTransform (dpy, src, &xfrm);
351	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);	512	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
352		513
353	XRenderFreePicture (dpy, src);	514	XRenderFreePicture (dpy, src);
354	XRenderFreePicture (dpy, dst);	515	XRenderFreePicture (dpy, dst);
…		…
357	}	518	}
358		519
359	rxvt_img *	520	rxvt_img *
360	rxvt_img::scale (int new_width, int new_height)	521	rxvt_img::scale (int new_width, int new_height)
361	{	522	{
		523	if (w == new_width && h == new_height)
		524	return clone ();
		525
362	double matrix[9] = {	526	double matrix[9] = {
363	new_width / (double)w, 0, 0,	527	w / (double)new_width, 0, 0,
364	0, new_height / (double)h, 0,	528	0, h / (double)new_height, 0,
365	0, 0, 1	529	0, 0, 1
366	};	530	};
367		531
		532	int old_repeat_mode = repeat;
		533	repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems
		534
		535	rxvt_img *img = transform (new_width, new_height, matrix);
		536
		537	repeat = old_repeat_mode;
		538	img->repeat = repeat;
		539
		540	return img;
		541	}
		542
		543	rxvt_img *
		544	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)
		545	{
		546	double s = sin (phi);
		547	double c = cos (phi);
		548
		549	double matrix[9] = {
		550	c, -s, -c * x + s * y + x,
		551	s, c, -s * x - c * y + y,
		552	0, 0, 1
		553	};
		554
368	return transform (new_width, new_height, RepeatNormal, matrix);	555	return transform (new_width, new_height, matrix);
369	}	556	}
370		557
371	rxvt_img *	558	rxvt_img *
372	rxvt_img::convert_to (XRenderPictFormat *new_format)	559	rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)
373	{	560	{
		561	if (new_format == format)
		562	return clone ();
		563
374	rxvt_img *img = new rxvt_img (s, new_format, w, h);	564	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
		565	img->alloc ();
375		566
376	Display *dpy = s->display->dpy;	567	Display *dpy = s->display->dpy;
377	Picture src = XRenderCreatePicture (dpy, pm, format, 0, 0);	568	Picture src = src_picture ();
378	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);	569	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
		570	int op = PictOpSrc;
379		571
		572	if (format->direct.alphaMask && !new_format->direct.alphaMask)
		573	{
		574	// does it have to be that complicated
		575	rgba c;
		576	bg.get (c);
		577
		578	XRenderColor rc = { c.r, c.g, c.b, 0xffff };
		579	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
		580
		581	op = PictOpOver;
		582	}
		583
380	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	584	XRenderComposite (dpy, op, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
381		585
382	XRenderFreePicture (dpy, src);	586	XRenderFreePicture (dpy, src);
383	XRenderFreePicture (dpy, dst);	587	XRenderFreePicture (dpy, dst);
384		588
385	return img;	589	return img;
386	}	590	}
387		591
		592	rxvt_img *
		593	rxvt_img::blend (rxvt_img *img, double factor)
		594	{
		595	rxvt_img *img2 = clone ();
		596	Display *dpy = s->display->dpy;
		597	Picture src = img->src_picture ();
		598	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
		599	Picture mask = create_xrender_mask (dpy, img->pm, False);
		600
		601	XRenderColor mask_c;
		602
		603	mask_c.alpha = float_to_component (factor);
		604	mask_c.red =
		605	mask_c.green =
		606	mask_c.blue = 0;
		607	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
		608
		609	XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, w, h);
		610
		611	XRenderFreePicture (dpy, src);
		612	XRenderFreePicture (dpy, dst);
		613	XRenderFreePicture (dpy, mask);
		614
		615	return img2;
		616	}
		617
388	#endif	618	#endif
389		619

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.14 by root, Mon Jun 4 15:53:12 2012 UTC vs. Revision 1.67 by root, Sat Jun 9 11:13:14 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.14 by root, Mon Jun 4 15:53:12 2012 UTC vs.
Revision 1.67 by root, Sat Jun 9 11:13:14 2012 UTC