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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.189 by sf-exg, Thu Dec 29 16:45:22 2011 UTC vs.
Revision 1.205 by sf-exg, Wed Apr 11 10:06:45 2012 UTC

…		…
20	* You should have received a copy of the GNU General Public License	20	* You should have received a copy of the GNU General Public License
21	* along with this program; if not, write to the Free Software	21	* along with this program; if not, write to the Free Software
22	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	22	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
23	---------------------------------------------------------------------/	23	---------------------------------------------------------------------/
24		24
25	#include <cmath>	25	#include <math.h>
26	#include "../config.h" /* NECESSARY */	26	#include "../config.h" /* NECESSARY */
27	#include "rxvt.h" /* NECESSARY */	27	#include "rxvt.h" /* NECESSARY */
28		28
29	#if XRENDER	29	#if XRENDER
30	# include <X11/extensions/Xrender.h>	30	# include <X11/extensions/Xrender.h>
31	#endif	31	#endif
32		32
33	#ifndef FilterConvolution	33	#ifndef FilterConvolution
34	#define FilterConvolution "convolution"	34	#define FilterConvolution "convolution"
		35	#endif
		36
		37	#ifndef RepeatPad
		38	#define RepeatPad True
35	#endif	39	#endif
36		40
37	#ifdef HAVE_BG_PIXMAP	41	#ifdef HAVE_BG_PIXMAP
38	# if XRENDER	42	# if XRENDER
39	static Picture	43	static Picture
…		…
54	# endif	58	# endif
55		59
56	void	60	void
57	rxvt_term::bg_destroy ()	61	rxvt_term::bg_destroy ()
58	{	62	{
59	#ifdef HAVE_AFTERIMAGE
60	if (original_asim)
61	safe_asimage_destroy (original_asim);
62	if (asv)
63	destroy_asvisual (asv, 0);
64	if (asimman)
65	destroy_image_manager (asimman, 0);
66	#endif
67
68	#ifdef HAVE_PIXBUF	63	#ifdef HAVE_PIXBUF
69	if (pixbuf)	64	if (pixbuf)
70	g_object_unref (pixbuf);	65	g_object_unref (pixbuf);
71	#endif	66	#endif
72		67
…		…
125		120
126	return false;	121	return false;
127	}	122	}
128		123
129	# ifdef BG_IMAGE_FROM_FILE	124	# ifdef BG_IMAGE_FROM_FILE
130	static inline bool
131	check_set_scale_value (int geom_flags, int flag, unsigned int &scale, unsigned int new_value)
132	{
133	if (geom_flags & flag)
134	{
135	if (new_value > 1000)
136	new_value = 1000;
137	if (new_value != scale)
138	{
139	scale = new_value;
140	return true;
141	}
142	}
143	return false;
144	}
145
146	static inline bool
147	check_set_align_value (int geom_flags, int flag, int &align, int new_value)
148	{
149	if (geom_flags & flag)
150	{
151	if (new_value < -100)
152	new_value = -100;
153	else if (new_value > 200)
154	new_value = 200;
155	if (new_value != align)
156	{
157	align = new_value;
158	return true;
159	}
160	}
161	return false;
162	}
163
164	static inline int	125	static inline int
165	make_align_position (int align, int window_size, int image_size)	126	make_align_position (int align, int window_size, int image_size)
166	{	127	{
167	int diff = window_size - image_size;	128	int diff = window_size - image_size;
168	int smaller = min (image_size, window_size);	129	int smaller = min (image_size, window_size);
169		130
170	if (align >= 0 && align <= 100)	131	if (align >= 0 && align <= 100)
171	return diff * align / 100;	132	return diff * align / 100;
172	else if (align > 100 && align <= 200)	133	else if (align > 100)
173	return (align - 100) * smaller / 100 + window_size - smaller;	134	return (align - 100) * smaller / 100 + window_size - smaller;
174	else if (align >= -100 && align < 0)	135	else
175	return (align + 100) * smaller / 100 - image_size;	136	return (align + 100) * smaller / 100 - image_size;
176	return 0;
177	}	137	}
178		138
179	static inline int	139	static inline int
180	make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)	140	make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
181	{	141	{
…		…
187	src_pos = -pos;	147	src_pos = -pos;
188	dst_pos = 0;	148	dst_pos = 0;
189	dst_size += pos;	149	dst_size += pos;
190	}	150	}
191		151
192	if (dst_pos + dst_size > target_size)
193	dst_size = target_size - dst_pos;	152	min_it (dst_size, target_size - dst_pos);
194	return src_pos;	153	return src_pos;
195	}	154	}
196		155
197	bool	156	bool
198	rxvt_term::bg_set_geometry (const char *geom, bool update)	157	rxvt_term::bg_set_geometry (const char *geom, bool update)
199	{	158	{
200	bool changed = false;	159	bool changed = false;
201	int geom_flags = 0;	160	int geom_flags = 0;
202	int x = 0, y = 0;	161	int x = h_align;
		162	int y = v_align;
203	unsigned int w = 0, h = 0;	163	unsigned int w = h_scale;
		164	unsigned int h = v_scale;
204	unsigned long new_flags = 0;	165	unsigned long new_flags = 0;
205		166
206	if (geom == NULL)	167	if (geom == NULL)
207	return false;	168	return false;
208		169
…		…
317	w = h = defaultScale;	278	w = h = defaultScale;
318	else if (!(geom_flags & HeightValue))	279	else if (!(geom_flags & HeightValue))
319	h = w;	280	h = w;
320	else if (!(geom_flags & WidthValue))	281	else if (!(geom_flags & WidthValue))
321	w = h;	282	w = h;
322
323	geom_flags \|= WidthValue\|HeightValue\|XValue\|YValue;
324	}	283	}
325		284
326	if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;	285	min_it (w, 1000);
327	if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;	286	min_it (h, 1000);
328	if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;	287	clamp_it (x, -100, 200);
329	if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;	288	clamp_it (y, -100, 200);
330		289
331	if (new_flags != bg_flags)	290	if (bg_flags != new_flags
		291	\|\| h_scale != w
		292	\|\| v_scale != h
		293	\|\| h_align != x
		294	\|\| v_align != y)
