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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.16 by root, Mon Jun 4 16:12:55 2012 UTC vs.
Revision 1.48 by root, Thu Jun 7 19:24:02 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)	8	: s(screen), x(x), y(y), w(width), h(height), format(format), repeat(repeat),
		9	pm(0), ref(0)
11	{	10	{
12	pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);
13	}	11	}
14		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	#if 0
15	rxvt_img::rxvt_img (rxvt_screen screen, XRenderPictFormat format, int width, int height, Pixmap pixmap)	20	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)	21	: s(screen), x(0), y(0), w(width), h(height), format(format), repeat(RepeatNormal), shared(false), pm(pixmap)
17	{	22	{
		23	}
		24	#endif
		25
		26	rxvt_img *
		27	rxvt_img::new_from_root (rxvt_screen *s)
		28	{
		29	Display *dpy = s->display->dpy;
		30	unsigned int root_pm_w, root_pm_h;
		31	Pixmap root_pixmap = s->display->get_pixmap_property (s->display->xa[XA_XROOTPMAP_ID]);
		32	if (root_pixmap == None)
		33	root_pixmap = s->display->get_pixmap_property (s->display->xa[XA_ESETROOT_PMAP_ID]);
		34
		35	if (root_pixmap == None)
		36	return 0;
		37
		38	Window wdummy;
		39	int idummy;
		40	unsigned int udummy;
		41
		42	if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pm_w, &root_pm_h, &udummy, &udummy))
		43	return 0;
		44
		45	rxvt_img *img = new rxvt_img (
		46	s,
		47	XRenderFindVisualFormat (dpy, DefaultVisual (dpy, s->display->screen)),
		48	0,
		49	0,
		50	root_pm_w,
		51	root_pm_h
		52	);
		53
		54	img->pm = root_pixmap;
		55	img->ref = new pixref (root_pm_w, root_pm_h);
		56	img->ref->ours = false;
		57
		58	return img;
		59	}
		60
		61	rxvt_img *
		62	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)
		63	{
		64	Display *dpy = s->display->dpy;
		65
		66	int width = gdk_pixbuf_get_width (pb);
		67	int height = gdk_pixbuf_get_height (pb);
		68
		69	if (width > 32767 \|\| height > 32767) // well, we could upload in chunks
		70	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n");
		71
		72	// since we require rgb24/argb32 formats from xrender we assume
		73	// that both 24 and 32 bpp MUST be supported by any screen that supports xrender
		74	int depth = gdk_pixbuf_get_has_alpha (pb) ? 32 : 24;
		75
		76	XImage xi;
		77
		78	xi.width = width;
		79	xi.height = height;
		80	xi.xoffset = 0;
		81	xi.format = ZPixmap;
		82	xi.byte_order = MSBFirst; // maybe go for host byte order, because servers are usually local?
		83	xi.bitmap_unit = 32;
		84	xi.bitmap_bit_order = MSBFirst;
		85	xi.bitmap_pad = BitmapPad (dpy);
		86	xi.depth = depth;
		87	xi.bytes_per_line = 0;
		88	xi.bits_per_pixel = 32;
		89	xi.red_mask = 0x00ff0000;
		90	xi.green_mask = 0x0000ff00;
		91	xi.blue_mask = 0x000000ff;
		92
		93	if (!XInitImage (&xi))
		94	rxvt_fatal ("unable to initialise ximage, please report.\n");
		95
		96	if (height > INT_MAX / xi.bytes_per_line)
		97	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");
		98
		99	xi.data = (char )rxvt_malloc (height xi.bytes_per_line);
		100
		101	int rowstride = gdk_pixbuf_get_rowstride (pb);
		102
		103	assert (3 + (depth == 32) == gdk_pixbuf_get_n_channels (pb));
		104	unsigned char *row = gdk_pixbuf_get_pixels (pb);
		105	char *line = xi.data;
		106
		107	for (int y = 0; y < height; y++)
		108	{
		109	unsigned char r, g, b, a;
		110	unsigned char *data = row;
		111
		112	if (depth == 24)
		113	for (int x = 0; x < width; x++)
		114	{
		115	asm volatile("nop");
		116	r = *data++;
		117	g = *data++;
		118	b = *data++;
		119	*line++ = 0;
		120	*line++ = r;
		121	*line++ = g;
		122	*line++ = b;
		123	asm volatile("nop");
		124	}
		125	else
		126	for (int x = 0; x < width; x++)
		127	{
		128	uint32_t v = (uint32_t )data; data += 4;
		129	v = ecb_big_endian () ? ecb_rotr32 (v, 8) : ecb_rotl32 (v, 8);
		130	(uint32_t )line = x; line += 4;
		131	}
		132
		133	row += rowstride;
		134	}
		135
		136	rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, depth == 24 ? PictStandardRGB24 : PictStandardARGB32), 0, 0, width, height);
		137	img->alloc ();
		138
		139	GC gc = XCreateGC (dpy, img->pm, 0, 0);
		140	XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);
		141	XFreeGC (dpy, gc);
		142
		143	free (xi.data);
		144
		145	return img;
