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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.40 by sf-exg, Sat Aug 21 09:25:31 2010 UTC vs.
Revision 1.61 by sf-exg, Sun Oct 3 20:48:34 2010 UTC

…		…
50	* Pixmap geometry string interpretation :	50	* Pixmap geometry string interpretation :
51	* Each geometry string contains zero or one scale/position	51	* Each geometry string contains zero or one scale/position
52	* adjustment and may optionally be followed by a colon and one or more	52	* adjustment and may optionally be followed by a colon and one or more
53	* colon-delimited pixmap operations.	53	* colon-delimited pixmap operations.
54	* The following table shows the valid geometry strings and their	54	* The following table shows the valid geometry strings and their
55	* affects on the background image :	55	* effects on the background image :
56	*	56	*
57	* WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.	57	* WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
58	* W and H are percentages of the terminal window size.	58	* W and H are percentages of the terminal window size.
59	* X and Y are also percentages; e.g., +50+50 centers	59	* X and Y are also percentages; e.g., +50+50 centers
60	* the image in the window.	60	* the image in the window.
61	* WxH+X Assumes Y == X	61	* WxH+X Assumes Y == X
62	* WxH Assumes Y == X == 50 (centers the image)	62	* WxH Assumes Y == X == 50 (centers the image)
63	* W+X+Y Assumes H == W	63	* W+X+Y Assumes H == W
64	* W+X Assumes H == W and Y == X	64	* W+X Assumes H == W and Y == X
65	* W Assumes H == W and Y == X == 50	65	* W Assumes H == W and Y == X == 50
66	*	66	*
67	* Adjusting position only :	67	* Adjusting position only :
68	* =+X+Y Set position to X% by Y% (absolute).	68	* =+X+Y Set position to X% by Y% (absolute).
69	* =+X Set position to X% by X%.	69	* =+X Set position to X% by X%.
70	* +X+Y Adjust position horizontally X% and vertically Y%	70	* +X+Y Adjust position horizontally X% and vertically Y%
71	* from current position (relative).	71	* from current position (relative).
72	* +X Adjust position horizontally X% and vertically X%	72	* +X Adjust position horizontally X% and vertically X%
73	* from current position.	73	* from current position.
74	*	74	*
75	* Adjusting scale only :	75	* Adjusting scale only :
76	* Wx0 Multiply horizontal scaling factor by W%	76	* Wx0 Multiply horizontal scaling factor by W%
77	* 0xH Multiply vertical scaling factor by H%	77	* 0xH Multiply vertical scaling factor by H%
78	* 0x0 No scaling (show image at normal size).	78	* 0x0 No scaling (show image at normal size).
79	*	79	*
80	* Pixmap Operations : (should be prepended by a colon)	80	* Pixmap Operations : (should be prepended by a colon)
81	* tile Tile image. Scaling/position modifiers above will affect	81	* tile Tile image. Scaling/position modifiers above will affect
82	* the tile size and origin.	82	* the tile size and origin.
83	* propscale When scaling, scale proportionally. That is, maintain the	83	* propscale When scaling, scale proportionally. That is, maintain the
84	* proper aspect ratio for the image. Any portion of the	84	* proper aspect ratio for the image. Any portion of the
85	* background not covered by the image is filled with the	85	* background not covered by the image is filled with the
86	* current background color.	86	* current background color.
87	* hscale Scale horizontally, tile vertically ?	87	* hscale Scale horizontally, tile vertically ?
88	* vscale Tile horizontally, scale vertically ?	88	* vscale Tile horizontally, scale vertically ?
…		…
96	// this is basically redundant as bgPixmap_t is only used in	96	// this is basically redundant as bgPixmap_t is only used in
97	// zero_initialised-derived structs	97	// zero_initialised-derived structs
98	#ifdef HAVE_AFTERIMAGE	98	#ifdef HAVE_AFTERIMAGE
99	original_asim = NULL;	99	original_asim = NULL;
100	#endif	100	#endif
		101	#ifdef HAVE_PIXBUF
		102	pixbuf = NULL;
		103	#endif
101	#ifdef BG_IMAGE_FROM_FILE	104	#ifdef BG_IMAGE_FROM_FILE
		105	have_image = false;
