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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.24 by sf-exg, Tue Jun 5 18:52:48 2012 UTC vs.
Revision 1.44 by root, Thu Jun 7 13:12:08 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	{
18	}	23	}
		24	#endif
19		25
20	rxvt_img *	26	rxvt_img *
21	rxvt_img::new_from_root (rxvt_screen *s)	27	rxvt_img::new_from_root (rxvt_screen *s)
22	{	28	{
23	Display *dpy = s->display->dpy;	29	Display *dpy = s->display->dpy;
…		…
37	return 0;	43	return 0;
38		44
39	rxvt_img *img = new rxvt_img (	45	rxvt_img *img = new rxvt_img (
40	s,	46	s,
41	XRenderFindVisualFormat (dpy, DefaultVisual (dpy, s->display->screen)),	47	XRenderFindVisualFormat (dpy, DefaultVisual (dpy, s->display->screen)),
		48	0,
		49	0,
42	root_pm_w,	50	root_pm_w,
43	root_pm_h,	51	root_pm_h
44	root_pixmap
45	);	52	);
46		53
47	img->shared = true;	54	img->pm = root_pixmap;
		55	img->ref = new pixref (root_pm_w, root_pm_h);
		56	img->ref->ours = false;
48		57
49	return img;	58	return img;
50	}	59	}
51		60
52	rxvt_img *	61	rxvt_img *
…		…
59	rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);	68	rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);
60		69
61	rxvt_img *img = new rxvt_img (	70	rxvt_img *img = new rxvt_img (
62	s,	71	s,
63	XRenderFindStandardFormat (s->display->dpy, gdk_pixbuf_get_has_alpha (pb) ? PictStandardARGB32 : PictStandardRGB24),	72	XRenderFindStandardFormat (s->display->dpy, gdk_pixbuf_get_has_alpha (pb) ? PictStandardARGB32 : PictStandardRGB24),
		73	0,
		74	0,
64	gdk_pixbuf_get_width (pb),	75	gdk_pixbuf_get_width (pb),
65	gdk_pixbuf_get_height (pb)	76	gdk_pixbuf_get_height (pb)
66	);	77	);
67		78	img->alloc ();
68	img->render_pixbuf (pb, 0, 0, img->w, img->h, 0, 0);	79	img->render_pixbuf (pb, 0, 0, img->w, img->h, 0, 0);
69		80
		81	g_object_unref (pb);
		82
		83	return img;
		84	}
		85
		86	void
		87	rxvt_img::destroy ()
		88	{
		89	if (--ref->cnt)
70	return img;	90	return;
		91
		92	if (pm && ref->ours)
		93	XFreePixmap (s->display->dpy, pm);
		94
		95	delete ref;
71	}	96	}
72		97
73	rxvt_img::~rxvt_img ()	98	rxvt_img::~rxvt_img ()
74	{	99	{
75	if (!shared)	100	destroy ();
76	XFreePixmap (s->display->dpy, pm);	101	}
		102
		103	void
		104	rxvt_img::alloc ()
		105	{
		106	pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);
		107	ref = new pixref (w, h);
		108	}
		109
		110	Picture
		111	rxvt_img::src_picture ()
		112	{
		113	Display *dpy = s->display->dpy;
		114
		115	XRenderPictureAttributes pa;
		116	pa.repeat = repeat;
		117	Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
		118
		119	return pic;
77	}	120	}
78		121
79	void	122	void
80	rxvt_img::unshare ()	123	rxvt_img::unshare ()
81	{	124	{
82	if (!shared)	125	if (ref->cnt == 1 && ref->ours)
83	return;	126	return;
84		127
85	rxvt_img *img = clone ();	128	//TODO: maybe should reify instead
		129	Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);
		130	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
		131	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
		132	XFreeGC (s->display->dpy, gc);
86		133
87	::swap (pm , img->pm);	134	destroy ();
88	::swap (shared, img->shared);
89		135
90	delete img;	136	pm = pm2;
		137	ref = new pixref (ref->w, ref->h);
91	}	138	}
92		139
93	void	140	void
94	rxvt_img::fill (const rxvt_color &c)	141	rxvt_img::fill (const rxvt_color &c)
95	{	142	{
…		…
129		176
130	Display *dpy = s->display->dpy;	177	Display *dpy = s->display->dpy;
131	int size = max (rh, rv) * 2 + 1;	178	int size = max (rh, rv) * 2 + 1;
132	double kernel = (double )malloc (size * sizeof (double));	179	double kernel = (double )malloc (size * sizeof (double));
133	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	180	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
134	rxvt_img *img = new rxvt_img (s, format, w, h);	181	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
		182	img->alloc ();
		183
		184	Picture src = src_picture ();
135		185
136	XRenderPictureAttributes pa;	186	XRenderPictureAttributes pa;
137
138	pa.repeat = RepeatPad;	187	pa.repeat = RepeatPad;
139	Picture src = XRenderCreatePicture (dpy, pm , format, CPRepeat, &pa);
140	Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa);	188	Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa);
141		189
142	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);	190	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
143	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);	191	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
144	XFreePixmap (dpy, tmp_pm);	192	XFreePixmap (dpy, tmp_pm);
…		…
198		246
199	return mask;	247	return mask;
200	}	248	}
201		249
202	void	250	void
203	rxvt_img::brightness (double r, double g, double b, double a)	251	rxvt_img::brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a)
204	{	252	{
205	Display *dpy = s->display->dpy;	253	Display *dpy = s->display->dpy;
206	Picture src = create_xrender_mask (dpy, pm, True);	254	Picture src = create_xrender_mask (dpy, pm, True);
207	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	255	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
208		256
209	XRenderColor mask_c;	257	XRenderColor mask_c;
210	mask_c.red = float_to_component (r);	258	mask_c.red = r;
211	mask_c.green = float_to_component (g);	259	mask_c.green = g;
212	mask_c.blue = float_to_component (b);	260	mask_c.blue = b;
213	mask_c.alpha = float_to_component (a);	261	mask_c.alpha = a;
214	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	262	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
215		263
216	XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	264	XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
217		265
218	XRenderFreePicture (dpy, src);	266	XRenderFreePicture (dpy, src);
219	XRenderFreePicture (dpy, dst);	267	XRenderFreePicture (dpy, dst);
220	}	268	}
221		269
222	void	270	void
223	rxvt_img::contrast (double r, double g, double b, double a)	271	rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a)
224	{	272	{
225	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))	273	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
226	return;	274	return;
227		275
228	Display *dpy = s->display->dpy;	276	Display *dpy = s->display->dpy;
229	Picture src = create_xrender_mask (dpy, pm, True);	277	Picture src = create_xrender_mask (dpy, pm, True);
230	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	278	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
231		279
232	XRenderColor mask_c;	280	XRenderColor mask_c;
233	mask_c.red = float_to_component (r);	281	mask_c.red = r;
234	mask_c.green = float_to_component (g);	282	mask_c.green = g;
235	mask_c.blue = float_to_component (b);	283	mask_c.blue = b;
236	mask_c.alpha = float_to_component (a);	284	mask_c.alpha = a;
237	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	285	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
238		286
239	XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	287	XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
240		288
241	XRenderFreePicture (dpy, src);	289	XRenderFreePicture (dpy, src);
…		…
291		339
292	int rowstride = gdk_pixbuf_get_rowstride (pixbuf);	340	int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
293	int channels = gdk_pixbuf_get_n_channels (pixbuf);	341	int channels = gdk_pixbuf_get_n_channels (pixbuf);
294	unsigned char row = gdk_pixbuf_get_pixels (pixbuf) + src_y rowstride + src_x * channels;	342	unsigned char row = gdk_pixbuf_get_pixels (pixbuf) + src_y rowstride + src_x * channels;
295	char *line = ximage->data;	343	char *line = ximage->data;
296
297	rgba c (0, 0, 0);
298
299	if (channels == 4 && alpha_mask == 0)
300	{
301	//pix_colors[Color_bg].get (c);
302	//TODO
303	c.r = 0xffff; c.g = 0xc0c0; c.b = 0xcbcb;//D
304	c.r >>= 8;
305	c.g >>= 8;
306	c.b >>= 8;
307	}
308		344
309	for (int y = 0; y < height; y++)	345	for (int y = 0; y < height; y++)
310	{	346	{
311	for (int x = 0; x < width; x++)	347	for (int x = 0; x < width; x++)
312	{	348	{
…		…
315	unsigned char r, g, b, a;	351	unsigned char r, g, b, a;
316		352
317	if (channels == 4)	353	if (channels == 4)
318	{	354	{
319	a = pixel[3];	355	a = pixel[3];
320	r = (pixel[0] * a + c.r * (0xff - a)) / 0xff;	356	r = pixel[0] * a / 0xff;
321	g = (pixel[1] * a + c.g * (0xff - a)) / 0xff;	357	g = pixel[1] * a / 0xff;
322	b = (pixel[2] * a + c.b * (0xff - a)) / 0xff;	358	b = pixel[2] * a / 0xff;
323	}	359	}
324	else	360	else
325	{	361	{
326	a = 0xff;	362	a = 0xff;
327	r = pixel[0];	363	r = pixel[0];
…		…
352	}	388	}
353		389
354	rxvt_img *	390	rxvt_img *
355	rxvt_img::clone ()	391	rxvt_img::clone ()
356	{	392	{
357	rxvt_img *img = new rxvt_img (s, format, w, h);	393	return new rxvt_img (*this);
358
359	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
360	XCopyArea (s->display->dpy, pm, img->pm, gc, 0, 0, w, h, 0, 0);
361	XFreeGC (s->display->dpy, gc);
362
363	return img;
364	}	394	}
365		395
366	rxvt_img *	396	rxvt_img *
367	rxvt_img::sub_rect (int x, int y, int width, int height, int repeat)	397	rxvt_img::reify ()
368	{	398	{
369	rxvt_img *img = new rxvt_img (s, format, width, height);	399	if (x == 0 && y == 0 && w == ref->w && h == ref->h)
		400	return clone ();
370		401
371	Display *dpy = s->display->dpy;	402	Display *dpy = s->display->dpy;
372	XRenderPictureAttributes pa;	403
373	pa.repeat = repeat;	404	bool alpha = !format->direct.alphaMask
374	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);	405	&& (x \|\| y)
		406	&& repeat == RepeatNone;
		407
		408	rxvt_img *img = new rxvt_img (s, alpha ? XRenderFindStandardFormat (dpy, PictStandardARGB32) : format, 0, 0, w, h, repeat);
		409	img->alloc ();
		410
		411	Picture src = src_picture ();
375	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	412	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
376		413
		414	if (alpha)
		415	{
		416	XRenderColor rc = { 0, 0, 0, 0 };
		417	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
		418	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h);
		419	}
		420	else
377	XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, width, height);	421	XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);
378		422
379	XRenderFreePicture (dpy, src);
380	XRenderFreePicture (dpy, dst);	423	XRenderFreePicture (dpy, src);
		424	XRenderFreePicture (dpy, dst);
381		425
382	return img;	426	return img;
383	}	427	}
384		428
385	rxvt_img *	429	rxvt_img *
		430	rxvt_img::sub_rect (int x, int y, int width, int height)
		431	{
		432	rxvt_img *img = clone ();
		433
		434	img->x += x;
		435	img->y += y;
		436
		437	if (w != width \|\| h != height)
		438	{
		439	img->w = width;
		440	img->h = height;
		441
		442	rxvt_img *img2 = img->reify ();
		443	delete img;
		444	img = img2;
		445	}
		446
		447	return img;
		448	}
		449
		450	rxvt_img *