332	{	295	{
333	bg_flags = new_flags;	296	bg_flags = new_flags;
		297	h_scale = w;
		298	v_scale = h;
		299	h_align = x;
		300	v_align = y;
334	changed = true;	301	changed = true;
335	}	302	}
336		303
337	return changed;	304	return changed;
338	}	305	}
…		…
366	{	333	{
367	x = make_align_position (h_align, target_width, w);	334	x = make_align_position (h_align, target_width, w);
368	y = make_align_position (v_align, target_height, h);	335	y = make_align_position (v_align, target_height, h);
369	}	336	}
370		337
371	bg_flags &= ~BG_IS_SIZE_SENSITIVE;
372	if (!(bg_flags & BG_TILE)	338	if (!(bg_flags & BG_TILE)
373	\|\| h_scale \|\| v_scale	339	\|\| h_scale \|\| v_scale
374	\|\| (!(bg_flags & BG_ROOT_ALIGN) && (h_align \|\| v_align))	340	\|\| (!(bg_flags & BG_ROOT_ALIGN) && (h_align \|\| v_align))
375	\|\| w > target_width \|\| h > target_height)	341	\|\| image_width > target_width \|\| image_height > target_height)
376	bg_flags \|= BG_IS_SIZE_SENSITIVE;	342	bg_flags \|= BG_IS_SIZE_SENSITIVE;
377	}
378
379	# ifdef HAVE_AFTERIMAGE
380	bool
381	rxvt_term::render_image (unsigned long tr_flags)
382	{
383	init_asv ();
384
385	ASImage *background = NULL;
386	ARGB32 background_tint = TINT_LEAVE_SAME;
387
388	# ifdef ENABLE_TRANSPARENCY
389	if (tr_flags)
390	background = pixmap2ximage (asv, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, 100);
391
392	if (tr_flags & BG_NEEDS_TINT)
393	{
394	ShadingInfo as_shade;
395	as_shade.shading = shade;
396
397	rgba c;
398	tint.get (c);
399	as_shade.tintColor.red = c.r;
400	as_shade.tintColor.green = c.g;
401	as_shade.tintColor.blue = c.b;
402
403	background_tint = shading2tint32 (&as_shade);
404	}
405
406	if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
407	{
408	ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
409	ASA_XImage,
410	100, ASIMAGE_QUALITY_DEFAULT);
411	if (tmp)
412	{
413	destroy_asimage (&background);
414	background = tmp;
415	}
416	}
417	# endif
418
419	ASImage *result = 0;
420
421	int target_width = szHint.width;
422	int target_height = szHint.height;
423	int new_pmap_width = target_width;
424	int new_pmap_height = target_height;
425
426	int x = 0;
427	int y = 0;
428	int w = 0;
429	int h = 0;
430
431	if (original_asim)
432	get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
433
434	if (!original_asim
435	\|\| (!(bg_flags & BG_ROOT_ALIGN)
436	&& (x >= target_width
437	\|\| y >= target_height
438	\|\| x + w <= 0
439	\|\| y + h <= 0)))
440	{
441	if (background)
442	{
443	new_pmap_width = background->width;
444	new_pmap_height = background->height;
445	result = background;
446
447	if (background_tint != TINT_LEAVE_SAME)
448	{
449	ASImage *tmp = tile_asimage (asv, background, 0, 0,
450	target_width, target_height, background_tint,
451	ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
452	if (tmp)
453	result = tmp;
454	}
455	}
456	else
457	new_pmap_width = new_pmap_height = 0;
458	}
459	else	343	else
460	{	344	bg_flags &= ~BG_IS_SIZE_SENSITIVE;
461	result = original_asim;
462
463	if (w != original_asim->width
464	\|\| h != original_asim->height)
465	{
466	result = scale_asimage (asv, original_asim,
467	w, h,
468	ASA_XImage,
469	100, ASIMAGE_QUALITY_DEFAULT);
470	}
471
472	if (background == NULL)
473	{
474	if (bg_flags & BG_TILE)
475	{
476	/* if tiling - pixmap has to be sized exactly as the image,
477	but there is no need to make it bigger than the window! */
478	new_pmap_width = min (result->width, target_width);
479	new_pmap_height = min (result->height, target_height);
480
481	/* we also need to tile our image in both directions */
482	ASImage *tmp = tile_asimage (asv, result,
483	(int)result->width - x,
484	(int)result->height - y,
485	new_pmap_width,
486	new_pmap_height,
487	TINT_LEAVE_SAME, ASA_XImage,
488	100, ASIMAGE_QUALITY_DEFAULT);
489	if (tmp)
490	{
491	if (result != original_asim)
492	destroy_asimage (&result);
493
494	result = tmp;
495	}
496	}
497	}
498	else
499	{
500	/* if blending background and image - pixmap has to be sized same as target window */
501	ASImageLayer *layers = create_image_layers (2);
502
503	layers[0].im = background;
504	layers[0].clip_width = target_width;
505	layers[0].clip_height = target_height;
506	layers[0].tint = background_tint;
507	layers[1].im = result;
508
509	if (bg_flags & BG_TILE)
510	{
511	/* tile horizontally */
512	while (x > 0) x -= (int)result->width;
513	layers[1].dst_x = x;
514	layers[1].clip_width = result->width+target_width;
515	}
516	else
517	{
518	/* clip horizontally */
519	layers[1].dst_x = x;
520	layers[1].clip_width = result->width;
521	}
522
523	if (bg_flags & BG_TILE)
524	{
525	while (y > 0) y -= (int)result->height;
526	layers[1].dst_y = y;
527	layers[1].clip_height = result->height + target_height;
528	}
529	else
530	{
531	layers[1].dst_y = y;
532	layers[1].clip_height = result->height;
533	}
534
535	if (rs[Rs_blendtype])
536	{
537	layers[1].merge_scanlines = blend_scanlines_name2func (rs[Rs_blendtype]);
538	if (layers[1].merge_scanlines == NULL)
539	layers[1].merge_scanlines = alphablend_scanlines;
540	}
541
542	ASImage *tmp = merge_layers (asv, layers, 2, target_width, target_height,
543	ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
544
545	if (tmp)
546	{
547	if (result != original_asim)
548	destroy_asimage (&result);
549
550	result = tmp;
551	}
552
553	free (layers);
554	}
555	}
556
557	bool ret = false;
558
559	if (result)
560	{
561	XGCValues gcv;
562	GC gc;
563
564	/* create Pixmap */
565	if (bg_pixmap == None
566	\|\| bg_pmap_width != new_pmap_width
567	\|\| bg_pmap_height != new_pmap_height)
568	{
569	if (bg_pixmap)
570	XFreePixmap (dpy, bg_pixmap);
571	bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
572	bg_pmap_width = new_pmap_width;
573	bg_pmap_height = new_pmap_height;
574	}
575	/* fill with background color (if result's not completely overlapping it) */
576	gcv.foreground = pix_colors[Color_bg];
577	gc = XCreateGC (dpy, vt, GCForeground, &gcv);
578
579	int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
580	int dst_width = result->width, dst_height = result->height;
581	if (background == NULL)
582	{
583	if (!(bg_flags & BG_TILE))
584	{
585	src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
586	src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
587	}
588
589	if (dst_x > 0 \|\| dst_y > 0
590	\|\| dst_x + dst_width < new_pmap_width
591	\|\| dst_y + dst_height < new_pmap_height)
592	XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
593	}
594
595	/* put result on pixmap */
596	if (dst_x < new_pmap_width && dst_y < new_pmap_height)
597	asimage2drawable (asv, bg_pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
598
599	if (result != background && result != original_asim)
600	destroy_asimage (&result);
601
602	XFreeGC (dpy, gc);
603
604	ret = true;
605	}
606
607	if (background)
608	destroy_asimage (&background);
609
610	return ret;
611	}	345	}
612	# endif /* HAVE_AFTERIMAGE */
613		346
614	# ifdef HAVE_PIXBUF	347	# ifdef HAVE_PIXBUF
615	bool	348	bool
616	rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,	349	rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
617	int src_x, int src_y, int dst_x, int dst_y,	350	int src_x, int src_y, int dst_x, int dst_y,
…		…
694	XDestroyImage (ximage);	427	XDestroyImage (ximage);
695	return true;	428	return true;
696	}	429	}
697		430
698	bool	431	bool
699	rxvt_term::render_image (unsigned long tr_flags)	432	rxvt_term::render_image (bool transparent)
700	{	433	{
701	if (!pixbuf)	434	if (!pixbuf)
702	return false;	435	return false;
703		436
704	if (tr_flags	437	if (transparent
705	&& !(bg_flags & BG_HAS_RENDER))	438	&& !(bg_flags & BG_HAS_RENDER))
706	return false;	439	return false;
707		440
708	GdkPixbuf *result;	441	GdkPixbuf *result;
709		442
…		…
749	Pixmap root_pmap;	482	Pixmap root_pmap;
750		483
751	image_width = gdk_pixbuf_get_width (result);	484	image_width = gdk_pixbuf_get_width (result);
752	image_height = gdk_pixbuf_get_height (result);	485	image_height = gdk_pixbuf_get_height (result);
753		486
754	if (tr_flags)	487	if (transparent)
755	{	488	{
756	root_pmap = bg_pixmap;	489	root_pmap = bg_pixmap;
757	bg_pixmap = None;	490	bg_pixmap = None;
758	}	491	}
759	else	492	else
…		…
817	dst_x, dst_y,	550	dst_x, dst_y,
818	dst_width, dst_height);	551	dst_width, dst_height);
819	}	552	}
820		553
821	#if XRENDER	554	#if XRENDER
822	if (tr_flags)	555	if (transparent)
823	{	556	{
824	XRenderPictureAttributes pa;
825
826	XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, visual);	557	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
		558
827	Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);	559	Picture src = XRenderCreatePicture (dpy, root_pmap, format, 0, 0);
828		560
829	XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
830	Picture dst = XRenderCreatePicture (dpy, bg_pixmap, dst_format, 0, &pa);	561	Picture dst = XRenderCreatePicture (dpy, bg_pixmap, format, 0, 0);
831		562
832	Picture mask = create_xrender_mask (dpy, vt, False, False);	563	Picture mask = create_xrender_mask (dpy, vt, False, False);
833		564
834	XRenderColor mask_c;	565	XRenderColor mask_c;
835		566
836	mask_c.alpha = 0x8000;	567	mask_c.alpha = 0x8000;
837	mask_c.red = 0;	568	mask_c.red =
838	mask_c.green = 0;	569	mask_c.green =
839	mask_c.blue = 0;	570	mask_c.blue = 0;
840	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);	571	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
		572
