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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.52 by sf-exg, Wed Sep 1 11:59:44 2010 UTC vs.
Revision 1.57 by sf-exg, Fri Sep 3 22:43:22 2010 UTC

…		…
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	* effects 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 ?
…		…
95	{	95	{
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
		101	#ifdef HAVE_PIXBUF
		102	pixbuf = NULL;
100	#endif	103	#endif
101	#ifdef BG_IMAGE_FROM_FILE	104	#ifdef BG_IMAGE_FROM_FILE
102	have_image = false;	105	have_image = false;
103	h_scale = v_scale = 0;	106	h_scale = v_scale = 0;
104	h_align = v_align = 0;	107	h_align = v_align = 0;
…		…
115	#ifdef HAVE_AFTERIMAGE	118	#ifdef HAVE_AFTERIMAGE
116	if (original_asim)	119	if (original_asim)
117	safe_asimage_destroy (original_asim);	120	safe_asimage_destroy (original_asim);
118	#endif	121	#endif
119		122
		123	#ifdef HAVE_PIXBUF
		124	if (pixbuf)
		125	g_object_unref (pixbuf);
		126	#endif
		127
120	if (pixmap && target)	128	if (pixmap && target)
121	XFreePixmap (target->dpy, pixmap);	129	XFreePixmap (target->dpy, pixmap);
122	}	130	}
123		131
124	bool	132	bool
…		…
220		228
221	static inline int	229	static inline int
222	make_align_position (int align, int window_size, int image_size)	230	make_align_position (int align, int window_size, int image_size)
223	{	231	{
224	int diff = window_size - image_size;	232	int diff = window_size - image_size;
225	int smaller = MIN (image_size,window_size);	233	int smaller = min (image_size, window_size);
226		234
227	if (align >= 0 && align <= 50)	235	if (align >= 0 && align <= 50)
228	return diff * align / 100;	236	return diff * align / 100;
229	else if (align > 50 && align <= 100)	237	else if (align > 50 && align <= 100)
230	return window_size - image_size - diff * (100 - align) / 100;	238	return window_size - image_size - diff * (100 - align) / 100;
…		…
557	100, ASIMAGE_QUALITY_DEFAULT);	565	100, ASIMAGE_QUALITY_DEFAULT);
558	}	566	}
559		567
560	if (background == NULL)	568	if (background == NULL)
561	{	569	{
562	/* if tiling - pixmap has to be sized exactly as the image,
563	but there is no need to make it bigger than the window! */
564	if (h_scale == 0)
565	new_pmap_width = min (result->width, target_width);
566	if (v_scale == 0)
567	new_pmap_height = min (result->height, target_height);
568	/* we also need to tile our image in one or both directions */
569	if (h_scale == 0 \|\| v_scale == 0)	570	if (h_scale == 0 \|\| v_scale == 0)
570	{	571	{
		572	/* if tiling - pixmap has to be sized exactly as the image,
		573	but there is no need to make it bigger than the window! */
		574	new_pmap_width = min (result->width, target_width);
		575	new_pmap_height = min (result->height, target_height);
		576
		577	/* we also need to tile our image in both directions */
571	ASImage *tmp = tile_asimage (target->asv, result,	578	ASImage *tmp = tile_asimage (target->asv, result,
572	(h_scale > 0) ? 0 : (int)result->width - x,	579	(int)result->width - x,
573	(v_scale > 0) ? 0 : (int)result->height - y,	580	(int)result->height - y,
574	new_pmap_width,	581	new_pmap_width,
575	new_pmap_height,	582	new_pmap_height,
576	TINT_LEAVE_SAME, ASA_XImage,	583	TINT_LEAVE_SAME, ASA_XImage,
577	100, ASIMAGE_QUALITY_DEFAULT);	584	100, ASIMAGE_QUALITY_DEFAULT);
578	if (tmp)	585	if (tmp)
…		…
676		683
677	int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;	684	int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
678	int dst_width = result->width, dst_height = result->height;	685	int dst_width = result->width, dst_height = result->height;
679	if (background == NULL)	686	if (background == NULL)
680	{	687	{
		688	if (!(h_scale == 0 \|\| v_scale == 0))
		689	{
681	if (h_scale > 0) src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );	690	src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
682	if (v_scale > 0) src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);	691	src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
		692	}
683		693
684	if (dst_x > 0 \|\| dst_y > 0	694	if (dst_x > 0 \|\| dst_y > 0
685	\|\| dst_x + dst_width < new_pmap_width	695	\|\| dst_x + dst_width < new_pmap_width
686	\|\| dst_y + dst_height < new_pmap_height)	696	\|\| dst_y + dst_height < new_pmap_height)
687	XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);	697	XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
…		…
704	destroy_asimage (&background);	714	destroy_asimage (&background);
705		715
706	return ret;	716	return ret;
707	}	717	}
708	# endif /* HAVE_AFTERIMAGE */	718	# endif /* HAVE_AFTERIMAGE */
		719
		720	# ifdef HAVE_PIXBUF
		721	bool
		722	bgPixmap_t::render_image (unsigned long background_flags)
		723	{
		724	if (target == NULL)
		725	return false;
		726
		727	if (!pixbuf)
		728	return false;
		729
		730	// TODO: add alpha blending
		731	if (background_flags)
		732	return false;
		733
		734	GdkPixbuf *result;
		735
		736	int image_width = gdk_pixbuf_get_width (pixbuf);
		737	int image_height = gdk_pixbuf_get_height (pixbuf);
		738
		739	int target_width = target->szHint.width;
		740	int target_height = target->szHint.height;
		741	int new_pmap_width = target_width;
		742	int new_pmap_height = target_height;
		743
		744	int x = 0;
		745	int y = 0;
		746	int w = h_scale * target_width / 100;
		747	int h = v_scale * target_height / 100;
		748
		749	if (h_align == rootAlign \|\| v_align == rootAlign)
		750	{
		751	target->get_window_origin (x, y);
		752	x = -x;
		753	y = -y;
		754	}
		755
		756	if (h_align != rootAlign)
		757	x = make_align_position (h_align, target_width, w > 0 ? w : image_width);
		758
		759	if (v_align != rootAlign)
		760	y = make_align_position (v_align, target_height, h > 0 ? h : image_height);
		761
		762	if (x >= target_width
		763	\|\| y >= target_height
		764	\|\| (w > 0 && x + w <= 0)
		765	\|\| (h > 0 && y + h <= 0))
		766	return false;
		767
		768	result = pixbuf;
		769
		770	if ((w > 0 && w != image_width)
		771	\|\| (h > 0 && h != image_height))
		772	{
		773	result = gdk_pixbuf_scale_simple (pixbuf,
		774	w > 0 ? w : image_width,
		775	h > 0 ? h : image_height,
		776	GDK_INTERP_BILINEAR);
		777	}
		778
		779	bool ret = false;
		780
		781	if (result)
		782	{
		783	XGCValues gcv;
		784	GC gc;
		785
		786	image_width = gdk_pixbuf_get_width (result);
		787	image_height = gdk_pixbuf_get_height (result);
		788
		789	if (h_scale == 0)
		790	new_pmap_width = min (image_width, target_width);
		791	if (v_scale == 0)
		792	new_pmap_height = min (image_height, target_height);
		793
		794	if (pixmap)
		795	{
		796	if (pmap_width != new_pmap_width
		797	\|\| pmap_height != new_pmap_height
		798	\|\| pmap_depth != target->depth)
		799	{
		800	XFreePixmap (target->dpy, pixmap);
		801	pixmap = None;
		802	}
		803	}
		804
		805	if (pixmap == None)
		806	{
		807	pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
		808	pmap_width = new_pmap_width;
		809	pmap_height = new_pmap_height;
		810	pmap_depth = target->depth;
		811	}
		812
		813	gcv.foreground = target->pix_colors[Color_bg];
		814	gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
		815
		816	if (h_scale == 0 \|\| v_scale == 0)
		817	{
		818	Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
		819	gdk_pixbuf_xlib_render_to_drawable (result, tile, gc,
		820	0, 0,
		821	0, 0,
		822	image_width, image_height,
		823	XLIB_RGB_DITHER_NONE,
		824	0, 0);
		825
		826	gcv.tile = tile;
		827	gcv.fill_style = FillTiled;
		828	gcv.ts_x_origin = x;
		829	gcv.ts_y_origin = y;
		830	XChangeGC (target->dpy, gc, GCFillStyle \| GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin, &gcv);
		831
		832	XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
		833	XFreePixmap (target->dpy, tile);
		834	}
		835	else
		836	{
		837	int src_x, src_y, dst_x, dst_y;
		838	int dst_width, dst_height;
		839
		840	src_x = make_clip_rectangle (x, image_width , new_pmap_width , dst_x, dst_width );
		841	src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
		842
		843	if (dst_x > 0 \|\| dst_y > 0
		844	\|\| dst_x + dst_width < new_pmap_width
		845	\|\| dst_y + dst_height < new_pmap_height)
		846	XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
		847
		848	if (dst_x < new_pmap_width && dst_y < new_pmap_height)
		849	gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc,
		850	src_x, src_y,
		851	dst_x, dst_y,
		852	dst_width, dst_height,
		853	XLIB_RGB_DITHER_NONE,
		854	0, 0);
		855	}
		856
		857	if (result != pixbuf)
		858	g_object_unref (result);
		859
		860	XFreeGC (target->dpy, gc);
		861
		862	ret = true;
		863	}
		864
		865	return ret;
		866	}
		867	# endif /* HAVE_PIXBUF */