18	}	146	}
19		147
20	rxvt_img *	148	rxvt_img *
21	rxvt_img::new_from_file (rxvt_screen s, const char filename)	149	rxvt_img::new_from_file (rxvt_screen s, const char filename)
22	{	150	{
…		…
24	GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);	152	GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);
25		153
26	if (!pb)	154	if (!pb)
27	rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);	155	rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);
28		156
29	rxvt_img *img = new rxvt_img (	157	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		158
36	img->render_pixbuf (pb, 0, 0, img->w, img->h, 0, 0);	159	g_object_unref (pb);
37		160
		161	return img;
		162	}
		163
		164	void
		165	rxvt_img::destroy ()
		166	{
		167	if (--ref->cnt)
38	return img;	168	return;
		169
		170	if (pm && ref->ours)
		171	XFreePixmap (s->display->dpy, pm);
		172
		173	delete ref;
39	}	174	}
40		175
41	rxvt_img::~rxvt_img ()	176	rxvt_img::~rxvt_img ()
42	{	177	{
43	if (!shared)	178	destroy ();
44	XFreePixmap (s->display->dpy, pm);	179	}
		180
		181	void
		182	rxvt_img::alloc ()
		183	{
		184	pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);
		185	ref = new pixref (w, h);
		186	}
		187
		188	Picture
		189	rxvt_img::src_picture ()
		190	{
		191	Display *dpy = s->display->dpy;
		192
		193	XRenderPictureAttributes pa;
		194	pa.repeat = repeat;
		195	Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
		196
		197	return pic;
45	}	198	}
46		199
47	void	200	void
48	rxvt_img::unshare ()	201	rxvt_img::unshare ()
49	{	202	{
50	if (!shared)	203	if (ref->cnt == 1 && ref->ours)
51	return;	204	return;
52		205
53	rxvt_img *img = clone ();	206	//TODO: maybe should reify instead
		207	Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);
		208	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
		209	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
		210	XFreeGC (s->display->dpy, gc);
54		211
55	::swap (pm , img->pm);	212	destroy ();
56	::swap (shared, img->shared);
57		213
58	delete img;	214	pm = pm2;
		215	ref = new pixref (ref->w, ref->h);
59	}	216	}
60		217
61	void	218	void
62	rxvt_img::fill (const rxvt_color &c)	219	rxvt_img::fill (const rxvt_color &c)
63	{	220	{
…		…
87		244
88	for (int i = 0; i < width; i++)	245	for (int i = 0; i < width; i++)
89	params[i+2] = XDoubleToFixed (kernel[i] / sum);	246	params[i+2] = XDoubleToFixed (kernel[i] / sum);
90	}	247	}
91		248
92	void	249	rxvt_img *
93	rxvt_img::blur (int rh, int rv)	250	rxvt_img::blur (int rh, int rv)
94	{	251	{
95	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))	252	if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
96	return;	253	return clone ();
97		254
98	Display *dpy = s->display->dpy;	255	Display *dpy = s->display->dpy;
99	int size = max (rh, rv) * 2 + 1;	256	int size = max (rh, rv) * 2 + 1;
100	double kernel = (double )malloc (size * sizeof (double));	257	double kernel = (double )malloc (size * sizeof (double));
101	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	258	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
		259	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
		260	img->alloc ();
		261
		262	Picture src = src_picture ();