841	XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);	573	XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
842		574
843	XRenderFreePicture (dpy, src);	575	XRenderFreePicture (dpy, src);
844	XRenderFreePicture (dpy, dst);	576	XRenderFreePicture (dpy, dst);
845	XRenderFreePicture (dpy, mask);	577	XRenderFreePicture (dpy, mask);
…		…
852	}	584	}
853		585
854	if (result != pixbuf)	586	if (result != pixbuf)
855	g_object_unref (result);	587	g_object_unref (result);
856		588
857	if (tr_flags)	589	if (transparent)
858	XFreePixmap (dpy, root_pmap);	590	XFreePixmap (dpy, root_pmap);
859		591
860	return ret;	592	return ret;
861	}	593	}
862	# endif /* HAVE_PIXBUF */	594	# endif /* HAVE_PIXBUF */
…		…
877	memcpy (f, file, len);	609	memcpy (f, file, len);
878	f[len] = '\0';	610	f[len] = '\0';
879	file = f;	611	file = f;
880	}	612	}
881		613
882	# ifdef HAVE_AFTERIMAGE
883	if (!asimman)
884	asimman = create_generic_imageman (rs[Rs_path]);
885	ASImage *image = get_asimage (asimman, file, 0xFFFFFFFF, 100);
886	if (image)
887	{
888	if (original_asim)
889	safe_asimage_destroy (original_asim);
890	original_asim = image;
891	bg_flags \|= BG_IS_FROM_FILE \| BG_CLIENT_RENDER;
892	ret = true;
893	}
894	# endif
895
896	# ifdef HAVE_PIXBUF	614	# ifdef HAVE_PIXBUF
897	GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);	615	GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
898	if (image)	616	if (image)
899	{	617	{
900	if (pixbuf)	618	if (pixbuf)
…		…
957	{	675	{
958	changed = true;	676	changed = true;
959	v_blurRadius = vr;	677	v_blurRadius = vr;
960	}	678	}
961		679
962	if (v_blurRadius == 0 && h_blurRadius == 0)	680	if (h_blurRadius && v_blurRadius)
		681	bg_flags \|= BG_NEEDS_BLUR;
		682	else
963	bg_flags &= ~BG_NEEDS_BLUR;	683	bg_flags &= ~BG_NEEDS_BLUR;
964	else
965	bg_flags \|= BG_NEEDS_BLUR;
966		684
967	return changed;	685	return changed;
968	}	686	}
969		687
970	void	688	void
971	rxvt_term::set_tint_shade_flags ()	689	rxvt_term::set_tint_shade_flags ()
972	{	690	{
973	rgba c;	691	if (shade != 100 \|\| (bg_flags & BG_TINT_SET))
974	bool has_shade = shade != 100;
975
976	bg_flags &= ~BG_TINT_FLAGS;
977
978	tint.get (c);
979
980	if (!has_shade
981	&& (c.r <= 0x00ff \|\| c.r >= 0xff00)
982	&& (c.g <= 0x00ff \|\| c.g >= 0xff00)
983	&& (c.b <= 0x00ff \|\| c.b >= 0xff00))
984	bg_flags \|= BG_TINT_BITAND;
985
986	if (has_shade
987	\|\| c.r < 0xff00
988	\|\| c.g < 0xff00
989	\|\| c.b < 0xff00)
990	bg_flags \|= BG_NEEDS_TINT;	692	bg_flags \|= BG_NEEDS_TINT;
		693	else
		694	bg_flags &= ~BG_NEEDS_TINT;
991	}	695	}
992		696
993	bool	697	bool
994	rxvt_term::bg_set_tint (rxvt_color &new_tint)	698	rxvt_term::bg_set_tint (rxvt_color &new_tint)
995	{	699	{
996	if (tint != new_tint)	700	if (!(bg_flags & BG_TINT_SET) \|\| tint != new_tint)
997	{	701	{
998	tint = new_tint;	702	tint = new_tint;
		703	bg_flags \|= BG_TINT_SET;
		704
		705	rgba c;
		706	tint.get (c);
		707	if ((c.r <= 0x00ff \|\| c.r >= 0xff00)
		708	&& (c.g <= 0x00ff \|\| c.g >= 0xff00)
		709	&& (c.b <= 0x00ff \|\| c.b >= 0xff00))
		710	bg_flags \|= BG_TINT_BITAND;
		711	else
		712	bg_flags &= ~BG_TINT_BITAND;
		713
999	set_tint_shade_flags ();	714	set_tint_shade_flags ();
1000	return true;	715	return true;
1001	}	716	}
1002		717
1003	return false;	718	return false;
…		…
1044	params[i+2] = XDoubleToFixed (kernel[i] / sum);	759	params[i+2] = XDoubleToFixed (kernel[i] / sum);
1045	}	760	}
1046	#endif	761	#endif
1047		762
1048	bool	763	bool
1049	rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)	764	rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height, int depth)
1050	{	765	{
1051	bool ret = false;	766	bool ret = false;
1052	#if XRENDER	767	#if XRENDER
1053	if (!(bg_flags & BG_HAS_RENDER_CONV))	768	if (!(bg_flags & BG_HAS_RENDER_CONV))
1054	return false;	769	return false;
…		…
1058	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	773	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
1059		774
1060	XRenderPictureAttributes pa;	775	XRenderPictureAttributes pa;
1061	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);	776	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1062		777
		778	pa.repeat = RepeatPad;
1063	Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);	779	Picture src = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
		780	Pixmap tmp = XCreatePixmap (dpy, pixmap, width, height, depth);
