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

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.47 by root, Thu Jun 7 19:06:26 2012 UTC vs.
Revision 1.76 by root, Sun Jun 10 10:29:26 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
61	rxvt_img *	55	rxvt_img *
62	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)	56	rxvt_img::new_from_pixbuf (rxvt_screen s, GdkPixbuf pb)
63	{	57	{
		58	Display *dpy = s->display->dpy;
		59
64	int width = gdk_pixbuf_get_width (pb);	60	int width = gdk_pixbuf_get_width (pb);
65	int height = gdk_pixbuf_get_height (pb);	61	int height = gdk_pixbuf_get_height (pb);
66		62
67	if (width > 32767 \|\| height > 32767) // well, we could upload in chunks	63	if (width > 32767 \|\| height > 32767) // well, we could upload in chunks
68	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n");	64	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n");
69		65
70	// since we require rgb24/argb32 formats from xrender we assume	66	// since we require rgb24/argb32 formats from xrender we assume
71	// that both 24 and 32 bpp MUST be supported by any screen that supports xrender	67	// that both 24 and 32 bpp MUST be supported by any screen that supports xrender
72	int depth = gdk_pixbuf_get_has_alpha (pb) ? 32 : 24;	68
		69	int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
73		70
74	XImage xi;	71	XImage xi;
75		72
76	xi.width = width;	73	xi.width = width;
77	xi.height = height;	74	xi.height = height;
78	xi.xoffset = 0;	75	xi.xoffset = 0;
79	xi.format = ZPixmap;	76	xi.format = ZPixmap;
80	xi.byte_order = MSBFirst; // maybe go for host byte order, because servers are usually local?	77	xi.byte_order = ImageByteOrder (dpy);
81	xi.bitmap_unit = 32;	78	xi.bitmap_unit = 0; //XY only, unused
82	xi.bitmap_bit_order = MSBFirst;	79	xi.bitmap_bit_order = 0; //XY only, unused
83	xi.bitmap_pad = 32;	80	xi.bitmap_pad = BitmapPad (dpy);
84	xi.depth = depth;	81	xi.depth = 32;
85	xi.bytes_per_line = 0;	82	xi.bytes_per_line = 0;
86	xi.bits_per_pixel = 32;	83	xi.bits_per_pixel = 32; //Z only
87	xi.red_mask = 0x00ff0000;	84	xi.red_mask = 0x00000000; //Z only, unused
88	xi.green_mask = 0x0000ff00;	85	xi.green_mask = 0x00000000; //Z only, unused
89	xi.blue_mask = 0x000000ff;	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		90
91	if (!XInitImage (&xi))	91	if (!XInitImage (&xi))
92	rxvt_fatal ("unable to initialise ximage, please report.\n");	92	rxvt_fatal ("unable to initialise ximage, please report.\n");
93		93
94	if (height > INT_MAX / xi.bytes_per_line)	94	if (height > INT_MAX / xi.bytes_per_line)
95	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");	95	rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");
96		96
97	xi.data = (char )rxvt_malloc (height xi.bytes_per_line);	97	xi.data = (char )rxvt_malloc (height xi.bytes_per_line);
98		98
99	int rowstride = gdk_pixbuf_get_rowstride (pb);	99	int rowstride = gdk_pixbuf_get_rowstride (pb);
100		100	bool pb_has_alpha = gdk_pixbuf_get_has_alpha (pb);
101	assert (3 + (depth == 32) == gdk_pixbuf_get_n_channels (pb));
102	unsigned char *row = gdk_pixbuf_get_pixels (pb);	101	unsigned char *row = gdk_pixbuf_get_pixels (pb);
		102
