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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.53 by sf-exg, Wed Sep 1 13:18:55 2010 UTC vs.
Revision 1.61 by sf-exg, Sun Oct 3 20:48:34 2010 UTC

…		…
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
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;
105	#endif	108	#endif
…		…
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
…		…
130	# endif	138	# endif
131		139
132	# ifdef BG_IMAGE_FROM_FILE	140	# ifdef BG_IMAGE_FROM_FILE
133	if (have_image)	141	if (have_image)
134	{	142	{
135	if (h_scale != 0 \|\| v_scale != 0	143	if (flags & sizeSensitive)
136	\|\| h_align != 0 \|\| v_align != 0)
137	return true;	144	return true;
138	}	145	}
139	# endif	146	# endif
140		147
141	return false;	148	return false;
…		…
220		227
221	static inline int	228	static inline int
222	make_align_position (int align, int window_size, int image_size)	229	make_align_position (int align, int window_size, int image_size)
223	{	230	{
224	int diff = window_size - image_size;	231	int diff = window_size - image_size;
225	int smaller = MIN (image_size,window_size);	232	int smaller = min (image_size, window_size);
226		233
227	if (align >= 0 && align <= 50)	234	if (align >= 0 && align <= 50)
228	return diff * align / 100;	235	return diff * align / 100;
229	else if (align > 50 && align <= 100)	236	else if (align > 50 && align <= 100)
230	return window_size - image_size - diff * (100 - align) / 100;	237	return window_size - image_size - diff * (100 - align) / 100;
…		…
239	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)
240	{	247	{
241	int src_pos = 0;	248	int src_pos = 0;
242	dst_pos = 0;	249	dst_pos = 0;
243	dst_size = size;	250	dst_size = size;
244	if (pos < 0 && size > target_size)	251	if (pos < 0)
245	{	252	{
246	src_pos = -pos;	253	src_pos = -pos;
247	dst_size += pos;	254	dst_size += pos;
248	}	255	}
249	else if (pos > 0)	256	else if (pos > 0)
…		…
443	//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",	450	//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
444	// flags, h_scale, v_scale, h_align, v_align);	451	// flags, h_scale, v_scale, h_align, v_align);
445	return (changed > 0);	452	return (changed > 0);
446	}	453	}
447		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;
		482	}
		483