1064	Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);	781	Picture dst = XRenderCreatePicture (dpy, tmp, format, CPRepeat, &pa);
		782	XFreePixmap (dpy, tmp);
1065		783
1066	if (kernel && params)	784	if (kernel && params)
1067	{	785	{
1068	if (h_blurRadius)
1069	{
1070	size = h_blurRadius * 2 + 1;	786	size = h_blurRadius * 2 + 1;
1071	get_gaussian_kernel (h_blurRadius, size, kernel, params);	787	get_gaussian_kernel (h_blurRadius, size, kernel, params);
1072		788
1073	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);	789	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1074	XRenderComposite (dpy,	790	XRenderComposite (dpy,
1075	PictOpSrc,	791	PictOpSrc,
1076	src,	792	src,
1077	None,	793	None,
1078	dst,	794	dst,
1079	0, 0,	795	0, 0,
1080	0, 0,	796	0, 0,
1081	0, 0,	797	0, 0,
1082	width, height);	798	width, height);
1083	}
1084		799
1085	if (v_blurRadius)	800	::swap (src, dst);
1086	{	801
1087	size = v_blurRadius * 2 + 1;	802	size = v_blurRadius * 2 + 1;
1088	get_gaussian_kernel (v_blurRadius, size, kernel, params);	803	get_gaussian_kernel (v_blurRadius, size, kernel, params);
1089	::swap (params[0], params[1]);	804	::swap (params[0], params[1]);
1090		805
1091	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);	806	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1092	XRenderComposite (dpy,	807	XRenderComposite (dpy,
1093	PictOpSrc,	808	PictOpSrc,
1094	src,	809	src,
1095	None,	810	None,
1096	dst,	811	dst,
1097	0, 0,	812	0, 0,
1098	0, 0,	813	0, 0,
1099	0, 0,	814	0, 0,
1100	width, height);	815	width, height);
1101	}
1102		816
1103	ret = true;	817	ret = true;
1104	}	818	}
1105		819
1106	free (kernel);	820	free (kernel);
…		…
1114	bool	828	bool
1115	rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)	829	rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1116	{	830	{
1117	bool ret = false;	831	bool ret = false;
1118		832
1119	if (bg_flags & BG_TINT_BITAND)	833	if (shade == 100 && (bg_flags & BG_TINT_BITAND))
1120	{	834	{
1121	XGCValues gcv;	835	XGCValues gcv;
1122	GC gc;	836	GC gc;
1123		837
1124	/* In this case we can tint image server-side getting significant	838	/* In this case we can tint image server-side getting significant
…		…
1136	}	850	}
1137	}	851	}
1138	# if XRENDER	852	# if XRENDER
1139	else if (bg_flags & BG_HAS_RENDER)	853	else if (bg_flags & BG_HAS_RENDER)
1140	{	854	{
1141	rgba c;	855	rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1142		856
		857	if (bg_flags & BG_TINT_SET)
1143	tint.get (c);	858	tint.get (c);
1144		859
1145	if (shade <= 100)	860	if (shade <= 100)
1146	{	861	{
1147	c.r = c.r * shade / 100;	862	c.r = c.r * shade / 100;
1148	c.g = c.g * shade / 100;	863	c.g = c.g * shade / 100;
…		…
1154	c.g = c.g * (200 - shade) / 100;	869	c.g = c.g * (200 - shade) / 100;
1155	c.b = c.b * (200 - shade) / 100;	870	c.b = c.b * (200 - shade) / 100;
1156	}	871	}
1157		872
1158	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);	873	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1159	XRenderPictureAttributes pa;
1160		874
1161	Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);	875	Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, 0);
1162		876
1163	Picture overlay_pic = create_xrender_mask (dpy, pixmap, True, False);	877	Picture overlay_pic = create_xrender_mask (dpy, pixmap, True, False);
1164		878
1165	Picture mask_pic = create_xrender_mask (dpy, pixmap, True, True);	879	Picture mask_pic = create_xrender_mask (dpy, pixmap, True, True);
1166		880
…		…
1175	mask_c.alpha = 0;	889	mask_c.alpha = 0;
1176	mask_c.red = 0xffff - c.r;	890	mask_c.red = 0xffff - c.r;
1177	mask_c.green = 0xffff - c.g;	891	mask_c.green = 0xffff - c.g;
1178	mask_c.blue = 0xffff - c.b;	892	mask_c.blue = 0xffff - c.b;
1179	XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);	893	XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
		894
1180	XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);	895	XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1181		896
1182	if (shade > 100)	897	if (shade > 100)
1183	{	898	{
1184	mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1185	mask_c.alpha = 0;	899	mask_c.alpha = 0;
		900	mask_c.red =
		901	mask_c.green =
		902	mask_c.blue = 0xffff * (shade - 100) / 100;
1186	XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);	903	XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1187		904
1188	XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);	905	XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1189	}	906	}
1190		907
…		…
1202	/*	919	/*
1203	* Builds a pixmap of the same size as the terminal window that contains	920	* Builds a pixmap of the same size as the terminal window that contains
1204	* the tiled portion of the root pixmap that is supposed to be covered by	921	* the tiled portion of the root pixmap that is supposed to be covered by
1205	* our window.	922	* our window.
1206	*/	923	*/
1207	unsigned long	924	bool
1208	rxvt_term::make_transparency_pixmap ()	925	rxvt_term::make_transparency_pixmap ()
1209	{	926	{
1210	unsigned long result = 0;	927	bool ret = false;
1211		928
1212	/* root dimensions may change from call to call - but Display structure should	929	/* root dimensions may change from call to call - but Display structure should
1213	* be always up-to-date, so let's use it :	930	* be always up-to-date, so let's use it :
1214	*/	931	*/
1215	int screen = display->screen;	932	int screen = display->screen;
…		…
1253	#if XRENDER	970	#if XRENDER
1254	if (bg_flags & BG_HAS_RENDER)	971	if (bg_flags & BG_HAS_RENDER)
1255	{	972	{
1256	recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);	973	recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
1257		974
1258	XRenderPictureAttributes pa;
1259
1260	XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));	975	XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1261	Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);	976	Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, 0);
1262		977
1263	XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);	978	XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
1264	Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);	979	Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, 0);
1265		980
1266	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);	981	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1267		982
1268	XRenderFreePicture (dpy, src);	983	XRenderFreePicture (dpy, src);
1269	XRenderFreePicture (dpy, dst);	984	XRenderFreePicture (dpy, dst);
…		…
1298	gc = XCreateGC (dpy, vt, GCFillStyle \| GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin, &gcv);	1013	gc = XCreateGC (dpy, vt, GCFillStyle \| GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin, &gcv);
1299		1014
1300	if (gc)	1015	if (gc)
1301	{	1016	{
1302	XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);	1017	XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1303	result \|= BG_IS_VALID \| (bg_flags & BG_EFFECTS_FLAGS);	1018	ret = true;
		1019	unsigned long tr_flags = bg_flags & BG_EFFECTS_FLAGS;
1304		1020
1305	if (!(bg_flags & BG_CLIENT_RENDER))	1021	if (!(bg_flags & BG_CLIENT_RENDER))
1306	{	1022	{
1307	if (bg_flags & BG_NEEDS_BLUR)	1023	if (bg_flags & BG_NEEDS_BLUR)
1308	{	1024	{
1309	if (blur_pixmap (bg_pixmap, visual, window_width, window_height))	1025	if (blur_pixmap (bg_pixmap, visual, window_width, window_height, depth))
1310	result &= ~BG_NEEDS_BLUR;	1026	tr_flags &= ~BG_NEEDS_BLUR;
1311	}	1027	}
1312	if (bg_flags & BG_NEEDS_TINT)	1028	if (bg_flags & BG_NEEDS_TINT)
1313	{	1029	{
1314	if (tint_pixmap (bg_pixmap, visual, window_width, window_height))	1030	if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1315	result &= ~BG_NEEDS_TINT;	1031	tr_flags &= ~BG_NEEDS_TINT;
1316	}	1032	}
1317	# ifndef HAVE_AFTERIMAGE
1318	if (result & BG_NEEDS_TINT)	1033	if (tr_flags & BG_NEEDS_TINT)
1319	{	1034	{
1320	XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);	1035	XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1321	if (ximage)	1036	if (ximage)
1322	{	1037	{
1323	/* our own client-side tinting */	1038	/* our own client-side tinting */
…		…
1325		1040
1326	XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height);	1041	XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height);
1327	XDestroyImage (ximage);	1042	XDestroyImage (ximage);
1328	}	1043	}
1329	}	1044	}
1330	# endif
1331	} /* server side rendering completed */	1045	} /* server side rendering completed */
1332		1046
1333	XFreeGC (dpy, gc);	1047	XFreeGC (dpy, gc);
1334	}	1048	}
1335		1049
1336	if (recoded_root_pmap != root_pixmap)	1050	if (recoded_root_pmap != root_pixmap)
1337	XFreePixmap (dpy, recoded_root_pmap);	1051	XFreePixmap (dpy, recoded_root_pmap);
1338		1052
1339	return result;	1053	return ret;
1340	}	1054	}
1341		1055
1342	void	1056	void
1343	rxvt_term::bg_set_root_pixmap ()	1057	rxvt_term::bg_set_root_pixmap ()
1344	{	1058	{
…		…
1351	# endif /* ENABLE_TRANSPARENCY */	1065	# endif /* ENABLE_TRANSPARENCY */
1352		1066
1353	bool	1067	bool
1354	rxvt_term::bg_render ()	1068	rxvt_term::bg_render ()
1355	{	1069	{
1356	unsigned long tr_flags = 0;	1070	bool transparent = false;
1357		1071
1358	bg_invalidate ();	1072	bg_invalidate ();
1359	# ifdef ENABLE_TRANSPARENCY	1073	# ifdef ENABLE_TRANSPARENCY
1360	if (bg_flags & BG_IS_TRANSPARENT)	1074	if (bg_flags & BG_IS_TRANSPARENT)
1361	{	1075	{
1362	/* we need to re-generate transparency pixmap in that case ! */	1076	/* we need to re-generate transparency pixmap in that case ! */
1363	tr_flags = make_transparency_pixmap ();	1077	transparent = make_transparency_pixmap ();
1364	if (tr_flags == 0)	1078	if (transparent)
1365	return false;
1366	bg_flags \|= BG_IS_VALID;	1079	bg_flags \|= BG_IS_VALID;
1367	}	1080	}
1368	# endif	1081	# endif
1369		1082
1370	# ifdef BG_IMAGE_FROM_FILE	1083	# ifdef BG_IMAGE_FROM_FILE
1371	if ((bg_flags & BG_IS_FROM_FILE)	1084	if (bg_flags & BG_IS_FROM_FILE)
1372	\|\| (tr_flags & BG_EFFECTS_FLAGS))
1373	{	1085	{
1374	if (render_image (tr_flags))	1086	if (render_image (transparent))
1375	bg_flags \|= BG_IS_VALID;	1087	bg_flags \|= BG_IS_VALID;
1376	}	1088	}
1377	# endif	1089	# endif
1378		1090
1379	if (!(bg_flags & BG_IS_VALID))	1091	if (!(bg_flags & BG_IS_VALID))
…		…
1395		1107
1396	void	1108	void
1397	rxvt_term::bg_init ()	1109	rxvt_term::bg_init ()
1398	{	1110	{
1399	#ifdef ENABLE_TRANSPARENCY	1111	#ifdef ENABLE_TRANSPARENCY
1400	rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1401	tint.set (this, c);
1402	shade = 100;	1112	shade = 100;
1403	#endif	1113	#endif
1404		1114
1405	bg_flags &= ~(BG_HAS_RENDER \| BG_HAS_RENDER_CONV);	1115	bg_flags &= ~(BG_HAS_RENDER \| BG_HAS_RENDER_CONV);
1406	#if XRENDER	1116	#if XRENDER
…		…
1419	#endif	1129	#endif
1420	}	1130	}
1421		1131
1422	#endif /* HAVE_BG_PIXMAP */	1132	#endif /* HAVE_BG_PIXMAP */
1423		1133
1424	#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)	1134	#ifdef ENABLE_TRANSPARENCY
1425	/* based on code from aterm-0.4.2 */	1135	/* based on code from aterm-0.4.2 */
1426		1136
1427	static inline void	1137	static inline void
1428	fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)	1138	fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1429	{	1139	{
…		…
1509	break;	1219	break;
1510	default:	1220	default:
1511	return; /* we do not support this color depth */	1221	return; /* we do not support this color depth */
1512	}	1222	}
1513		1223
1514	rgba c;	1224	rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1515		1225
		1226	if (bg_flags & BG_TINT_SET)
1516	tint.get (c);	1227	tint.get (c);
1517		1228
1518	/* prepare limits for color transformation (each channel is handled separately) */	1229	/* prepare limits for color transformation (each channel is handled separately) */
1519	if (shade > 100)	1230	if (shade > 100)
1520	{	1231	{
1521	c.r = c.r * (200 - shade) / 100;	1232	c.r = c.r * (200 - shade) / 100;
…		…
1574	}	1285	}
1575	}	1286	}
1576		1287
1577	free (lookup);	1288	free (lookup);
1578	}	1289	}
1579	#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */	1290	#endif /* ENABLE_TRANSPARENCY */

Diff Legend

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

Comparing rxvt-unicode/src/background.C (file contents): Revision 1.189 by sf-exg, Thu Dec 29 16:45:22 2011 UTC vs. Revision 1.205 by sf-exg, Wed Apr 11 10:06:45 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.189 by sf-exg, Thu Dec 29 16:45:22 2011 UTC vs.
Revision 1.205 by sf-exg, Wed Apr 11 10:06:45 2012 UTC