103	char *line = xi.data;	103	char *line = xi.data;
104		104
105	for (int y = 0; y < height; y++)	105	for (int y = 0; y < height; y++)
106	{	106	{
107	unsigned char r, g, b, a;
108	unsigned char *data = row;	107	unsigned char *src = row;
		108	uint32_t dst = (uint32_t )line;
109		109
110	if (depth == 24)	110	if (!pb_has_alpha)
111	for (int x = 0; x < width; x++)	111	for (int x = 0; x < width; x++)
112	{	112	{
113	r = *data++;	113	uint8_t r = *src++;
114	g = *data++;	114	uint8_t g = *src++;
115	b = *data++;	115	uint8_t b = *src++;
		116
		117	uint32_t v = (255 << 24) \| (r << 16) \| (g << 8) \| b;
		118
		119	if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
		120	v = ecb_bswap32 (v);
		121
116	*line++ = 0;	122	*dst++ = v;
117	*line++ = r;
118	*line++ = g;
119	*line++ = b;
120	}	123	}
121	else	124	else
122	for (int x = 0; x < width; x++)	125	for (int x = 0; x < width; x++)
123	{	126	{
124	r = *data++;	127	uint32_t v = (uint32_t )src; src += 4;
125	g = *data++;	128
126	b = *data++;	129	if (ecb_big_endian ())
127	a = *data++;	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
128	*line++ = a;	137	*dst++ = v;
129	*line++ = r;
130	*line++ = g;
131	*line++ = b;
132	}	138	}
133		139
134	row += rowstride;	140	row += rowstride;
		141	line += xi.bytes_per_line;
135	}	142	}
136		143
137	Display *dpy = s->display->dpy;
138
139	rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, depth == 24 ? PictStandardRGB24 : PictStandardARGB32), 0, 0, width, height);	144	rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, PictStandardARGB32), 0, 0, width, height);
140	img->alloc ();	145	img->alloc ();
141		146
142	GC gc = XCreateGC (dpy, img->pm, 0, 0);	147	GC gc = XCreateGC (dpy, img->pm, 0, 0);
143	XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);	148	XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);
144	XFreeGC (dpy, gc);	149	XFreeGC (dpy, gc);
…		…
161		166
162	g_object_unref (pb);	167	g_object_unref (pb);
163		168
164	return img;	169	return img;
165	}	170	}
		171	# endif
166		172
167	void	173	void
168	rxvt_img::destroy ()	174	rxvt_img::destroy ()
169	{	175	{
170	if (--ref->cnt)	176	if (--ref->cnt)
…		…
204	rxvt_img::unshare ()	210	rxvt_img::unshare ()
205	{	211	{
206	if (ref->cnt == 1 && ref->ours)	212	if (ref->cnt == 1 && ref->ours)
207	return;	213	return;
208		214
209	//TODO: maybe should reify instead
210	Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);	215	Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);
211	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);	216	GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
212	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);	217	XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
213	XFreeGC (s->display->dpy, gc);	218	XFreeGC (s->display->dpy, gc);
214		219
…		…
260	double kernel = (double )malloc (size * sizeof (double));	265	double kernel = (double )malloc (size * sizeof (double));
261	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	266	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
262	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);	267	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
263	img->alloc ();	268	img->alloc ();
264		269
265	Picture src = src_picture ();
266
267	XRenderPictureAttributes pa;	270	XRenderPictureAttributes pa;
268	pa.repeat = RepeatPad;	271	pa.repeat = RepeatPad;
269	Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa);	272	Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
		273	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
270		274
271	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);	275	Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
272	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);	276	Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
273	XFreePixmap (dpy, tmp_pm);	277	XFreePixmap (dpy, tmp_pm);
274		278
…		…
290		294
291	size = rv * 2 + 1;	295	size = rv * 2 + 1;
292	get_gaussian_kernel (rv, size, kernel, params);	296	get_gaussian_kernel (rv, size, kernel, params);
293	::swap (params[0], params[1]);	297	::swap (params[0], params[1]);
294		298
295	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);	299	XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
296	XRenderComposite (dpy,	300	XRenderComposite (dpy,
297	PictOpSrc,	301	PictOpSrc,
298	tmp,	302	tmp,
299	None,	303	None,
300	dst,	304	dst,
…		…
312		316
313	return img;	317	return img;
314	}	318	}
315		319
316	static Picture	320	static Picture
317	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb)	321	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
318	{	322	{
319	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);	323	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
320		324
321	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);	325	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
322	XRenderPictureAttributes pa;	326	XRenderPictureAttributes pa;
323	pa.repeat = True;	327	pa.repeat = RepeatNormal;
		328	pa.component_alpha = component_alpha;