102	h_scale = v_scale = 0;	106	h_scale = v_scale = 0;
103	h_align = v_align = 0;	107	h_align = v_align = 0;
104	#endif	108	#endif
105	flags = 0;	109	flags = 0;
106	pixmap = None;	110	pixmap = None;
…		…
114	#ifdef HAVE_AFTERIMAGE	118	#ifdef HAVE_AFTERIMAGE
115	if (original_asim)	119	if (original_asim)
116	safe_asimage_destroy (original_asim);	120	safe_asimage_destroy (original_asim);
117	#endif	121	#endif
118		122
		123	#ifdef HAVE_PIXBUF
		124	if (pixbuf)
		125	g_object_unref (pixbuf);
		126	#endif
		127
119	if (pixmap && target)	128	if (pixmap && target)
120	XFreePixmap (target->dpy, pixmap);	129	XFreePixmap (target->dpy, pixmap);
121	}	130	}
122		131
123	bool	132	bool
…		…
127	if (flags & isTransparent)	136	if (flags & isTransparent)
128	return true;	137	return true;
129	# endif	138	# endif
130		139
131	# ifdef BG_IMAGE_FROM_FILE	140	# ifdef BG_IMAGE_FROM_FILE
132	# ifdef HAVE_AFTERIMAGE	141	if (have_image)
133	if (original_asim)
134	# endif
135	{	142	{
136	if (h_scale != 0 \|\| v_scale != 0	143	if (flags & sizeSensitive)
137	\|\| h_align != 0 \|\| v_align != 0)
138	return true;	144	return true;
139	}	145	}
140	# endif	146	# endif
141		147
142	return false;	148	return false;
…		…
149	if (flags & isTransparent)	155	if (flags & isTransparent)
150	return true;	156	return true;
151	# endif	157	# endif
152		158
153	# ifdef BG_IMAGE_FROM_FILE	159	# ifdef BG_IMAGE_FROM_FILE
154	# ifdef HAVE_AFTERIMAGE	160	if (have_image)
155	if (original_asim)
156	# endif
157	{	161	{
158	if (h_align == rootAlign \|\| v_align == rootAlign)	162	if (h_align == rootAlign \|\| v_align == rootAlign)
159	return true;	163	return true;
160	}	164	}
161	# endif	165	# endif
…		…
223		227
224	static inline int	228	static inline int
225	make_align_position (int align, int window_size, int image_size)	229	make_align_position (int align, int window_size, int image_size)
226	{	230	{
227	int diff = window_size - image_size;	231	int diff = window_size - image_size;
228	int smaller = MIN (image_size,window_size);	232	int smaller = min (image_size, window_size);
229		233
230	if (align >= 0 && align <= 50)	234	if (align >= 0 && align <= 50)
231	return diff * align / 100;	235	return diff * align / 100;
232	else if (align > 50 && align <= 100)	236	else if (align > 50 && align <= 100)
233	return window_size - image_size - diff * (100 - align) / 100;	237	return window_size - image_size - diff * (100 - align) / 100;
…		…
242	make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)	246	make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
243	{	247	{
244	int src_pos = 0;	248	int src_pos = 0;
245	dst_pos = 0;	249	dst_pos = 0;
246	dst_size = size;	250	dst_size = size;
247	if (pos < 0 && size > target_size)	251	if (pos < 0)
248	{	252	{
249	src_pos = -pos;	253	src_pos = -pos;
250	dst_size += pos;	254	dst_size += pos;
251	}	255	}
252	else if (pos > 0)	256	else if (pos > 0)
…		…
441	{	445	{
442	flags = new_flags;	446	flags = new_flags;
443	changed++;	447	changed++;
444	}	448	}
445		449
446	//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",	450	//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
447	// flags, h_scale, v_scale, h_align, v_align);	451	// flags, h_scale, v_scale, h_align, v_align);
448	return (changed > 0);	452	return (changed > 0);
		453	}
		454
		455	void
		456	bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
		457	{
		458	int target_width = target->szHint.width;
		459	int target_height = target->szHint.height;
		460
		461	w = h_scale * target_width / 100;
		462	h = v_scale * target_height / 100;
		463
		464	if (h_align == rootAlign \|\| v_align == rootAlign)
		465	{
		466	target->get_window_origin (x, y);
		467	x = -x;
		468	y = -y;
		469	}
		470
		471	if (h_align != rootAlign)
		472	x = make_align_position (h_align, target_width, w > 0 ? w : image_width);
		473
		474	if (v_align != rootAlign)
		475	y = make_align_position (v_align, target_height, h > 0 ? h : image_height);
		476
		477	flags &= ~sizeSensitive;
		478	if (h_scale != 0 \|\| v_scale != 0
		479	\|\| h_align != 0 \|\| v_align != 0
		480	\|\| image_width > target_width \|\| image_height > target_height)
		481	flags \|= sizeSensitive;
449	}	482	}
450		483
451	# ifdef HAVE_AFTERIMAGE	484	# ifdef HAVE_AFTERIMAGE
452	bool	485	bool
453	bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint)	486	bgPixmap_t::render_image (unsigned long background_flags)
454	{	487	{
455	if (target == NULL)	488	if (target == NULL)
456	return false;	489	return false;
457		490
458	target->init_asv ();	491	target->init_asv ();
		492
		493	ASImage *background = NULL;
		494	ARGB32 background_tint = TINT_LEAVE_SAME;
		495
		496	# ifdef ENABLE_TRANSPARENCY
		497	if (background_flags)
		498	background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
		499
		500	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
		501	{
		502	ShadingInfo as_shade;
		503	as_shade.shading = (shade == 0) ? 100 : shade;
		504
		505	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
		506	if (flags & tintSet)
		507	tint.get (c);
		508	as_shade.tintColor.red = c.r;
		509	as_shade.tintColor.green = c.g;
		510	as_shade.tintColor.blue = c.b;
		511
		512	background_tint = shading2tint32 (&as_shade);
		513	}
		514
		515	if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
		516	{
		517	ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
		518	(original_asim == NULL \|\| tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
		519	100, ASIMAGE_QUALITY_DEFAULT);
		520	if (tmp)
		521	{
		522	destroy_asimage (&background);
		523	background = tmp;
		524	}
		525	}
		526	# endif
459		527
460	ASImage *result = 0;	528	ASImage *result = 0;
461		529
462	int target_width = target->szHint.width;	530	int target_width = target->szHint.width;
463	int target_height = target->szHint.height;	531	int target_height = target->szHint.height;
464	int new_pmap_width = target_width;	532	int new_pmap_width = target_width;
465	int new_pmap_height = target_height;	533	int new_pmap_height = target_height;
466		534
467	int x = 0;	535	int x = 0;
468	int y = 0;	536	int y = 0;
469	int w = h_scale * target_width / 100;	537	int w = 0;
470	int h = v_scale * target_height / 100;	538	int h = 0;
471		539
472	TIMING_TEST_START (asim);	540	TIMING_TEST_START (asim);
473		541
474	if (original_asim)	542	if (original_asim)
475	{	543	get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
476	if (h_align == rootAlign \|\| v_align == rootAlign)
477	{
478	target->get_window_origin(x, y);
479	x = -x;
480	y = -y;
481	}
482
483	if (h_align != rootAlign)
484	x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
485
486	if (v_align != rootAlign)
487	y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
488	}
489		544
490	if (!original_asim	545	if (!original_asim
491	\|\| x >= target_width	546	\|\| x >= target_width
492	\|\| y >= target_height	547	\|\| y >= target_height
493	\|\| (w > 0 && x + w <= 0)	548	\|\| (w > 0 && x + w <= 0)
…		…
525	100, ASIMAGE_QUALITY_DEFAULT);	580	100, ASIMAGE_QUALITY_DEFAULT);
526	}	581	}
527		582
528	if (background == NULL)	583	if (background == NULL)
529	{	584	{
530	/* if tiling - pixmap has to be sized exactly as the image,
531	but there is no need to make it bigger than the window! */
532	if (h_scale == 0)
533	new_pmap_width = min (result->width, target_width);
534	if (v_scale == 0)
535	new_pmap_height = min (result->height, target_height);
536	/* we also need to tile our image in one or both directions */
537	if (h_scale == 0 \|\| v_scale == 0)	585	if (h_scale == 0 \|\| v_scale == 0)
538	{	586	{
		587	/* if tiling - pixmap has to be sized exactly as the image,
		588	but there is no need to make it bigger than the window! */
		589	new_pmap_width = min (result->width, target_width);
		590	new_pmap_height = min (result->height, target_height);
		591
		592	/* we also need to tile our image in both directions */
539	ASImage *tmp = tile_asimage (target->asv, result,	593	ASImage *tmp = tile_asimage (target->asv, result,
540	(h_scale > 0) ? 0 : (int)result->width - x,	594	(int)result->width - x,
541	(v_scale > 0) ? 0 : (int)result->height - y,	595	(int)result->height - y,
542	new_pmap_width,	596	new_pmap_width,
543	new_pmap_height,	597	new_pmap_height,
544	TINT_LEAVE_SAME, ASA_XImage,	598	TINT_LEAVE_SAME, ASA_XImage,
545	100, ASIMAGE_QUALITY_DEFAULT);	599	100, ASIMAGE_QUALITY_DEFAULT);
546	if (tmp)	600	if (tmp)
…		…
554	}	608	}
555	else	609	else
556	{	610	{
557	/* if blending background and image - pixmap has to be sized same as target window */	611	/* if blending background and image - pixmap has to be sized same as target window */
558	ASImageLayer *layers = create_image_layers (2);	612	ASImageLayer *layers = create_image_layers (2);
559	ASImage *merged_im = NULL;
560		613
561	layers[0].im = background;	614	layers[0].im = background;
562	layers[0].clip_width = target_width;	615	layers[0].clip_width = target_width;
563	layers[0].clip_height = target_height;	616	layers[0].clip_height = target_height;
564	layers[0].tint = background_tint;	617	layers[0].tint = background_tint;
…		…
611	free (layers);	664	free (layers);
612	}	665	}
613	}	666	}
614	TIMING_TEST_PRINT_RESULT (asim);	667	TIMING_TEST_PRINT_RESULT (asim);
615		668
616	if (pixmap)	669	bool ret = false;
617	{
618	if (result == NULL
619	\|\| pmap_width != new_pmap_width
620	\|\| pmap_height != new_pmap_height
621	\|\| pmap_depth != target->depth)
622	{
623	XFreePixmap (target->dpy, pixmap);
624	pixmap = None;
625	}
626	}
627		670
628	if (result)	671	if (result)
629	{	672	{
630	XGCValues gcv;	673	XGCValues gcv;
631	GC gc;	674	GC gc;
		675
		676	if (pixmap)
		677	{
		678	if (pmap_width != new_pmap_width
		679	\|\| pmap_height != new_pmap_height
		680	\|\| pmap_depth != target->depth)
		681	{
		682	XFreePixmap (target->dpy, pixmap);
		683	pixmap = None;
		684	}
		685	}
632		686
633	/* create Pixmap */	687	/* create Pixmap */
634	if (pixmap == None)	688	if (pixmap == None)
635	{	689	{
636	pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);	690	pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
637	pmap_width = new_pmap_width;	691	pmap_width = new_pmap_width;
638	pmap_height = new_pmap_height;	692	pmap_height = new_pmap_height;
639	pmap_depth = target->depth;	693	pmap_depth = target->depth;
640	}	694	}
641	/* fill with background color ( if result's not completely overlapping it)*/	695	/* fill with background color (if result's not completely overlapping it) */
642	gcv.foreground = target->pix_colors[Color_bg];	696	gcv.foreground = target->pix_colors[Color_bg];
643	gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);	697	gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
644		698
645	int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;	699	int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
646	int dst_width = result->width, dst_height = result->height;	700	int dst_width = result->width, dst_height = result->height;
647	if (background == NULL)	701	if (background == NULL)
648	{	702	{
		703	if (!(h_scale == 0 \|\| v_scale == 0))
		704	{
649	if (h_scale > 0) src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );	705	src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
650	if (v_scale > 0) src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);	706	src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
		707	}