102		263
103	XRenderPictureAttributes pa;	264	XRenderPictureAttributes pa;
104
105	pa.repeat = RepeatPad;	265	pa.repeat = RepeatPad;
106	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);	266	Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa);
		267
107	Pixmap tmp = XCreatePixmap (dpy, pm, w, h, format->depth);	268	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
108	Picture dst = XRenderCreatePicture (dpy, tmp, format, CPRepeat, &pa);	269	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
109	XFreePixmap (dpy, tmp);	270	XFreePixmap (dpy, tmp_pm);
110		271
111	if (kernel && params)	272	if (kernel && params)
112	{	273	{
113	size = rh * 2 + 1;	274	size = rh * 2 + 1;
114	get_gaussian_kernel (rh, size, kernel, params);	275	get_gaussian_kernel (rh, size, kernel, params);
…		…
116	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);	277	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
117	XRenderComposite (dpy,	278	XRenderComposite (dpy,
118	PictOpSrc,	279	PictOpSrc,
119	src,	280	src,
120	None,	281	None,
121	dst,	282	tmp,
122	0, 0,	283	0, 0,
123	0, 0,	284	0, 0,
124	0, 0,	285	0, 0,
125	w, h);	286	w, h);
126		287
127	::swap (src, dst);
128
129	size = rv * 2 + 1;	288	size = rv * 2 + 1;
130	get_gaussian_kernel (rv, size, kernel, params);	289	get_gaussian_kernel (rv, size, kernel, params);
131	::swap (params[0], params[1]);	290	::swap (params[0], params[1]);
132		291
133	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);	292	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
134	XRenderComposite (dpy,	293	XRenderComposite (dpy,
135	PictOpSrc,	294	PictOpSrc,
136	src,	295	tmp,
137	None,	296	None,
138	dst,	297	dst,
139	0, 0,	298	0, 0,
140	0, 0,	299	0, 0,
141	0, 0,	300	0, 0,
…		…
144		303
145	free (kernel);	304	free (kernel);
146	free (params);	305	free (params);
147	XRenderFreePicture (dpy, src);	306	XRenderFreePicture (dpy, src);
148	XRenderFreePicture (dpy, dst);	307	XRenderFreePicture (dpy, dst);
		308	XRenderFreePicture (dpy, tmp);
		309
		310	return img;
149	}	311	}
150		312
151	static Picture	313	static Picture
152	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb)	314	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb)
153	{	315	{
…		…
162		324
163	return mask;	325	return mask;
164	}	326	}
165		327
166	void	328	void
167	rxvt_img::brightness (double r, double g, double b, double a)	329	rxvt_img::brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a)
168	{	330	{
169	Display *dpy = s->display->dpy;	331	Display *dpy = s->display->dpy;
170	Picture src = create_xrender_mask (dpy, pm, True);	332	Picture src = create_xrender_mask (dpy, pm, True);
171	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	333	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
172		334
173	XRenderColor mask_c;	335	XRenderColor mask_c;
174	mask_c.red = float_to_component (r);	336	mask_c.red = r;
175	mask_c.green = float_to_component (g);	337	mask_c.green = g;
176	mask_c.blue = float_to_component (b);	338	mask_c.blue = b;
177	mask_c.alpha = float_to_component (a);	339	mask_c.alpha = a;
178	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	340	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
179		341
180	XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	342	XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		343
		344	XRenderFreePicture (dpy, src);
		345	XRenderFreePicture (dpy, dst);
181	}	346	}
182		347
183	void	348	void
184	rxvt_img::contrast (double r, double g, double b, double a)	349	rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a)
185	{	350	{
186	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))	351	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
187	return;	352	return;
188		353
189	Display *dpy = s->display->dpy;	354	Display *dpy = s->display->dpy;
190	Picture src = create_xrender_mask (dpy, pm, True);	355	Picture src = create_xrender_mask (dpy, pm, True);
191	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	356	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
192		357
193	XRenderColor mask_c;	358	XRenderColor mask_c;
194	mask_c.red = float_to_component (r);	359	mask_c.red = r;
195	mask_c.green = float_to_component (g);	360	mask_c.green = g;
196	mask_c.blue = float_to_component (b);	361	mask_c.blue = b;
197	mask_c.alpha = float_to_component (a);	362	mask_c.alpha = a;
198	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	363	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
199		364
200	XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	365	XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
201	}
202		366
203	bool	367	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)	368	XRenderFreePicture (dpy, dst);
205	{	369	}
206	bool argb = format->id == PictStandardARGB32;
207		370
208	Display *dpy = s->display->dpy;	371	rxvt_img *
		372	rxvt_img::clone ()
		373	{
		374	return new rxvt_img (*this);
		375	}