324	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);	329	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat \| CPComponentAlpha, &pa);
325		330
326	XFreePixmap (dpy, pixmap);	331	XFreePixmap (dpy, pixmap);
327		332
328	return mask;	333	return mask;
329	}	334	}
330		335
		336	static void
		337	extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
		338	{
		339	int32_t x = clamp (c, cl0, cl1);
		340	c -= x;
		341	xc = x;
		342	}
		343
		344	static bool
		345	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)
		346	{
		347	extract (cl0, cl1, r, xr);
		348	extract (cl0, cl1, g, xg);
		349	extract (cl0, cl1, b, xb);
		350	extract (cl0, cl1, a, xa);
		351
		352	return xr \| xg \| xb \| xa;
		353	}
		354
331	void	355	void
332	rxvt_img::brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a)	356	rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
333	{	357	{
		358	unshare ();
		359
334	Display *dpy = s->display->dpy;	360	Display *dpy = s->display->dpy;
335	Picture src = create_xrender_mask (dpy, pm, True);
336	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);	361	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
337		362
		363	// loop should not be needed for brightness, as only -1..1 makes sense
		364	//while (r \| g \| b \| a)
		365	{
		366	unsigned short xr, xg, xb, xa;
338	XRenderColor mask_c;	367	XRenderColor mask_c;
339	mask_c.red = r;	368
340	mask_c.green = g;	369	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
341	mask_c.blue = b;	370	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
342	mask_c.alpha = a;	371
		372	if (extract (-65535, 0, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
		373	{
		374	XRenderColor mask_w = { 65535, 65535, 65535, 65535 };
		375	XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
		376	mask_c.red = -mask_c.red; //TODO: verify that doing clamp, assign, and negation does the right thing
		377	mask_c.green = -mask_c.green;
		378	mask_c.blue = -mask_c.blue;
		379	mask_c.alpha = -mask_c.alpha;
		380	XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
		381	XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
		382	}
		383	}
		384
		385	XRenderFreePicture (dpy, dst);
		386	}
		387
		388	void
		389	rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
		390	{
		391	if (r < 0 \|\| g < 0 \|\| b < 0 \|\| a < 0)
		392	rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
		393
		394	rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
		395	img->alloc ();
		396
		397	{
		398	rxvt_color empty;
		399	empty.set (s, rgba (0, 0, 0, 0));
		400	img->fill (empty);
		401	}
		402
		403	// premultiply (yeah, these are not exact, sue me or fix it)
		404	r = (r * (a >> 8)) >> 8;
		405	g = (g * (a >> 8)) >> 8;
		406	b = (b * (a >> 8)) >> 8;
		407
		408	Display *dpy = s->display->dpy;
		409
		410	Picture src = src_picture ();
		411	Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
		412	Picture mul = create_xrender_mask (dpy, pm, True, True);
		413
		414	//TODO: this operator does not yet implement some useful contrast
		415	while (r \| g \| b \| a)
		416	{
		417	unsigned short xr, xg, xb, xa;
		418	XRenderColor mask_c;
		419
		420	if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
		421	{
343	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);	422	XRenderFillRectangle (dpy, PictOpSrc, mul, &mask_c, 0, 0, 1, 1);
344
345	XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);	423	XRenderComposite (dpy, PictOpAdd, src, mul, dst, 0, 0, 0, 0, 0, 0, w, h);
		424	}
		425	}
346		426
		427	XRenderFreePicture (dpy, mul);
		428	XRenderFreePicture (dpy, dst);
347	XRenderFreePicture (dpy, src);	429	XRenderFreePicture (dpy, src);
348	XRenderFreePicture (dpy, dst);
349	}
350		430
351	void	431	::swap (img->ref, ref);
352	rxvt_img::contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a)	432	::swap (img->pm , pm );
353	{
354	if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL))
355	return;
356		433
357	Display *dpy = s->display->dpy;	434	delete img;
358	Picture src = create_xrender_mask (dpy, pm, True);
359	Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
360
361	XRenderColor mask_c;
362	mask_c.red = r;
363	mask_c.green = g;
364	mask_c.blue = b;
365	mask_c.alpha = a;
366	XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
367
368	XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
369
370	XRenderFreePicture (dpy, src);
371	XRenderFreePicture (dpy, dst);
372	}	435	}
373		436
374	rxvt_img *	437	rxvt_img *
375	rxvt_img::clone ()	438	rxvt_img::clone ()
376	{	439	{
…		…
403	if (x == 0 && y == 0 && w == ref->w && h == ref->h)	466	if (x == 0 && y == 0 && w == ref->w && h == ref->h)
404	return clone ();	467	return clone ();
405		468
406	Display *dpy = s->display->dpy;	469	Display *dpy = s->display->dpy;
407		470
		471	// add an alpha channel if...
408	bool alpha = !format->direct.alphaMask	472	bool alpha = !format->direct.alphaMask // pixmap has none yet
409	&& (x \|\| y)	473	&& (x \|\| y) // we need one because of non-zero offset
410	&& repeat == RepeatNone;	474	&& repeat == RepeatNone; // and we have no good pixels to fill with
411		475
412	rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);	476	rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
413	img->alloc ();	477	img->alloc ();
414		478
415	Picture src = src_picture ();	479	Picture src = src_picture ();
…		…
465		529
466	for (int i = 0; i < 3; ++i)	530	for (int i = 0; i < 3; ++i)
467	for (int j = 0; j < 3; ++j)	531	for (int j = 0; j < 3; ++j)
468	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);	532	xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
469		533
470	#if 0
471	xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO	534	xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
472	xfrm.matrix [1][2] -= XDoubleToFixed (y);	535	xfrm.matrix [1][2] -= XDoubleToFixed (y);
473	#endif
474		536
475	XRenderSetPictureFilter (dpy, src, "good", 0, 0);	537	XRenderSetPictureFilter (dpy, src, "good", 0, 0);
476	XRenderSetPictureTransform (dpy, src, &xfrm);	538	XRenderSetPictureTransform (dpy, src, &xfrm);
477	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);	539	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
478		540
…		…
559	{	621	{
560	rxvt_img *img2 = clone ();	622	rxvt_img *img2 = clone ();
561	Display *dpy = s->display->dpy;	623	Display *dpy = s->display->dpy;
562	Picture src = img->src_picture ();	624	Picture src = img->src_picture ();
563	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);	625	Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
564	Picture mask = create_xrender_mask (dpy, img->pm, False);	626	Picture mask = create_xrender_mask (dpy, img->pm, False, False);
565		627
566	XRenderColor mask_c;	628	XRenderColor mask_c;
567		629
568	mask_c.alpha = float_to_component (factor);	630	mask_c.alpha = float_to_component (factor);
569	mask_c.red =	631	mask_c.red =

Diff Legend

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

Comparing rxvt-unicode/src/rxvtimg.C (file contents): Revision 1.47 by root, Thu Jun 7 19:06:26 2012 UTC vs. Revision 1.76 by root, Sun Jun 10 10:29:26 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.47 by root, Thu Jun 7 19:06:26 2012 UTC vs.
Revision 1.76 by root, Sun Jun 10 10:29:26 2012 UTC