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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.55 by root, Thu Jun 7 20:26:21 2012 UTC vs.
Revision 1.82 by root, Thu Jun 14 17:06:57 2012 UTC

…		…
13	rxvt_img::rxvt_img (const rxvt_img &img)	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)	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	{	15	{
16	++ref->cnt;	16	++ref->cnt;
17	}	17	}
18
19	#if 0
20	rxvt_img::rxvt_img (rxvt_screen screen, XRenderPictFormat format, int width, int height, Pixmap pixmap)
21	: s(screen), x(0), y(0), w(width), h(height), format(format), repeat(RepeatNormal), shared(false), pm(pixmap)
22	{
23	}
24	#endif
25		18
26	rxvt_img *	19	rxvt_img *
27	rxvt_img::new_from_root (rxvt_screen *s)	20	rxvt_img::new_from_root (rxvt_screen *s)
28	{	21	{
29	Display *dpy = s->display->dpy;	22	Display *dpy = s->display->dpy;
…		…
56	img->ref->ours = false;	49	img->ref->ours = false;
57		50
58	return img;	51	return img;
59	}	52	}
60		53
		54	# if HAVE_PIXBUF
		55
61	rxvt_img *	56	rxvt_img *
62	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)	57	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)
63	{	58	{
64	Display *dpy = s->display->dpy;	59	Display *dpy = s->display->dpy;
65		60
…		…
69	if (width > 32767 \|\| height > 32767) // well, we could upload in chunks	64	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");	65	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n");
71		66
72	// since we require rgb24/argb32 formats from xrender we assume	67	// 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	68	// 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		69
76	int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;	70	int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
77		71
78	XImage xi;	72	XImage xi;
79		73
…		…
83	xi.format = ZPixmap;	77	xi.format = ZPixmap;
84	xi.byte_order = ImageByteOrder (dpy);	78	xi.byte_order = ImageByteOrder (dpy);
85	xi.bitmap_unit = 0; //XY only, unused	79	xi.bitmap_unit = 0; //XY only, unused
86	xi.bitmap_bit_order = 0; //XY only, unused	80	xi.bitmap_bit_order = 0; //XY only, unused
87	xi.bitmap_pad = BitmapPad (dpy);	81	xi.bitmap_pad = BitmapPad (dpy);
88	xi.depth = depth;	82	xi.depth = 32;
89	xi.bytes_per_line = 0;	83	xi.bytes_per_line = 0;
90	xi.bits_per_pixel = 32; //Z only	84	xi.bits_per_pixel = 32; //Z only
91	xi.red_mask = 0x00000000; //Z only, unused	85	xi.red_mask = 0x00000000; //Z only, unused
92	xi.green_mask = 0x00000000; //Z only, unused	86	xi.green_mask = 0x00000000; //Z only, unused
93	xi.blue_mask = 0x00000000; //Z only, unused	87	xi.blue_mask = 0x00000000; //Z only, unused
…		…
102	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");	96	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");
103		97
104	xi.data = (char )rxvt_malloc (height xi.bytes_per_line);	98	xi.data = (char )rxvt_malloc (height xi.bytes_per_line);
105		99
106	int rowstride = gdk_pixbuf_get_rowstride (pb);	100	int rowstride = gdk_pixbuf_get_rowstride (pb);
107		101	bool pb_has_alpha = gdk_pixbuf_get_has_alpha (pb);
108	assert (3 + (depth == 32) == gdk_pixbuf_get_n_channels (pb));
109	unsigned char *row = gdk_pixbuf_get_pixels (pb);	102	unsigned char *row = gdk_pixbuf_get_pixels (pb);
		103
110	char *line = xi.data;	104	char *line = xi.data;
111		105
112	for (int y = 0; y < height; y++)	106	for (int y = 0; y < height; y++)
113	{	107	{
114	unsigned char *src = row;	108	unsigned char *src = row;
115	uint32_t dst = (uint32_t )line;	109	uint32_t dst = (uint32_t )line;
116		110
117	if (depth == 24)	111	if (!pb_has_alpha)
118	for (int x = 0; x < width; x++)	112	for (int x = 0; x < width; x++)
119	{	113	{
120	uint8_t r = *src++;	114	uint8_t r = *src++;
121	uint8_t g = *src++;	115	uint8_t g = *src++;
122	uint8_t b = *src++;	116	uint8_t b = *src++;
123		117
124	uint32_t v = (r << 16) \| (g << 8) \| b;	118	uint32_t v = (255 << 24) \| (r << 16) \| (g << 8) \| b;
125		119
126	if (ecb_big_endian ())	120	if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
127	v = ecb_bswap32 (v);
128
129	if (byte_order_mismatch)
130	v = ecb_bswap32 (v);	121	v = ecb_bswap32 (v);
131		122
132	*dst++ = v;	123	*dst++ = v;
133	}	124	}
134	else	125	else
135	for (int x = 0; x < width; x++)	126	for (int x = 0; x < width; x++)
136	{	127	{
137	uint32_t v = (uint32_t )src; src += 4;	128	uint32_t v = (uint32_t )src; src += 4;
138		129
139	if (ecb_little_endian ())	130	if (ecb_big_endian ())
140	v = ecb_bswap32 (v);	131	v = ecb_bswap32 (v);
141		132
142	v = ecb_rotr32 (v, 8);	133	v = ecb_rotl32 (v, 8); // abgr to bgra
143		134
144	if (byte_order_mismatch)	135	if (!byte_order_mismatch)
145	v = ecb_bswap32 (v);	136	v = ecb_bswap32 (v);
146		137
147	*dst++ = v;	138	*dst++ = v;
148	}	139	}
149		140
150	row += rowstride;	141	row += rowstride;
151	line += xi.bytes_per_line;	142	line += xi.bytes_per_line;
152	}	143	}
153		144
154	rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, depth == 24 ? PictStandardRGB24 : PictStandardARGB32), 0, 0, width, height);	145	rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, PictStandardARGB32), 0, 0, width, height);
155	img->alloc ();	146	img->alloc ();
156		147
157	GC gc = XCreateGC (dpy, img->pm, 0, 0);	148	GC gc = XCreateGC (dpy, img->pm, 0, 0);
158	XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);	149	XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);
159	XFreeGC (dpy, gc);	150	XFreeGC (dpy, gc);
…		…
177	g_object_unref (pb);	168	g_object_unref (pb);
178		169
179	return img;	170	return img;
180	}	171	}
181		172
		173	# endif
		174