209		376
210	if (s->visual->c_class != TrueColor)	377	static XRenderPictFormat *
		378	find_alpha_format_for (Display dpy, XRenderPictFormat format)
		379	{
		380	if (format->direct.alphaMask)
		381	return format; // already has alpha
		382
		383	// try to find a suitable alpha format, one bit alpha is enough for our purposes
		384	if (format->type == PictTypeDirect)
		385	for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
		386	if (f->direct.alphaMask
		387	&& f->type == PictTypeDirect
		388	&& ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
		389	&& ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
		390	&& ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
211	return false;	391	return f;
212		392
213	uint32_t red_mask, green_mask, blue_mask, alpha_mask;	393	// should be a very good fallback
		394	return XRenderFindStandardFormat (dpy, PictStandardARGB32);
		395	}
214		396
215	if (argb)	397	rxvt_img *
		398	rxvt_img::reify ()
		399	{
		400	if (x == 0 && y == 0 && w == ref->w && h == ref->h)
		401	return clone ();
		402
		403	Display *dpy = s->display->dpy;
		404
		405	bool alpha = !format->direct.alphaMask
		406	&& (x \|\| y)
		407	&& repeat == RepeatNone;
		408
		409	rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
		410	img->alloc ();
		411
		412	Picture src = src_picture ();
		413	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
		414
		415	if (alpha)
216	{	416	{
217	red_mask = 0xff << 16;	417	XRenderColor rc = { 0, 0, 0, 0 };
218	green_mask = 0xff << 8;	418	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
219	blue_mask = 0xff;	419	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h);
220	alpha_mask = 0xff << 24;
221	}	420	}
222	else	421	else
		422	XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);
		423
		424	XRenderFreePicture (dpy, src);
		425	XRenderFreePicture (dpy, dst);
		426
		427	return img;
		428	}
		429
		430	rxvt_img *
		431	rxvt_img::sub_rect (int x, int y, int width, int height)
		432	{
		433	rxvt_img *img = clone ();
		434
		435	img->x += x;
		436	img->y += y;
		437
		438	if (w != width \|\| h != height)
223	{	439	{
224	red_mask = s->visual->red_mask;	440	img->w = width;
225	green_mask = s->visual->green_mask;	441	img->h = height;
226	blue_mask = s->visual->blue_mask;	442
227	alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha;	443	rxvt_img *img2 = img->reify ();
		444	delete img;
		445	img = img2;
228	}	446	}
229		447
230	int width_r = ecb_popcount32 (red_mask);	448	return img;
231	int width_g = ecb_popcount32 (green_mask);
232	int width_b = ecb_popcount32 (blue_mask);
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	{
254	XDestroyImage (ximage);
255	return false;
256	}
257
258	GC gc = XCreateGC (dpy, pm, 0, 0);
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 = 0xffff; c.g = 0xc0c0; c.b = 0xcbcb;//D
274	c.r >>= 8;
275	c.g >>= 8;
276	c.b >>= 8;
277	}
278
279	for (int y = 0; y < height; y++)
280	{
281	for (int x = 0; x < width; x++)
282	{
283	unsigned char pixel = row + x channels;
284	uint32_t value;
285	unsigned char r, g, b, a;
286
287	if (channels == 4)
288	{
289	a = pixel[3];
290	r = (pixel[0] * a + c.r * (0xff - a)) / 0xff;
291	g = (pixel[1] * a + c.g * (0xff - a)) / 0xff;
292	b = (pixel[2] * a + c.b * (0xff - a)) / 0xff;
293	}
294	else
295	{
296	a = 0xff;
297	r = pixel[0];
298	g = pixel[1];
299	b = pixel[2];
300	}
301
302	value = ((r >> (8 - width_r)) << sh_r)
303	\| ((g >> (8 - width_g)) << sh_g)
304	\| ((b >> (8 - width_b)) << sh_b)
305	\| ((a >> (8 - width_a)) << sh_a);
306
307	if (ximage->bits_per_pixel == 32)
308	((uint32_t *)line)[x] = value;
309	else
310	XPutPixel (ximage, x, y, value);
311	}
312
313	row += rowstride;
314	line += ximage->bytes_per_line;
315	}
316
317	XPutImage (dpy, pm, gc, ximage, 0, 0, dst_x, dst_y, width, height);
318	XDestroyImage (ximage);
319	XFreeGC (dpy, gc);
320
321	return true;
322	}	449	}
323		450
324	rxvt_img *	451	rxvt_img *
325	rxvt_img::clone ()
326	{
327	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
328	Pixmap pm2 = XCreatePixmap (s->display->dpy, pm, w, h, format->depth);
329	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, w, h, 0, 0);
330	XFreeGC (s->display->dpy, gc);
331	return new rxvt_img (s, format, w, h, pm2);
332	}
333
334	rxvt_img *
335	rxvt_img::transform (int new_width, int new_height, int repeat, double matrix[9])	452	rxvt_img::transform (int new_width, int new_height, double matrix[9])
336	{	453	{
337	rxvt_img *img = new rxvt_img (s, format, new_width, new_height);	454	rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat);
		455	img->alloc ();
338		456
339	Display *dpy = s->display->dpy;	457	Display *dpy = s->display->dpy;
340	XRenderPictureAttributes pa;	458	Picture src = src_picture ();
341	pa.repeat = repeat;
342	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
343	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	459	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
344		460
345	XTransform xfrm;	461	XTransform xfrm;
346		462
347	for (int i = 0; i < 3; ++i)	463	for (int i = 0; i < 3; ++i)
348	for (int j = 0; j < 3; ++j)	464	for (int j = 0; j < 3; ++j)
349	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);	465	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
350		466
		467	#if 0
		468	xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
		469	xfrm.matrix [1][2] -= XDoubleToFixed (y);
		470	#endif
		471
		472	XRenderSetPictureFilter (dpy, src, "good", 0, 0);