709		868
710	bool	869	bool
711	bgPixmap_t::set_file (const char *file)	870	bgPixmap_t::set_file (const char *file)
712	{	871	{
713	assert (file);	872	assert (file);
…		…
726	# ifdef HAVE_AFTERIMAGE	885	# ifdef HAVE_AFTERIMAGE
727	if (!target->asimman)	886	if (!target->asimman)
728	target->asimman = create_generic_imageman (target->rs[Rs_path]);	887	target->asimman = create_generic_imageman (target->rs[Rs_path]);
729	original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);	888	original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
730	if (original_asim)	889	if (original_asim)
		890	have_image = true;
		891	return have_image;
		892	# endif
		893
		894	# ifdef HAVE_PIXBUF
		895	pixbuf = gdk_pixbuf_new_from_file (file, NULL);
		896	if (pixbuf)
731	have_image = true;	897	have_image = true;
732	return have_image;	898	return have_image;
733	# endif	899	# endif
734	}	900	}
735		901
…		…
1189	XImage *result = NULL;	1355	XImage *result = NULL;
1190		1356
1191	if (background_flags && (flags & isInvalid))	1357	if (background_flags && (flags & isInvalid))
1192	{	1358	{
1193	result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);	1359	result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
		1360	}
1194		1361
		1362	if (result)
		1363	{
1195	# if !defined(HAVE_AFTERIMAGE) && !XFT	1364	# if !defined(HAVE_AFTERIMAGE) && !XFT
1196	/* our own client-side tinting */	1365	/* our own client-side tinting */
1197	/* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.	1366	/* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1198	This may need to be changed in need_client_side_rendering() logic is altered !!! */	1367	This may need to be changed in need_client_side_rendering() logic is altered !!! */
1199	if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))	1368	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1200	{	1369	{
1201	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);	1370	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1202	if (flags & tintSet)	1371	if (flags & tintSet)
1203	tint.get (c);	1372	tint.get (c);
1204	ShadeXImage (target, result, shade, c.r, c.g, c.b);	1373	ShadeXImage (target, result, shade, c.r, c.g, c.b);
1205	}	1374	}
1206	# endif	1375	# endif
1207	}
1208		1376
1209	if (result)
1210	{
1211	GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);	1377	GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1212		1378
1213	if (gc)	1379	if (gc)
1214	{	1380	{
1215	if (/pmap_depth != target->depth &&/ pixmap != None)	1381	if (/pmap_depth != target->depth &&/ pixmap != None)

Diff Legend

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

Comparing rxvt-unicode/src/background.C (file contents): Revision 1.52 by sf-exg, Wed Sep 1 11:59:44 2010 UTC vs. Revision 1.57 by sf-exg, Fri Sep 3 22:43:22 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.52 by sf-exg, Wed Sep 1 11:59:44 2010 UTC vs.
Revision 1.57 by sf-exg, Fri Sep 3 22:43:22 2010 UTC