182	void	175	void
183	rxvt_img::destroy ()	176	rxvt_img::destroy ()
184	{	177	{
185	if (--ref->cnt)	178	if (--ref->cnt)
186	return;	179	return;
…		…
219	rxvt_img::unshare ()	212	rxvt_img::unshare ()
220	{	213	{
221	if (ref->cnt == 1 && ref->ours)	214	if (ref->cnt == 1 && ref->ours)
222	return;	215	return;
223		216
224	//TODO: maybe should reify instead
225	Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);	217	Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);
226	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);	218	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
227	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);	219	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
228	XFreeGC (s->display->dpy, gc);	220	XFreeGC (s->display->dpy, gc);
229		221
…		…
232	pm = pm2;	224	pm = pm2;
233	ref = new pixref (ref->w, ref->h);	225	ref = new pixref (ref->w, ref->h);
234	}	226	}
235		227
236	void	228	void
237	rxvt_img::fill (const rxvt_color &c)	229	rxvt_img::fill (const rgba &c)
238	{	230	{
239	XGCValues gcv;	231	XRenderColor rc = { c.r, c.g, c.b, c.a };
240	gcv.foreground = c;	232
241	GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv);	233	Display *dpy = s->display->dpy;
242	XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h);	234	Picture src = src_picture ();
243	XFreeGC (s->display->dpy, gc);	235	XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h);
		236	XRenderFreePicture (dpy, src);