351	XRenderSetPictureTransform (dpy, src, &xfrm);	473	XRenderSetPictureTransform (dpy, src, &xfrm);
352	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);	474	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
353		475
354	XRenderFreePicture (dpy, src);	476	XRenderFreePicture (dpy, src);
355	XRenderFreePicture (dpy, dst);	477	XRenderFreePicture (dpy, dst);
…		…
358	}	480	}
359		481
360	rxvt_img *	482	rxvt_img *
361	rxvt_img::scale (int new_width, int new_height)	483	rxvt_img::scale (int new_width, int new_height)
362	{	484	{
		485	if (w == new_width && h == new_height)
		486	return clone ();
		487
363	double matrix[9] = {	488	double matrix[9] = {
364	w / (double)new_width, 0, 0,	489	w / (double)new_width, 0, 0,
365	0, h / (double)new_height, 0,	490	0, h / (double)new_height, 0,
366	0, 0, 1	491	0, 0, 1
367	};	492	};
368		493
		494	int old_repeat_mode = repeat;
		495	repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems
		496
		497	rxvt_img *img = transform (new_width, new_height, matrix);
		498
		499	repeat = old_repeat_mode;
		500	img->repeat = repeat;
		501
		502	return img;
		503	}
		504
		505	rxvt_img *
		506	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)
		507	{
		508	double s = sin (phi);
		509	double c = cos (phi);
		510
		511	double matrix[9] = {
		512	c, -s, -c * x + s * y + x,
		513	s, c, -s * x - c * y + y,
		514	0, 0, 1
		515	};
		516
369	return transform (new_width, new_height, RepeatNormal, matrix);	517	return transform (new_width, new_height, matrix);
370	}	518	}
371		519
372	rxvt_img *	520	rxvt_img *
373	rxvt_img::convert_to (XRenderPictFormat *new_format)	521	rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)
374	{	522	{
		523	if (new_format == format)
		524	return clone ();
		525
375	rxvt_img *img = new rxvt_img (s, new_format, w, h);	526	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
		527	img->alloc ();
376		528
377	Display *dpy = s->display->dpy;	529	Display *dpy = s->display->dpy;
378	Picture src = XRenderCreatePicture (dpy, pm, format, 0, 0);	530	Picture src = src_picture ();
379	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);	531	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
		532	int op = PictOpSrc;
380		533
		534	if (format->direct.alphaMask && !new_format->direct.alphaMask)
		535	{
		536	// does it have to be that complicated
		537	rgba c;
		538	bg.get (c);
		539
		540	XRenderColor rc = { c.r, c.g, c.b, 0xffff };
		541	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
		542
		543	op = PictOpOver;
		544	}
		545
381	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	546	XRenderComposite (dpy, op, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
382		547
383	XRenderFreePicture (dpy, src);
384	XRenderFreePicture (dpy, dst);	548	XRenderFreePicture (dpy, src);
		549	XRenderFreePicture (dpy, dst);
385		550
		551	return img;
		552	}
		553
		554	rxvt_img *
		555	rxvt_img::blend (rxvt_img *img, double factor)
		556	{
		557	rxvt_img *img2 = clone ();
		558	Display *dpy = s->display->dpy;
		559	Picture src = img->src_picture ();
		560	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
		561	Picture mask = create_xrender_mask (dpy, img->pm, False);
		562
		563	XRenderColor mask_c;
		564
		565	mask_c.alpha = float_to_component (factor);
		566	mask_c.red =
		567	mask_c.green =
		568	mask_c.blue = 0;
		569	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
		570
		571	XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, w, h);
		572
		573	XRenderFreePicture (dpy, src);
		574	XRenderFreePicture (dpy, dst);
		575	XRenderFreePicture (dpy, mask);
		576
386	return img;	577	return img2;
387	}	578	}
388		579
389	#endif	580	#endif
390		581

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.16 by root, Mon Jun 4 16:12:55 2012 UTC vs. Revision 1.48 by root, Thu Jun 7 19:24:02 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.16 by root, Mon Jun 4 16:12:55 2012 UTC vs.
Revision 1.48 by root, Thu Jun 7 19:24:02 2012 UTC