448	# ifdef HAVE_AFTERIMAGE	484	# ifdef HAVE_AFTERIMAGE
449	bool	485	bool
450	bgPixmap_t::render_image (unsigned long background_flags)	486	bgPixmap_t::render_image (unsigned long background_flags)
451	{	487	{
452	if (target == NULL)	488	if (target == NULL)
…		…
496	int new_pmap_width = target_width;	532	int new_pmap_width = target_width;
497	int new_pmap_height = target_height;	533	int new_pmap_height = target_height;
498		534
499	int x = 0;	535	int x = 0;
500	int y = 0;	536	int y = 0;
501	int w = h_scale * target_width / 100;	537	int w = 0;
502	int h = v_scale * target_height / 100;	538	int h = 0;
503		539
504	TIMING_TEST_START (asim);	540	TIMING_TEST_START (asim);
505		541
506	if (original_asim)	542	if (original_asim)
507	{	543	get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
508	if (h_align == rootAlign \|\| v_align == rootAlign)
509	{
510	target->get_window_origin (x, y);
511	x = -x;
512	y = -y;
513	}
514
515	if (h_align != rootAlign)
516	x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
517
518	if (v_align != rootAlign)
519	y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
520	}
521		544
522	if (!original_asim	545	if (!original_asim
523	\|\| x >= target_width	546	\|\| x >= target_width
524	\|\| y >= target_height	547	\|\| y >= target_height
525	\|\| (w > 0 && x + w <= 0)	548	\|\| (w > 0 && x + w <= 0)
…		…
557	100, ASIMAGE_QUALITY_DEFAULT);	580	100, ASIMAGE_QUALITY_DEFAULT);
558	}	581	}
559		582
560	if (background == NULL)	583	if (background == NULL)
561	{	584	{
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)	585	if (h_scale == 0 \|\| v_scale == 0)
570	{	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 */
571	ASImage *tmp = tile_asimage (target->asv, result,	593	ASImage *tmp = tile_asimage (target->asv, result,
572	(h_scale > 0) ? 0 : (int)result->width - x,	594	(int)result->width - x,
573	(v_scale > 0) ? 0 : (int)result->height - y,	595	(int)result->height - y,
574	new_pmap_width,	596	new_pmap_width,
575	new_pmap_height,	597	new_pmap_height,
576	TINT_LEAVE_SAME, ASA_XImage,	598	TINT_LEAVE_SAME, ASA_XImage,
577	100, ASIMAGE_QUALITY_DEFAULT);	599	100, ASIMAGE_QUALITY_DEFAULT);
578	if (tmp)	600	if (tmp)
…		…
676		698
677	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;
678	int dst_width = result->width, dst_height = result->height;	700	int dst_width = result->width, dst_height = result->height;
679	if (background == NULL)	701	if (background == NULL)
680	{	702	{
		703	if (!(h_scale == 0 \|\| v_scale == 0))
		704	{
681	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 );
682	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	}
683		708
684	if (dst_x > 0 \|\| dst_y > 0	709	if (dst_x > 0 \|\| dst_y > 0
685	\|\| dst_x + dst_width < new_pmap_width	710	\|\| dst_x + dst_width < new_pmap_width
686	\|\| dst_y + dst_height < new_pmap_height)	711	\|\| dst_y + dst_height < new_pmap_height)
687	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);
…		…
704	destroy_asimage (&background);	729	destroy_asimage (&background);
705		730
706	return ret;	731	return ret;
707	}	732	}
708	# 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 */
709		873
710	bool	874	bool
711	bgPixmap_t::set_file (const char *file)	875	bgPixmap_t::set_file (const char *file)
712	{	876	{
713	assert (file);	877	assert (file);
…		…
726	# ifdef HAVE_AFTERIMAGE	890	# ifdef HAVE_AFTERIMAGE
727	if (!target->asimman)	891	if (!target->asimman)
728	target->asimman = create_generic_imageman (target->rs[Rs_path]);	892	target->asimman = create_generic_imageman (target->rs[Rs_path]);
729	original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);	893	original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
730	if (original_asim)	894	if (original_asim)
		895	have_image = true;
		896	return have_image;
		897	# endif
		898
		899	# ifdef HAVE_PIXBUF
		900	pixbuf = gdk_pixbuf_new_from_file (file, NULL);
		901	if (pixbuf)
731	have_image = true;	902	have_image = true;
732	return have_image;	903	return have_image;
733	# endif	904	# endif
734	}	905	}
735		906
…		…
1189	XImage *result = NULL;	1360	XImage *result = NULL;
1190		1361
1191	if (background_flags && (flags & isInvalid))	1362	if (background_flags && (flags & isInvalid))
1192	{	1363	{
1193	result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);	1364	result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
		1365	}
1194		1366
		1367	if (result)
		1368	{
1195	# if !defined(HAVE_AFTERIMAGE) && !XFT	1369	# if !defined(HAVE_AFTERIMAGE) && !XFT
1196	/* our own client-side tinting */	1370	/* our own client-side tinting */
1197	/* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.	1371	/* 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 !!! */	1372	This may need to be changed in need_client_side_rendering() logic is altered !!! */
1199	if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))	1373	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1200	{	1374	{
1201	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);	1375	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1202	if (flags & tintSet)	1376	if (flags & tintSet)
1203	tint.get (c);	1377	tint.get (c);
1204	ShadeXImage (target, result, shade, c.r, c.g, c.b);	1378	ShadeXImage (target, result, shade, c.r, c.g, c.b);
1205	}	1379	}
1206	# endif	1380	# endif
1207	}
1208		1381
1209	if (result)
1210	{
1211	GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);	1382	GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1212		1383
1213	if (gc)	1384	if (gc)
1214	{	1385	{
1215	if (/pmap_depth != target->depth &&/ pixmap != None)	1386	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.53 by sf-exg, Wed Sep 1 13:18:55 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.53 by sf-exg, Wed Sep 1 13:18:55 2010 UTC vs.
Revision 1.61 by sf-exg, Sun Oct 3 20:48:34 2010 UTC