386	rxvt_img::transform (int new_width, int new_height, double matrix[9], int repeat)	451	rxvt_img::transform (int new_width, int new_height, double matrix[9])
387	{	452	{
388	rxvt_img *img = new rxvt_img (s, format, new_width, new_height);	453	rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat);
		454	img->alloc ();
389		455
390	Display *dpy = s->display->dpy;	456	Display *dpy = s->display->dpy;
391	XRenderPictureAttributes pa;	457	Picture src = src_picture ();
392	pa.repeat = repeat;
393	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
394	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	458	Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
395		459
396	XTransform xfrm;	460	XTransform xfrm;
397		461
398	for (int i = 0; i < 3; ++i)	462	for (int i = 0; i < 3; ++i)
399	for (int j = 0; j < 3; ++j)	463	for (int j = 0; j < 3; ++j)
400	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);	464	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
401		465
		466	#if 0
		467	xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
		468	xfrm.matrix [1][2] -= XDoubleToFixed (y);
		469	#endif
		470
402	XRenderSetPictureFilter (dpy, src, "good", 0, 0);	471	XRenderSetPictureFilter (dpy, src, "good", 0, 0);
403	XRenderSetPictureTransform (dpy, src, &xfrm);	472	XRenderSetPictureTransform (dpy, src, &xfrm);
404	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);	473	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
405		474
406	XRenderFreePicture (dpy, src);	475	XRenderFreePicture (dpy, src);
…		…
410	}	479	}
411		480
412	rxvt_img *	481	rxvt_img *
413	rxvt_img::scale (int new_width, int new_height)	482	rxvt_img::scale (int new_width, int new_height)
414	{	483	{
		484	if (w == new_width && h == new_height)
		485	return clone ();
		486
415	double matrix[9] = {	487	double matrix[9] = {
416	w / (double)new_width, 0, 0,	488	w / (double)new_width, 0, 0,
417	0, h / (double)new_height, 0,	489	0, h / (double)new_height, 0,
418	0, 0, 1	490	0, 0, 1
419	};	491	};
420		492
		493	int old_repeat_mode = repeat;
		494	repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems
		495
421	return transform (new_width, new_height, matrix);	496	rxvt_img *img = transform (new_width, new_height, matrix);
422	}
423		497
		498	repeat = old_repeat_mode;
		499	img->repeat = repeat;
		500
		501	return img;
		502	}
		503