244	}	237	}
245		238
246	static void	239	static void
247	get_gaussian_kernel (int radius, int width, double kernel, XFixed params)	240	get_gaussian_kernel (int radius, int width, double kernel, XFixed params)
248	{	241	{
…		…
275	double kernel = (double )malloc (size * sizeof (double));	268	double kernel = (double )malloc (size * sizeof (double));
276	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	269	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
277	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);	270	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
278	img->alloc ();	271	img->alloc ();
279		272
280	Picture src = src_picture ();
281
282	XRenderPictureAttributes pa;	273	XRenderPictureAttributes pa;
283	pa.repeat = RepeatPad;	274	pa.repeat = RepeatPad;
284	Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa);	275	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
		276	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
285		277
286	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);	278	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
287	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);	279	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
288	XFreePixmap (dpy, tmp_pm);	280	XFreePixmap (dpy, tmp_pm);
289		281
…		…
305		297
306	size = rv * 2 + 1;	298	size = rv * 2 + 1;
307	get_gaussian_kernel (rv, size, kernel, params);	299	get_gaussian_kernel (rv, size, kernel, params);
308	::swap (params[0], params[1]);	300	::swap (params[0], params[1]);
309		301
310	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);	302	XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
311	XRenderComposite (dpy,	303	XRenderComposite (dpy,
312	PictOpSrc,	304	PictOpSrc,
313	tmp,	305	tmp,
314	None,	306	None,
315	dst,	307	dst,
…		…
319	w, h);	311	w, h);
320	}	312	}
321		313
322	free (kernel);	314	free (kernel);
323	free (params);	315	free (params);
		316
324	XRenderFreePicture (dpy, src);	317	XRenderFreePicture (dpy, src);
325	XRenderFreePicture (dpy, dst);	318	XRenderFreePicture (dpy, dst);
326	XRenderFreePicture (dpy, tmp);	319	XRenderFreePicture (dpy, tmp);
327		320
328	return img;	321	return img;
329	}	322	}
330		323
331	static Picture	324	static Picture
332	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb)	325	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
333	{	326	{
334	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);	327	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
335		328
336	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);	329	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
337	XRenderPictureAttributes pa;	330	XRenderPictureAttributes pa;
338	pa.repeat = True;	331	pa.repeat = RepeatNormal;
		332	pa.component_alpha = component_alpha;
339	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);	333	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat \| CPComponentAlpha, &pa);
340		334
341	XFreePixmap (dpy, pixmap);	335	XFreePixmap (dpy, pixmap);
342		336
343	return mask;	337	return mask;
344	}	338	}
345		339
		340	static void
		341	extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
		342	{
		343	int32_t x = clamp (c, cl0, cl1);
		344	c -= x;
		345	xc = x;
		346	}
		347
		348	static bool
		349	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)
		350	{
		351	extract (cl0, cl1, r, xr);
		352	extract (cl0, cl1, g, xg);
		353	extract (cl0, cl1, b, xb);
		354	extract (cl0, cl1, a, xa);
		355
		356	return xr \| xg \| xb \| xa;
		357	}
		358