651		708
652	if (dst_x > 0 \|\| dst_y > 0	709	if (dst_x > 0 \|\| dst_y > 0
653	\|\| dst_x + dst_width < new_pmap_width	710	\|\| dst_x + dst_width < new_pmap_width
654	\|\| dst_y + dst_height < new_pmap_height)	711	\|\| dst_y + dst_height < new_pmap_height)
655	XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);	712	XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
…		…
662	if (result != background && result != original_asim)	719	if (result != background && result != original_asim)
663	destroy_asimage (&result);	720	destroy_asimage (&result);
664		721
665	XFreeGC (target->dpy, gc);	722	XFreeGC (target->dpy, gc);
666	TIMING_TEST_PRINT_RESULT (asim);	723	TIMING_TEST_PRINT_RESULT (asim);
667	}
668		724
		725	ret = true;
		726	}
		727
		728	if (background)
		729	destroy_asimage (&background);
		730
669	return true;	731	return ret;
670	}	732	}
671	# endif /* HAVE_AFTERIMAGE */	733	# endif /* HAVE_AFTERIMAGE */
		734
		735	# ifdef HAVE_PIXBUF
		736	bool
		737	bgPixmap_t::render_image (unsigned long background_flags)
		738	{
		739	if (target == NULL)
		740	return false;
		741
		742	if (!pixbuf)
		743	return false;
		744
		745	// TODO: add alpha blending
		746	if (background_flags)
		747	return false;
		748
		749	GdkPixbuf *result;
		750
		751	int image_width = gdk_pixbuf_get_width (pixbuf);
		752	int image_height = gdk_pixbuf_get_height (pixbuf);
		753
		754	int target_width = target->szHint.width;
		755	int target_height = target->szHint.height;
		756	int new_pmap_width = target_width;
		757	int new_pmap_height = target_height;
		758
		759	int x = 0;
		760	int y = 0;
		761	int w = 0;
		762	int h = 0;
		763
		764	get_image_geometry (image_width, image_height, w, h, x, y);
		765
		766	if (x >= target_width
		767	\|\| y >= target_height
		768	\|\| (w > 0 && x + w <= 0)
		769	\|\| (h > 0 && y + h <= 0))
		770	return false;
		771
		772	result = pixbuf;
		773
		774	if ((w > 0 && w != image_width)
		775	\|\| (h > 0 && h != image_height))
		776	{
		777	result = gdk_pixbuf_scale_simple (pixbuf,
		778	w > 0 ? w : image_width,
		779	h > 0 ? h : image_height,
		780	GDK_INTERP_BILINEAR);
		781	}
		782
		783	bool ret = false;
		784
		785	if (result)
		786	{
		787	XGCValues gcv;
		788	GC gc;
		789
		790	image_width = gdk_pixbuf_get_width (result);
		791	image_height = gdk_pixbuf_get_height (result);
		792
		793	if (h_scale == 0 \|\| v_scale == 0)
		794	{
		795	new_pmap_width = min (image_width, target_width);
		796	new_pmap_height = min (image_height, target_height);
		797	}
		798
		799	if (pixmap)
		800	{
		801	if (pmap_width != new_pmap_width
		802	\|\| pmap_height != new_pmap_height
		803	\|\| pmap_depth != target->depth)
		804	{
		805	XFreePixmap (target->dpy, pixmap);
		806	pixmap = None;
		807	}
		808	}
		809
		810	if (pixmap == None)
		811	{
		812	pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
		813	pmap_width = new_pmap_width;
		814	pmap_height = new_pmap_height;
		815	pmap_depth = target->depth;
		816	}
		817
		818	gcv.foreground = target->pix_colors[Color_bg];
		819	gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
		820
		821	if (h_scale == 0 \|\| v_scale == 0)
		822	{
		823	Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
		824	gdk_pixbuf_xlib_render_to_drawable (result, tile, gc,
		825	0, 0,
		826	0, 0,
		827	image_width, image_height,
		828	XLIB_RGB_DITHER_NONE,
		829	0, 0);
		830
		831	gcv.tile = tile;
		832	gcv.fill_style = FillTiled;
		833	gcv.ts_x_origin = x;
		834	gcv.ts_y_origin = y;
		835	XChangeGC (target->dpy, gc, GCFillStyle \| GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin, &gcv);
		836
		837	XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
		838	XFreePixmap (target->dpy, tile);
		839	}
		840	else
		841	{
		842	int src_x, src_y, dst_x, dst_y;
		843	int dst_width, dst_height;
		844
		845	src_x = make_clip_rectangle (x, image_width , new_pmap_width , dst_x, dst_width );
		846	src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
		847
		848	if (dst_x > 0 \|\| dst_y > 0
		849	\|\| dst_x + dst_width < new_pmap_width
		850	\|\| dst_y + dst_height < new_pmap_height)
		851	XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
		852
		853	if (dst_x < new_pmap_width && dst_y < new_pmap_height)
		854	gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc,
		855	src_x, src_y,
		856	dst_x, dst_y,
		857	dst_width, dst_height,
		858	XLIB_RGB_DITHER_NONE,
		859	0, 0);
		860	}
		861
		862	if (result != pixbuf)
		863	g_object_unref (result);
		864
		865	XFreeGC (target->dpy, gc);
		866
		867	ret = true;
		868	}
		869
		870	return ret;
		871	}
		872	# endif /* HAVE_PIXBUF */