424	rxvt_img *	504	rxvt_img *
425	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi, int repeat)	505	rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)
426	{	506	{
427	double s = sin (phi);	507	double s = sin (phi);
428	double c = cos (phi);	508	double c = cos (phi);
429		509
430	double matrix[9] = {	510	double matrix[9] = {
431	c, -s, -c * x + s * y + x,	511	c, -s, -c * x + s * y + x,
432	s, c, -s * x - c * y + y,	512	s, c, -s * x - c * y + y,
433	0, 0, 1	513	0, 0, 1
434	};	514	};
435		515
436	return transform (new_width, new_height, matrix, repeat);	516	return transform (new_width, new_height, matrix);
437	}	517	}
438		518
439	rxvt_img *	519	rxvt_img *
440	rxvt_img::convert_to (XRenderPictFormat *new_format)	520	rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg)
441	{	521	{
		522	if (new_format == format)
		523	return clone ();
		524
442	rxvt_img *img = new rxvt_img (s, new_format, w, h);	525	rxvt_img *img = new rxvt_img (s, new_format, 0, 0, w, h, repeat);
		526	img->alloc ();
443		527
444	Display *dpy = s->display->dpy;	528	Display *dpy = s->display->dpy;
445	Picture src = XRenderCreatePicture (dpy, pm, format, 0, 0);	529	Picture src = src_picture ();
446	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);	530	Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
		531	int op = PictOpSrc;
447		532
		533	if (format->direct.alphaMask && !new_format->direct.alphaMask)
		534	{
		535	// does it have to be that complicated
		536	rgba c;
		537	bg.get (c);
		538
		539	XRenderColor rc = { c.r, c.g, c.b, 0xffff };
		540	XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);
		541
		542	op = PictOpOver;
		543	}
		544