346	void	359	void
347	rxvt_img::brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a)	360	rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
348	{	361	{
		362	unshare ();
		363
349	Display *dpy = s->display->dpy;	364	Display *dpy = s->display->dpy;
350	Picture src = create_xrender_mask (dpy, pm, True);
351	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	365	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
352		366
		367	// loop should not be needed for brightness, as only -1..1 makes sense
		368	//while (r \| g \| b \| a)
		369	{
		370	unsigned short xr, xg, xb, xa;
353	XRenderColor mask_c;	371	XRenderColor mask_c;
354	mask_c.red = r;	372
355	mask_c.green = g;	373	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
356	mask_c.blue = b;	374	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
357	mask_c.alpha = a;	375
		376	if (extract (-65535, 0, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
		377	{
		378	XRenderColor mask_w = { 65535, 65535, 65535, 65535 };
		379	XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
		380	mask_c.red = -mask_c.red; //TODO: verify that doing clamp, assign, and negation does the right thing
		381	mask_c.green = -mask_c.green;
		382	mask_c.blue = -mask_c.blue;
		383	mask_c.alpha = -mask_c.alpha;
		384	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
		385	XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
		386	}
		387	}
		388
		389	XRenderFreePicture (dpy, dst);
		390	}
		391
		392	void
		393	rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
		394	{
		395	if (r < 0 \|\| g < 0 \|\| b < 0 \|\| a < 0)
		396	rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
		397
		398	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
		399	img->alloc ();
		400	img->fill (rgba (0, 0, 0, 0));
		401
		402	// premultiply (yeah, these are not exact, sue me or fix it)
		403	r = (r * (a >> 8)) >> 8;
		404	g = (g * (a >> 8)) >> 8;
		405	b = (b * (a >> 8)) >> 8;
		406
		407	Display *dpy = s->display->dpy;
		408
		409	Picture src = src_picture ();
		410	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
		411	Picture mul = create_xrender_mask (dpy, pm, True, True);
		412
		413	//TODO: this operator does not yet implement some useful contrast
		414	while (r \| g \| b \| a)
		415	{
		416	unsigned short xr, xg, xb, xa;
		417	XRenderColor mask_c;
		418
		419	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
		420	{
358	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	421	XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1);
359
360	XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	422	XRenderComposite (dpy, PictOpAdd, src, mul, dst, 0, 0, 0, 0, 0, 0, w, h);
		423	}
		424	}
361		425
		426	XRenderFreePicture (dpy, mul);
		427	XRenderFreePicture (dpy, dst);
362	XRenderFreePicture (dpy, src);	428	XRenderFreePicture (dpy, src);
363	XRenderFreePicture (dpy, dst);
364	}
365		429
366	void	430	::swap (img->ref, ref);
367	rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a)	431	::swap (img->pm , pm );
368	{
369	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
370	return;
371		432
372	Display *dpy = s->display->dpy;	433	delete img;
373	Picture src = create_xrender_mask (dpy, pm, True);
374	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
375
376	XRenderColor mask_c;
377	mask_c.red = r;
378	mask_c.green = g;
379	mask_c.blue = b;
380	mask_c.alpha = a;
381	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
382
383	XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
384
385	XRenderFreePicture (dpy, src);
386	XRenderFreePicture (dpy, dst);
387	}	434	}
388		435
389	rxvt_img *	436	rxvt_img *
390	rxvt_img::clone ()	437	rxvt_img::clone ()
391	{	438	{
…		…
418	if (x == 0 && y == 0 && w == ref->w && h == ref->h)	465	if (x == 0 && y == 0 && w == ref->w && h == ref->h)
419	return clone ();	466	return clone ();
420		467
421	Display *dpy = s->display->dpy;	468	Display *dpy = s->display->dpy;
422		469
		470	// add an alpha channel if...
423	bool alpha = !format->direct.alphaMask	471	bool alpha = !format->direct.alphaMask // pixmap has none yet
424	&& (x \|\| y)	472	&& (x \|\| y) // we need one because of non-zero offset
425	&& repeat == RepeatNone;	473	&& repeat == RepeatNone; // and we have no good pixels to fill with
426		474
427	rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);	475	rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
428	img->alloc ();	476	img->alloc ();
429		477
430	Picture src = src_picture ();	478	Picture src = src_picture ();
…		…
464	}	512	}
465		513
466	return img;	514	return img;
467	}	515	}
468		516
469	rxvt_img *	517	static void
470	rxvt_img::transform (int new_width, int new_height, double matrix[9])	518	mat_invert (double mat[3][3], double (&inv)[3][3])
471	{	519	{
		520	double s0 = mat [2][2] * mat [1][1] - mat [2][1] * mat [1][2];
		521	double s1 = mat [2][1] * mat [0][2] - mat [2][2] * mat [0][1];
		522	double s2 = mat [1][2] * mat [0][1] - mat [1][1] * mat [0][2];
		523
		524	double invdet = 1. / (mat [0][0] * s0 + mat [1][0] * s1 + mat [2][0] * s2);
		525
		526	inv [0][0] = invdet * s0;
		527	inv [0][1] = invdet * s1;
		528	inv [0][2] = invdet * s2;
		529
		530	inv [1][0] = invdet * (mat [2][0] * mat [1][2] - mat [2][2] * mat [1][0]);
		531	inv [1][1] = invdet * (mat [2][2] * mat [0][0] - mat [2][0] * mat [0][2]);
		532	inv [1][2] = invdet * (mat [1][0] * mat [0][2] - mat [1][2] * mat [0][0]);
		533
		534	inv [2][0] = invdet * (mat [2][1] * mat [1][0] - mat [2][0] * mat [1][1]);
		535	inv [2][1] = invdet * (mat [2][0] * mat [0][1] - mat [2][1] * mat [0][0]);
		536	inv [2][2] = invdet * (mat [1][1] * mat [0][0] - mat [1][0] * mat [0][1]);
		537	}
		538
		539	static double
		540	mat_apply (double mat[3][3], int i, double x, double y)
		541	{
		542	double v = mat [i][0] * x + mat [i][1] * y + mat [i][2];
		543	double w = mat [2][0] * x + mat [2][1] * y + mat [2][2];
		544
		545	return v * (1. / w);
		546	}
		547
		548	rxvt_img *
		549	rxvt_img::transform (double matrix[3][3])
		550	{
		551	// find new offset
		552	int ox = mat_apply (matrix, 0, x, y);
		553	int oy = mat_apply (matrix, 1, x, y);
		554
		555	// calculate new pixel bounding box coordinates
		556	double d [2], rmin[2], rmax[2];
		557
		558	for (int i = 0; i < 2; ++i)
		559	{
		560	double v;
		561	v = mat_apply (matrix, i, 0, 0); rmin [i] = rmax [i] = v; d [i] = v;
		562	v = mat_apply (matrix, i, w, 0); min_it (rmin [i], v); max_it (rmax [i], v);
		563	v = mat_apply (matrix, i, 0, h); min_it (rmin [i], v); max_it (rmax [i], v);
		564	v = mat_apply (matrix, i, w, h); min_it (rmin [i], v); max_it (rmax [i], v);
		565	}
		566
		567	int dx = floor (rmin [0]);
		568	int dy = floor (rmin [1]);
		569
		570	int new_width = ceil (rmax [0] - dx);
		571	int new_height = ceil (rmax [1] - dy);
		572
		573	double inv[3][3];
		574	mat_invert (matrix, inv);
		575
472	rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat);	576	rxvt_img *img = new rxvt_img (s, format, ox - dx - d [0], oy - dy - d [1], new_width, new_height, repeat);
473	img->alloc ();	577	img->alloc ();
474		578
475	Display *dpy = s->display->dpy;	579	Display *dpy = s->display->dpy;
476	Picture src = src_picture ();	580	Picture src = src_picture ();
477	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	581	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
478		582
479	XTransform xfrm;	583	XTransform xfrm;
480		584
481	for (int i = 0; i < 3; ++i)	585	for (int i = 0; i < 3; ++i)
482	for (int j = 0; j < 3; ++j)	586	for (int j = 0; j < 3; ++j)
483	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);	587	xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
484
485	#if 0
486	xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
487	xfrm.matrix [1][2] -= XDoubleToFixed (y);
488	#endif
489		588
490	XRenderSetPictureFilter (dpy, src, "good", 0, 0);	589	XRenderSetPictureFilter (dpy, src, "good", 0, 0);
491	XRenderSetPictureTransform (dpy, src, &xfrm);	590	XRenderSetPictureTransform (dpy, src, &xfrm);
492	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);	591	XRenderComposite (dpy, PictOpSrc, src, None, dst, dx, dy, 0, 0, 0, 0, new_width, new_height);
493		592
494	XRenderFreePicture (dpy, src);	593	XRenderFreePicture (dpy, src);
495	XRenderFreePicture (dpy, dst);	594	XRenderFreePicture (dpy, dst);
496		595
497	return img;	596	return img;
…		…
501	rxvt_img::scale (int new_width, int new_height)	600	rxvt_img::scale (int new_width, int new_height)
502	{	601	{
503	if (w == new_width && h == new_height)	602	if (w == new_width && h == new_height)
504	return clone ();	603	return clone ();
505		604
506	double matrix[9] = {	605	double matrix[3][3] = {
507	w / (double)new_width, 0, 0,	606	{ new_width / (double)w, 0, 0 },
508	0, h / (double)new_height, 0,	607	{ 0, new_height / (double)h, 0 },
509	0, 0, 1	608	{ 0, 0, 1 }
510	};	609	};
511		610
512	int old_repeat_mode = repeat;	611	int old_repeat_mode = repeat;
513	repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems	612	repeat = RepeatPad; // not right, but xrender can't properly scale it seems
514		613
515	rxvt_img *img = transform (new_width, new_height, matrix);	614	rxvt_img *img = transform (matrix);
516		615
517	repeat = old_repeat_mode;	616	repeat = old_repeat_mode;
518	img->repeat = repeat;	617	img->repeat = repeat;
519		618
520	return img;	619	return img;
521	}	620	}
522		621
523	rxvt_img *	622	rxvt_img *
524	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)	623	rxvt_img::rotate (int cx, int cy, double phi)
525	{	624	{
526	double s = sin (phi);	625	double s = sin (phi);
527	double c = cos (phi);	626	double c = cos (phi);
528		627
529	double matrix[9] = {	628	double matrix[3][3] = {
530	c, -s, -c * x + s * y + x,	629	{ c, -s, cx - c * cx + s * cy },
531	s, c, -s * x - c * y + y,	630	{ s, c, cy - s * cx - c * cy },
532	0, 0, 1	631	{ 0, 0, 1 }
		632	//{ c, -s, 0 },
		633	//{ s, c, 0 },
		634	//{ 0, 0, 1 }
533	};	635	};
534		636
535	return transform (new_width, new_height, matrix);	637	//move (-cx, -cy);
536	}	638	rxvt_img *img = transform (matrix);
		639	//move ( cx, cy);
		640	//img->move (cx, cy);
537		641
		642	return img;
		643	}
		644