672		873
673	bool	874	bool
674	bgPixmap_t::set_file (const char *file)	875	bgPixmap_t::set_file (const char *file)
675	{	876	{
676	assert (file);	877	assert (file);
677		878
678	if (*file)	879	if (*file)
679	{	880	{
		881	if (const char *p = strchr (file, ';'))
		882	{
		883	size_t len = p - file;
		884	char *f = rxvt_temp_buf<char> (len + 1);
		885	memcpy (f, file, len);
		886	f[len] = '\0';
		887	file = f;
		888	}
		889
680	# ifdef HAVE_AFTERIMAGE	890	# ifdef HAVE_AFTERIMAGE
681	if (!target->asimman)	891	if (!target->asimman)
682	target->asimman = create_generic_imageman (target->rs[Rs_path]);	892	target->asimman = create_generic_imageman (target->rs[Rs_path]);
683
684	if (const char *p = strchr (file, ';'))
685	{
686	size_t len = p - file;
687	char f = (char )malloc (len + 1);
688	memcpy (f, file, len);
689	f[len] = '\0';
690	original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);
691	free (f);
692	}
693	else
694	original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);	893	original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
		894	if (original_asim)
		895	have_image = true;
		896	return have_image;
		897	# endif
695		898
696	return original_asim;	899	# ifdef HAVE_PIXBUF
		900	pixbuf = gdk_pixbuf_new_from_file (file, NULL);
		901	if (pixbuf)
		902	have_image = true;
		903	return have_image;
697	# endif	904	# endif
698	}	905	}
699		906
700	return false;	907	return false;
701	}	908	}
…		…
721	int changed = 0;	928	int changed = 0;
722	unsigned int hr, vr;	929	unsigned int hr, vr;
723	int junk;	930	int junk;
724	int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);	931	int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
725		932
726	if (!(geom_flags&WidthValue))	933	if (!(geom_flags & WidthValue))
727	hr = 1;	934	hr = 1;
728	if (!(geom_flags&HeightValue))	935	if (!(geom_flags & HeightValue))
729	vr = hr;	936	vr = hr;
730		937
731	if (h_blurRadius != hr)	938	if (h_blurRadius != hr)
732	{	939	{
733	++changed;	940	++changed;
…		…
743	if (v_blurRadius == 0 && h_blurRadius == 0)	950	if (v_blurRadius == 0 && h_blurRadius == 0)
744	flags &= ~blurNeeded;	951	flags &= ~blurNeeded;
745	else	952	else
746	flags \|= blurNeeded;	953	flags \|= blurNeeded;
747		954
748	return (changed>0);	955	return (changed > 0);
749	}	956	}
750		957
751	static inline unsigned long	958	static inline unsigned long
752	compute_tint_shade_flags (rxvt_color *tint, int shade)	959	compute_tint_shade_flags (rxvt_color *tint, int shade)
753	{	960	{
…		…
770	flags \|= bgPixmap_t::tintNeeded;	977	flags \|= bgPixmap_t::tintNeeded;
771	else if (tint)	978	else if (tint)
772	{	979	{
773	if ((c.r > 0x000700 \|\| c.g > 0x000700 \|\| c.b > 0x000700)	980	if ((c.r > 0x000700 \|\| c.g > 0x000700 \|\| c.b > 0x000700)
774	&& (c.r < 0x00f700 \|\| c.g < 0x00f700 \|\| c.b < 0x00f700))	981	&& (c.r < 0x00f700 \|\| c.g < 0x00f700 \|\| c.b < 0x00f700))
775	{	982	{
776	flags \|= bgPixmap_t::tintNeeded;	983	flags \|= bgPixmap_t::tintNeeded;
777	}	984	}
778	}	985	}
779		986
780	if (flags & bgPixmap_t::tintNeeded)	987	if (flags & bgPixmap_t::tintNeeded)
781	{	988	{
782	if (flags & bgPixmap_t::tintWholesome)	989	if (flags & bgPixmap_t::tintWholesome)
…		…
811	{	1018	{
812	unsigned long new_flags = compute_tint_shade_flags (NULL, shade);	1019	unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
813		1020
814	if (new_flags != (flags & tintFlags))	1021	if (new_flags != (flags & tintFlags))
815	{	1022	{
816	flags = (flags&~tintFlags)\|new_flags;	1023	flags = (flags & ~tintFlags) \| new_flags;
817	return true;	1024	return true;
818	}	1025	}
819		1026
820	return false;	1027	return false;
821	}	1028	}
822		1029
…		…
907		1114
908	attr.background_pixmap = ParentRelative;	1115	attr.background_pixmap = ParentRelative;
909	attr.backing_store = Always;	1116	attr.backing_store = Always;
910	attr.event_mask = ExposureMask;	1117	attr.event_mask = ExposureMask;
911	attr.override_redirect = True;	1118	attr.override_redirect = True;
912	src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,	1119	src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
913	CopyFromParent, CopyFromParent, CopyFromParent,	1120	CopyFromParent, CopyFromParent, CopyFromParent,
914	CWBackPixmap\|CWBackingStore\|CWOverrideRedirect\|CWEventMask,	1121	CWBackPixmap\|CWBackingStore\|CWOverrideRedirect\|CWEventMask,
915	&attr);	1122	&attr);
916		1123
917	if (src != None)	1124	if (src != None)
…		…
941	XDestroyWindow (dpy, src);	1148	XDestroyWindow (dpy, src);
942	XUngrabServer (dpy);	1149	XUngrabServer (dpy);
943	//fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);	1150	//fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
944	}	1151	}
945		1152
946	if (!success)	1153	if (!success)
947	{	1154	{
948	XFreePixmap (dpy, tiled_root_pmap);	1155	XFreePixmap (dpy, tiled_root_pmap);
949	tiled_root_pmap = None;	1156	tiled_root_pmap = None;
950	}	1157	}
951	else	1158	else
952	result \|= transpPmapTiled;	1159	result \|= transpPmapTiled;
953	}	1160	}
954	else	1161	else
955	{	1162	{
956	/* straightforward pixmap copy */	1163	/* straightforward pixmap copy */
957	gcv.tile = root_pixmap;	1164	gcv.tile = root_pixmap;
…		…
1074	# if DO_TIMING_TEST	1281	# if DO_TIMING_TEST
1075	XSync (dpy, False);	1282	XSync (dpy, False);
1076	# endif	1283	# endif
1077	# endif	1284	# endif
1078	}	1285	}
1079	}	1286	}
1080	} /* server side rendering completed */	1287	} /* server side rendering completed */
1081		1288
1082	if (pixmap)	1289	if (pixmap)
1083	XFreePixmap (dpy, pixmap);	1290	XFreePixmap (dpy, pixmap);
1084		1291
…		…
1134	/* we need to re-generate transparency pixmap in that case ! */	1341	/* we need to re-generate transparency pixmap in that case ! */
1135	background_flags = make_transparency_pixmap ();	1342	background_flags = make_transparency_pixmap ();
1136	if (background_flags == 0)	1343	if (background_flags == 0)
1137	return false;	1344	return false;
1138	else if ((background_flags & transpTransformations) == (flags & transpTransformations)	1345	else if ((background_flags & transpTransformations) == (flags & transpTransformations)
1139	&& pmap_depth == target->depth)	1346	&& pmap_depth == target->depth)
1140	flags = flags & ~isInvalid;	1347	flags = flags & ~isInvalid;
1141	}	1348	}
1142	# endif	1349	# endif
1143		1350
		1351	# ifdef BG_IMAGE_FROM_FILE
		1352	if (have_image
		1353	\|\| (background_flags & transpTransformations) != (flags & transpTransformations))
		1354	{
		1355	if (render_image (background_flags))
		1356	flags = flags & ~isInvalid;
		1357	}
		1358	# endif
		1359