448	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	545	XRenderComposite (dpy, op, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
449		546
450	XRenderFreePicture (dpy, src);	547	XRenderFreePicture (dpy, src);
451	XRenderFreePicture (dpy, dst);	548	XRenderFreePicture (dpy, dst);
452		549
453	return img;	550	return img;
…		…
456	rxvt_img *	553	rxvt_img *
457	rxvt_img::blend (rxvt_img *img, double factor)	554	rxvt_img::blend (rxvt_img *img, double factor)
458	{	555	{
459	rxvt_img *img2 = clone ();	556	rxvt_img *img2 = clone ();
460	Display *dpy = s->display->dpy;	557	Display *dpy = s->display->dpy;
461	Picture src = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);	558	Picture src = img->src_picture ();
462	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);	559	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
463	Picture mask = create_xrender_mask (dpy, img->pm, False);	560	Picture mask = create_xrender_mask (dpy, img->pm, False);
464		561
465	XRenderColor mask_c;	562	XRenderColor mask_c;
466		563

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.24 by sf-exg, Tue Jun 5 18:52:48 2012 UTC vs. Revision 1.44 by root, Thu Jun 7 13:12:08 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.24 by sf-exg, Tue Jun 5 18:52:48 2012 UTC vs.
Revision 1.44 by root, Thu Jun 7 13:12:08 2012 UTC