538	rxvt_img *	645	rxvt_img *
539	rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)	646	rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)
540	{	647	{
541	if (new_format == format)	648	if (new_format == format)
542	return clone ();	649	return clone ();
543		650
544	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);	651	rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
…		…
550	int op = PictOpSrc;	657	int op = PictOpSrc;
551		658
552	if (format->direct.alphaMask && !new_format->direct.alphaMask)	659	if (format->direct.alphaMask && !new_format->direct.alphaMask)
553	{	660	{
554	// does it have to be that complicated	661	// does it have to be that complicated
555	rgba c;
556	bg.get (c);
557
558	XRenderColor rc = { c.r, c.g, c.b, 0xffff };	662	XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };
559	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);	663	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
560		664
561	op = PictOpOver;	665	op = PictOpOver;
562	}	666	}
563		667
…		…
574	{	678	{
575	rxvt_img *img2 = clone ();	679	rxvt_img *img2 = clone ();
576	Display *dpy = s->display->dpy;	680	Display *dpy = s->display->dpy;
577	Picture src = img->src_picture ();	681	Picture src = img->src_picture ();
578	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);	682	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
579	Picture mask = create_xrender_mask (dpy, img->pm, False);	683	Picture mask = create_xrender_mask (dpy, img->pm, False, False);
580		684
581	XRenderColor mask_c;	685	XRenderColor mask_c;
582		686
583	mask_c.alpha = float_to_component (factor);	687	mask_c.alpha = float_to_component (factor);
584	mask_c.red =	688	mask_c.red =

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.55 by root, Thu Jun 7 20:26:21 2012 UTC vs. Revision 1.82 by root, Thu Jun 14 17:06:57 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.55 by root, Thu Jun 7 20:26:21 2012 UTC vs.
Revision 1.82 by root, Thu Jun 14 17:06:57 2012 UTC