1144	XImage *result = NULL;	1360	XImage *result = NULL;
1145	# ifdef HAVE_AFTERIMAGE	1361
1146	if (original_asim	1362	if (background_flags && (flags & isInvalid))
1147	\|\| (background_flags & transpTransformations) != (flags & transpTransformations))	1363	{
		1364	result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1148	{	1365	}
1149	target->init_asv ();
1150		1366
1151	ASImage *background = NULL;	1367	if (result)
1152	ARGB32 as_tint = TINT_LEAVE_SAME;	1368	{
1153	if (background_flags)	1369	# if !defined(HAVE_AFTERIMAGE) && !XFT
1154	background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);	1370	/* our own client-side tinting */
1155		1371	/* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1156	# ifdef ENABLE_TRANSPARENCY	1372	This may need to be changed in need_client_side_rendering() logic is altered !!! */
1157	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))	1373	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1158	{
1159	ShadingInfo as_shade;
1160	as_shade.shading = (shade == 0) ? 100 : shade;
1161
1162	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1163	if (flags & tintSet)
1164	tint.get (c);
1165	as_shade.tintColor.red = c.r;
1166	as_shade.tintColor.green = c.g;
1167	as_shade.tintColor.blue = c.b;
1168
1169	as_tint = shading2tint32 (&as_shade);
1170	}
1171
1172	if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
1173	{
1174	ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
1175	(original_asim == NULL \|\| tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
1176	100, ASIMAGE_QUALITY_DEFAULT);
1177	if (tmp)
1178	{
1179	destroy_asimage (&background);
1180	background = tmp;
1181	}
1182	}
1183	# endif
1184
1185	if (render_asim (background, as_tint))
1186	flags = flags & ~isInvalid;
1187	if (background)
1188	destroy_asimage (&background);
1189	}
1190	else if (background_flags && pmap_depth != target->depth)
1191	result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1192
1193	# elif !XFT /* our own client-side tinting */
1194
1195	/* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1196	This may need to be changed in need_client_side_rendering() logic is altered !!! */
1197
1198	if (background_flags && (flags & isInvalid))
1199	{
1200	result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1201
1202	if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1203	{	1374	{
1204	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);	1375	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1205	if (flags & tintSet)	1376	if (flags & tintSet)
1206	tint.get (c);	1377	tint.get (c);
1207	ShadeXImage (target, result, shade, c.r, c.g, c.b);	1378	ShadeXImage (target, result, shade, c.r, c.g, c.b);
1208	}	1379	}
1209	}	1380	# endif
1210	# endif /* HAVE_AFTERIMAGE */
1211		1381
1212	if (result)
1213	{
1214	GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);	1382	GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1215		1383
1216	if (gc)	1384	if (gc)
1217	{	1385	{
1218	if (/pmap_depth != target->depth &&/ pixmap != None)	1386	if (/pmap_depth != target->depth &&/ pixmap != None)
…		…
1247		1415
1248	XFreeGC (target->dpy, gc);	1416	XFreeGC (target->dpy, gc);
1249	flags = flags & ~isInvalid;	1417	flags = flags & ~isInvalid;
1250	}	1418	}
1251		1419
1252	XDestroyImage (result);	1420	XDestroyImage (result);
1253	}	1421	}
1254		1422
1255	if (flags & isInvalid)	1423	if (flags & isInvalid)
1256	{	1424	{
1257	if (pixmap != None)	1425	if (pixmap != None)

Diff Legend

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

Comparing rxvt-unicode/src/background.C (file contents): Revision 1.40 by sf-exg, Sat Aug 21 09:25:31 2010 UTC vs. Revision 1.61 by sf-exg, Sun Oct 3 20:48:34 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.40 by sf-exg, Sat Aug 21 09:25:31 2010 UTC vs.
Revision 1.61 by sf-exg, Sun Oct 3 20:48:34 2010 UTC