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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.190 by sf-exg, Thu Dec 29 20:35:37 2011 UTC vs.
Revision 1.208 by sf-exg, Fri May 11 08:16:58 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;
168	int smaller = min (image_size, window_size);
169
170	if (align >= 0 && align <= 100)	128	if (align >= 0 && align <= 100)
171	return diff * align / 100;	129	return lerp (0, window_size - image_size, align);
172	else if (align > 100 && align <= 200)	130	else if (align > 100)
173	return (align - 100) * smaller / 100 + window_size - smaller;	131	return lerp (window_size - image_size, window_size, align - 100);
174	else if (align >= -100 && align < 0)	132	else
175	return (align + 100) * smaller / 100 - image_size;	133	return lerp (-image_size, 0, align + 100);
176	return 0;
177	}	134	}
178		135
179	static inline int	136	static inline int
180	make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)	137	make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
181	{	138	{
…		…
187	src_pos = -pos;	144	src_pos = -pos;
188	dst_pos = 0;	145	dst_pos = 0;
189	dst_size += pos;	146	dst_size += pos;
190	}	147	}
191		148
192	if (dst_pos + dst_size > target_size)
193	dst_size = target_size - dst_pos;	149	min_it (dst_size, target_size - dst_pos);
194	return src_pos;	150	return src_pos;
195	}	151	}
196		152
197	bool	153	bool
198	rxvt_term::bg_set_geometry (const char *geom, bool update)	154	rxvt_term::bg_set_geometry (const char *geom, bool update)
199	{	155	{
200	bool changed = false;	156	bool changed = false;
201	int geom_flags = 0;	157	int geom_flags = 0;
202	int x = 0, y = 0;	158	int x = h_align;
		159	int y = v_align;
203	unsigned int w = 0, h = 0;	160	unsigned int w = h_scale;
		161	unsigned int h = v_scale;
204	unsigned long new_flags = 0;	162	unsigned long new_flags = 0;
205		163
206	if (geom == NULL)	164	if (geom == NULL)
207	return false;	165	return false;
208		166
…		…
317	w = h = defaultScale;	275	w = h = defaultScale;
318	else if (!(geom_flags & HeightValue))	276	else if (!(geom_flags & HeightValue))
319	h = w;	277	h = w;
320	else if (!(geom_flags & WidthValue))	278	else if (!(geom_flags & WidthValue))
321	w = h;	279	w = h;
322
323	geom_flags \|= WidthValue\|HeightValue\|XValue\|YValue;
324	}	280	}
325		281
326	if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;	282	min_it (w, 1000);
327	if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;	283	min_it (h, 1000);
328	if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;	284	clamp_it (x, -100, 200);
329	if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;	285	clamp_it (y, -100, 200);
330		286
331	if (new_flags != bg_flags)	287	if (bg_flags != new_flags
		288	\|\| h_scale != w
		289	\|\| v_scale != h
		290	\|\| h_align != x
		291	\|\| v_align != y)
332	{	292	{
333	bg_flags = new_flags;	293	bg_flags = new_flags;
		294	h_scale = w;
		295	v_scale = h;
		296	h_align = x;
		297	v_align = y;
334	changed = true;	298	changed = true;
335	}	299	}
336		300
337	return changed;	301	return changed;
338	}	302	}
…		…
366	{	330	{
367	x = make_align_position (h_align, target_width, w);	331	x = make_align_position (h_align, target_width, w);
368	y = make_align_position (v_align, target_height, h);	332	y = make_align_position (v_align, target_height, h);
369	}	333	}
370		334
371	bg_flags &= ~BG_IS_SIZE_SENSITIVE;
372	if (!(bg_flags & BG_TILE)	335	if (!(bg_flags & BG_TILE)
373	\|\| h_scale \|\| v_scale	336	\|\| h_scale \|\| v_scale
374	\|\| (!(bg_flags & BG_ROOT_ALIGN) && (h_align \|\| v_align))	337	\|\| (!(bg_flags & BG_ROOT_ALIGN) && (h_align \|\| v_align))
375	\|\| w > target_width \|\| h > target_height)	338	\|\| image_width > target_width \|\| image_height > target_height)
376	bg_flags \|= BG_IS_SIZE_SENSITIVE;	339	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	340	else
460	{	341	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	}	342	}
612	# endif /* HAVE_AFTERIMAGE */
613		343
614	# ifdef HAVE_PIXBUF	344	# ifdef HAVE_PIXBUF
615	bool	345	bool
616	rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,	346	rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
617	int src_x, int src_y, int dst_x, int dst_y,	347	int src_x, int src_y, int dst_x, int dst_y,
618	unsigned int width, unsigned int height)	348	unsigned int width, unsigned int height)
619	{	349	{
620	XImage *ximage;	350	XImage *ximage;
621	char data, line;	351	char data, line;
622	int bytes_per_pixel;	352	int bytes_per_pixel;
623	int width_r, width_g, width_b;	353	int width_r, width_g, width_b, width_a;
624	int sh_r, sh_g, sh_b;	354	int sh_r, sh_g, sh_b, sh_a;
		355	uint32_t alpha_mask;
625	int rowstride;	356	int rowstride;
626	int channels;	357	int channels;
627	unsigned char *row;	358	unsigned char *row;
628		359
629	if (visual->c_class != TrueColor)	360	if (visual->c_class != TrueColor)
630	return false;	361	return false;
		362
		363	#if XRENDER
		364	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
		365	if (format)
		366	alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha;
		367	else
		368	#endif
		369	alpha_mask = 0;
631		370
632	if (depth == 24 \|\| depth == 32)	371	if (depth == 24 \|\| depth == 32)
633	bytes_per_pixel = 4;	372	bytes_per_pixel = 4;
634	else if (depth == 15 \|\| depth == 16)	373	else if (depth == 15 \|\| depth == 16)
635	bytes_per_pixel = 2;	374	bytes_per_pixel = 2;
…		…
637	return false;	376	return false;
638		377
639	width_r = ecb_popcount32 (visual->red_mask);	378	width_r = ecb_popcount32 (visual->red_mask);
640	width_g = ecb_popcount32 (visual->green_mask);	379	width_g = ecb_popcount32 (visual->green_mask);
641	width_b = ecb_popcount32 (visual->blue_mask);	380	width_b = ecb_popcount32 (visual->blue_mask);
		381	width_a = ecb_popcount32 (alpha_mask);
642		382
643	if (width_r > 8 \|\| width_g > 8 \|\| width_b > 8)	383	if (width_r > 8 \|\| width_g > 8 \|\| width_b > 8 \|\| width_a > 8)
644	return false;	384	return false;
645		385
646	sh_r = ecb_ctz32 (visual->red_mask);	386	sh_r = ecb_ctz32 (visual->red_mask);
647	sh_g = ecb_ctz32 (visual->green_mask);	387	sh_g = ecb_ctz32 (visual->green_mask);
648	sh_b = ecb_ctz32 (visual->blue_mask);	388	sh_b = ecb_ctz32 (visual->blue_mask);
		389	sh_a = ecb_ctz32 (alpha_mask);
649		390
650	if (width > INT_MAX / height / bytes_per_pixel)	391	if (width > INT_MAX / height / bytes_per_pixel)
651	return false;	392	return false;
652		393
653	data = (char )malloc (width height * bytes_per_pixel);	394	data = (char )malloc (width height * bytes_per_pixel);
…		…
667	rowstride = gdk_pixbuf_get_rowstride (pixbuf);	408	rowstride = gdk_pixbuf_get_rowstride (pixbuf);
668	channels = gdk_pixbuf_get_n_channels (pixbuf);	409	channels = gdk_pixbuf_get_n_channels (pixbuf);
669	row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;	410	row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
670	line = data;	411	line = data;
671		412
		413	rgba c (0, 0, 0);
		414
		415	if (channels == 4 && alpha_mask == 0)
		416	{
		417	pix_colors[Color_bg].get (c);
		418	c.r >>= 8;
		419	c.g >>= 8;
		420	c.b >>= 8;
		421	}
		422
672	for (int y = 0; y < height; y++)	423	for (int y = 0; y < height; y++)
673	{	424	{
674	for (int x = 0; x < width; x++)	425	for (int x = 0; x < width; x++)
675	{	426	{
676	unsigned char pixel = row + x channels;	427	unsigned char pixel = row + x channels;
677	uint32_t value;	428	uint32_t value;
		429	unsigned char r, g, b, a;
678		430
		431	if (channels == 4)
		432	{
		433	a = pixel[3];
		434	r = (pixel[0] * a + c.r * (0xff - a)) / 0xff;
		435	g = (pixel[1] * a + c.g * (0xff - a)) / 0xff;
		436	b = (pixel[2] * a + c.b * (0xff - a)) / 0xff;
		437	}
		438	else
		439	{
		440	a = 0xff;
		441	r = pixel[0];
		442	g = pixel[1];
		443	b = pixel[2];
		444	}
		445
679	value = ((pixel[0] >> (8 - width_r)) << sh_r)	446	value = ((r >> (8 - width_r)) << sh_r)
680	\| ((pixel[1] >> (8 - width_g)) << sh_g)	447	\| ((g >> (8 - width_g)) << sh_g)
681	\| ((pixel[2] >> (8 - width_b)) << sh_b);	448	\| ((b >> (8 - width_b)) << sh_b)
		449	\| ((a >> (8 - width_a)) << sh_a);
682		450
683	if (bytes_per_pixel == 4)	451	if (bytes_per_pixel == 4)
684	((uint32_t *)line)[x] = value;	452	((uint32_t *)line)[x] = value;
685	else	453	else
686	((uint16_t *)line)[x] = value;	454	((uint16_t *)line)[x] = value;
…		…
694	XDestroyImage (ximage);	462	XDestroyImage (ximage);
695	return true;	463	return true;
696	}	464	}
697		465
698	bool	466	bool
699	rxvt_term::render_image (unsigned long tr_flags)	467	rxvt_term::render_image (bool transparent)
700	{	468	{
701	if (!pixbuf)	469	if (!pixbuf)
702	return false;	470	return false;
703		471
704	if (tr_flags	472	if (transparent
705	&& !(bg_flags & BG_HAS_RENDER))	473	&& !(bg_flags & BG_HAS_RENDER))
706	return false;	474	return false;
707		475
708	GdkPixbuf *result;	476	GdkPixbuf *result;
709		477
…		…
749	Pixmap root_pmap;	517	Pixmap root_pmap;
750		518
751	image_width = gdk_pixbuf_get_width (result);	519	image_width = gdk_pixbuf_get_width (result);
752	image_height = gdk_pixbuf_get_height (result);	520	image_height = gdk_pixbuf_get_height (result);
753		521
754	if (tr_flags)	522	if (transparent)
755	{	523	{
756	root_pmap = bg_pixmap;	524	root_pmap = bg_pixmap;
757	bg_pixmap = None;	525	bg_pixmap = None;
758	}	526	}
759	else	527	else
…		…
817	dst_x, dst_y,	585	dst_x, dst_y,
818	dst_width, dst_height);	586	dst_width, dst_height);
819	}	587	}
820		588
821	#if XRENDER	589	#if XRENDER
822	if (tr_flags)	590	if (transparent)
823	{	591	{
824	XRenderPictureAttributes pa;
825	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);	592	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
826		593
827	Picture src = XRenderCreatePicture (dpy, root_pmap, format, 0, &pa);	594	Picture src = XRenderCreatePicture (dpy, root_pmap, format, 0, 0);
828		595
829	Picture dst = XRenderCreatePicture (dpy, bg_pixmap, format, 0, &pa);	596	Picture dst = XRenderCreatePicture (dpy, bg_pixmap, format, 0, 0);
830		597
831	Picture mask = create_xrender_mask (dpy, vt, False, False);	598	Picture mask = create_xrender_mask (dpy, vt, False, False);
832		599
833	XRenderColor mask_c;	600	XRenderColor mask_c;
834		601
835	mask_c.alpha = 0x8000;	602	mask_c.alpha = 0x8000;
836	mask_c.red = 0;	603	mask_c.red =
837	mask_c.green = 0;	604	mask_c.green =
838	mask_c.blue = 0;	605	mask_c.blue = 0;
839	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);	606	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
		607
840	XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);	608	XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
841		609
842	XRenderFreePicture (dpy, src);	610	XRenderFreePicture (dpy, src);
843	XRenderFreePicture (dpy, dst);	611	XRenderFreePicture (dpy, dst);
844	XRenderFreePicture (dpy, mask);	612	XRenderFreePicture (dpy, mask);
…		…
851	}	619	}
852		620
853	if (result != pixbuf)	621	if (result != pixbuf)
854	g_object_unref (result);	622	g_object_unref (result);
855		623
856	if (tr_flags)	624	if (transparent)
857	XFreePixmap (dpy, root_pmap);	625	XFreePixmap (dpy, root_pmap);
858		626
859	return ret;	627	return ret;
860	}	628	}
861	# endif /* HAVE_PIXBUF */	629	# endif /* HAVE_PIXBUF */
…		…
876	memcpy (f, file, len);	644	memcpy (f, file, len);
877	f[len] = '\0';	645	f[len] = '\0';
878	file = f;	646	file = f;
879	}	647	}
880		648
881	# ifdef HAVE_AFTERIMAGE
882	if (!asimman)
883	asimman = create_generic_imageman (rs[Rs_path]);
884	ASImage *image = get_asimage (asimman, file, 0xFFFFFFFF, 100);
885	if (image)
886	{
887	if (original_asim)
888	safe_asimage_destroy (original_asim);
889	original_asim = image;
890	bg_flags \|= BG_IS_FROM_FILE \| BG_CLIENT_RENDER;
891	ret = true;
892	}
893	# endif
894
895	# ifdef HAVE_PIXBUF	649	# ifdef HAVE_PIXBUF
896	GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);	650	GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
897	if (image)	651	if (image)
898	{	652	{
899	if (pixbuf)	653	if (pixbuf)
…		…
956	{	710	{
957	changed = true;	711	changed = true;
958	v_blurRadius = vr;	712	v_blurRadius = vr;
959	}	713	}
960		714
961	if (v_blurRadius == 0 && h_blurRadius == 0)	715	if (h_blurRadius && v_blurRadius)
		716	bg_flags \|= BG_NEEDS_BLUR;
		717	else
962	bg_flags &= ~BG_NEEDS_BLUR;	718	bg_flags &= ~BG_NEEDS_BLUR;
963	else
964	bg_flags \|= BG_NEEDS_BLUR;
965		719
966	return changed;	720	return changed;
967	}	721	}
968		722
969	void	723	void
970	rxvt_term::set_tint_shade_flags ()	724	rxvt_term::set_tint_shade_flags ()
971	{	725	{
972	rgba c;	726	if (shade != 100 \|\| (bg_flags & BG_TINT_SET))
973	bool has_shade = shade != 100;
974
975	bg_flags &= ~BG_TINT_FLAGS;
976
977	tint.get (c);
978
979	if (!has_shade
980	&& (c.r <= 0x00ff \|\| c.r >= 0xff00)
981	&& (c.g <= 0x00ff \|\| c.g >= 0xff00)
982	&& (c.b <= 0x00ff \|\| c.b >= 0xff00))
983	bg_flags \|= BG_TINT_BITAND;
984
985	if (has_shade
986	\|\| c.r < 0xff00
987	\|\| c.g < 0xff00
988	\|\| c.b < 0xff00)
989	bg_flags \|= BG_NEEDS_TINT;	727	bg_flags \|= BG_NEEDS_TINT;
		728	else
		729	bg_flags &= ~BG_NEEDS_TINT;
990	}	730	}
991		731
992	bool	732	bool
993	rxvt_term::bg_set_tint (rxvt_color &new_tint)	733	rxvt_term::bg_set_tint (rxvt_color &new_tint)
994	{	734	{
995	if (tint != new_tint)	735	if (!(bg_flags & BG_TINT_SET) \|\| tint != new_tint)
996	{	736	{
997	tint = new_tint;	737	tint = new_tint;
		738	bg_flags \|= BG_TINT_SET;
		739
		740	rgba c;
		741	tint.get (c);
		742	if ((c.r <= 0x00ff \|\| c.r >= 0xff00)
		743	&& (c.g <= 0x00ff \|\| c.g >= 0xff00)
		744	&& (c.b <= 0x00ff \|\| c.b >= 0xff00))
		745	bg_flags \|= BG_TINT_BITAND;
		746	else
		747	bg_flags &= ~BG_TINT_BITAND;
		748
998	set_tint_shade_flags ();	749	set_tint_shade_flags ();
999	return true;	750	return true;
1000	}	751	}
1001		752
1002	return false;	753	return false;
…		…
1043	params[i+2] = XDoubleToFixed (kernel[i] / sum);	794	params[i+2] = XDoubleToFixed (kernel[i] / sum);
1044	}	795	}
1045	#endif	796	#endif
1046		797
1047	bool	798	bool
1048	rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)	799	rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height, int depth)
1049	{	800	{
1050	bool ret = false;	801	bool ret = false;
1051	#if XRENDER	802	#if XRENDER
1052	if (!(bg_flags & BG_HAS_RENDER_CONV))	803	if (!(bg_flags & BG_HAS_RENDER_CONV))
1053	return false;	804	return false;
…		…
1057	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	808	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
1058		809
1059	XRenderPictureAttributes pa;	810	XRenderPictureAttributes pa;
1060	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);	811	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1061		812
		813	pa.repeat = RepeatPad;
1062	Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);	814	Picture src = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
		815	Pixmap tmp = XCreatePixmap (dpy, pixmap, width, height, depth);
1063	Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);	816	Picture dst = XRenderCreatePicture (dpy, tmp, format, CPRepeat, &pa);
		817	XFreePixmap (dpy, tmp);
1064		818
1065	if (kernel && params)	819	if (kernel && params)
1066	{	820	{
1067	if (h_blurRadius)
1068	{
1069	size = h_blurRadius * 2 + 1;	821	size = h_blurRadius * 2 + 1;
1070	get_gaussian_kernel (h_blurRadius, size, kernel, params);	822	get_gaussian_kernel (h_blurRadius, size, kernel, params);
1071		823
1072	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);	824	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1073	XRenderComposite (dpy,	825	XRenderComposite (dpy,
1074	PictOpSrc,	826	PictOpSrc,
1075	src,	827	src,
1076	None,	828	None,
1077	dst,	829	dst,
1078	0, 0,	830	0, 0,
1079	0, 0,	831	0, 0,
1080	0, 0,	832	0, 0,
1081	width, height);	833	width, height);
1082	}
1083		834
1084	if (v_blurRadius)	835	::swap (src, dst);
1085	{	836
1086	size = v_blurRadius * 2 + 1;	837	size = v_blurRadius * 2 + 1;
1087	get_gaussian_kernel (v_blurRadius, size, kernel, params);	838	get_gaussian_kernel (v_blurRadius, size, kernel, params);
1088	::swap (params[0], params[1]);	839	::swap (params[0], params[1]);
1089		840
1090	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);	841	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1091	XRenderComposite (dpy,	842	XRenderComposite (dpy,
1092	PictOpSrc,	843	PictOpSrc,
1093	src,	844	src,
1094	None,	845	None,
1095	dst,	846	dst,
1096	0, 0,	847	0, 0,
1097	0, 0,	848	0, 0,
1098	0, 0,	849	0, 0,
1099	width, height);	850	width, height);
1100	}
1101		851
1102	ret = true;	852	ret = true;
1103	}	853	}
1104		854
1105	free (kernel);	855	free (kernel);
…		…
1113	bool	863	bool
1114	rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)	864	rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1115	{	865	{
1116	bool ret = false;	866	bool ret = false;
1117		867
1118	if (bg_flags & BG_TINT_BITAND)	868	if (shade == 100 && (bg_flags & BG_TINT_BITAND))
1119	{	869	{
1120	XGCValues gcv;	870	XGCValues gcv;
1121	GC gc;	871	GC gc;
1122		872
1123	/* In this case we can tint image server-side getting significant	873	/* In this case we can tint image server-side getting significant
…		…
1135	}	885	}
1136	}	886	}
1137	# if XRENDER	887	# if XRENDER
1138	else if (bg_flags & BG_HAS_RENDER)	888	else if (bg_flags & BG_HAS_RENDER)
1139	{	889	{
1140	rgba c;	890	rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1141		891
		892	if (bg_flags & BG_TINT_SET)
1142	tint.get (c);	893	tint.get (c);
1143		894
1144	if (shade <= 100)	895	if (shade <= 100)
1145	{	896	{
1146	c.r = c.r * shade / 100;	897	c.r = c.r * shade / 100;
1147	c.g = c.g * shade / 100;	898	c.g = c.g * shade / 100;
…		…
1153	c.g = c.g * (200 - shade) / 100;	904	c.g = c.g * (200 - shade) / 100;
1154	c.b = c.b * (200 - shade) / 100;	905	c.b = c.b * (200 - shade) / 100;
1155	}	906	}
1156		907
1157	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);	908	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1158	XRenderPictureAttributes pa;
1159		909
1160	Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);	910	Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, 0);
1161		911
1162	Picture overlay_pic = create_xrender_mask (dpy, pixmap, True, False);	912	Picture overlay_pic = create_xrender_mask (dpy, pixmap, True, False);
1163		913
1164	Picture mask_pic = create_xrender_mask (dpy, pixmap, True, True);	914	Picture mask_pic = create_xrender_mask (dpy, pixmap, True, True);
1165		915
…		…
1174	mask_c.alpha = 0;	924	mask_c.alpha = 0;
1175	mask_c.red = 0xffff - c.r;	925	mask_c.red = 0xffff - c.r;
1176	mask_c.green = 0xffff - c.g;	926	mask_c.green = 0xffff - c.g;
1177	mask_c.blue = 0xffff - c.b;	927	mask_c.blue = 0xffff - c.b;
1178	XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);	928	XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
		929
1179	XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);	930	XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1180		931
1181	if (shade > 100)	932	if (shade > 100)
1182	{	933	{
1183	mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1184	mask_c.alpha = 0;	934	mask_c.alpha = 0;
		935	mask_c.red =
		936	mask_c.green =
		937	mask_c.blue = 0xffff * (shade - 100) / 100;
1185	XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);	938	XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1186		939
1187	XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);	940	XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1188	}	941	}
1189		942
…		…
1201	/*	954	/*
1202	* Builds a pixmap of the same size as the terminal window that contains	955	* Builds a pixmap of the same size as the terminal window that contains
1203	* the tiled portion of the root pixmap that is supposed to be covered by	956	* the tiled portion of the root pixmap that is supposed to be covered by
1204	* our window.	957	* our window.
1205	*/	958	*/
1206	unsigned long	959	bool
1207	rxvt_term::make_transparency_pixmap ()	960	rxvt_term::make_transparency_pixmap ()
1208	{	961	{
1209	unsigned long result = 0;	962	bool ret = false;
1210		963
1211	/* root dimensions may change from call to call - but Display structure should	964	/* root dimensions may change from call to call - but Display structure should
1212	* be always up-to-date, so let's use it :	965	* be always up-to-date, so let's use it :
1213	*/	966	*/
1214	int screen = display->screen;	967	int screen = display->screen;
…		…
1252	#if XRENDER	1005	#if XRENDER
1253	if (bg_flags & BG_HAS_RENDER)	1006	if (bg_flags & BG_HAS_RENDER)
1254	{	1007	{
1255	recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);	1008	recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
1256		1009
1257	XRenderPictureAttributes pa;
1258
1259	XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));	1010	XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1260	Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);	1011	Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, 0);
1261		1012
1262	XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);	1013	XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
1263	Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);	1014	Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, 0);
1264		1015
1265	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);	1016	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1266		1017
1267	XRenderFreePicture (dpy, src);	1018	XRenderFreePicture (dpy, src);
1268	XRenderFreePicture (dpy, dst);	1019	XRenderFreePicture (dpy, dst);
…		…
1297	gc = XCreateGC (dpy, vt, GCFillStyle \| GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin, &gcv);	1048	gc = XCreateGC (dpy, vt, GCFillStyle \| GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin, &gcv);
1298		1049
1299	if (gc)	1050	if (gc)
1300	{	1051	{
1301	XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);	1052	XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1302	result \|= BG_IS_VALID \| (bg_flags & BG_EFFECTS_FLAGS);	1053	ret = true;
		1054	unsigned long tr_flags = bg_flags & BG_EFFECTS_FLAGS;
1303		1055
1304	if (!(bg_flags & BG_CLIENT_RENDER))	1056	if (!(bg_flags & BG_CLIENT_RENDER))
1305	{	1057	{
1306	if (bg_flags & BG_NEEDS_BLUR)	1058	if (bg_flags & BG_NEEDS_BLUR)
1307	{	1059	{
1308	if (blur_pixmap (bg_pixmap, visual, window_width, window_height))	1060	if (blur_pixmap (bg_pixmap, visual, window_width, window_height, depth))
1309	result &= ~BG_NEEDS_BLUR;	1061	tr_flags &= ~BG_NEEDS_BLUR;
1310	}	1062	}
1311	if (bg_flags & BG_NEEDS_TINT)	1063	if (bg_flags & BG_NEEDS_TINT)
1312	{	1064	{
1313	if (tint_pixmap (bg_pixmap, visual, window_width, window_height))	1065	if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1314	result &= ~BG_NEEDS_TINT;	1066	tr_flags &= ~BG_NEEDS_TINT;
1315	}	1067	}
1316	# ifndef HAVE_AFTERIMAGE
1317	if (result & BG_NEEDS_TINT)	1068	if (tr_flags & BG_NEEDS_TINT)
1318	{	1069	{
1319	XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);	1070	XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1320	if (ximage)	1071	if (ximage)
1321	{	1072	{
1322	/* our own client-side tinting */	1073	/* our own client-side tinting */
…		…
1324		1075
1325	XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height);	1076	XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height);
1326	XDestroyImage (ximage);	1077	XDestroyImage (ximage);
1327	}	1078	}
1328	}	1079	}
1329	# endif
1330	} /* server side rendering completed */	1080	} /* server side rendering completed */
1331		1081
1332	XFreeGC (dpy, gc);	1082	XFreeGC (dpy, gc);
1333	}	1083	}
1334		1084
1335	if (recoded_root_pmap != root_pixmap)	1085	if (recoded_root_pmap != root_pixmap)
1336	XFreePixmap (dpy, recoded_root_pmap);	1086	XFreePixmap (dpy, recoded_root_pmap);
1337		1087
1338	return result;	1088	return ret;
1339	}	1089	}
1340		1090
1341	void	1091	void
1342	rxvt_term::bg_set_root_pixmap ()	1092	rxvt_term::bg_set_root_pixmap ()
1343	{	1093	{
…		…
1350	# endif /* ENABLE_TRANSPARENCY */	1100	# endif /* ENABLE_TRANSPARENCY */
1351		1101
1352	bool	1102	bool
1353	rxvt_term::bg_render ()	1103	rxvt_term::bg_render ()
1354	{	1104	{
1355	unsigned long tr_flags = 0;	1105	bool transparent = false;
1356		1106
1357	bg_invalidate ();	1107	bg_invalidate ();
1358	# ifdef ENABLE_TRANSPARENCY	1108	# ifdef ENABLE_TRANSPARENCY
1359	if (bg_flags & BG_IS_TRANSPARENT)	1109	if (bg_flags & BG_IS_TRANSPARENT)
1360	{	1110	{
1361	/* we need to re-generate transparency pixmap in that case ! */	1111	/* we need to re-generate transparency pixmap in that case ! */
1362	tr_flags = make_transparency_pixmap ();	1112	transparent = make_transparency_pixmap ();
1363	if (tr_flags == 0)	1113	if (transparent)
1364	return false;
1365	bg_flags \|= BG_IS_VALID;	1114	bg_flags \|= BG_IS_VALID;
1366	}	1115	}
1367	# endif	1116	# endif
1368		1117
1369	# ifdef BG_IMAGE_FROM_FILE	1118	# ifdef BG_IMAGE_FROM_FILE
1370	if ((bg_flags & BG_IS_FROM_FILE)	1119	if (bg_flags & BG_IS_FROM_FILE)
1371	\|\| (tr_flags & BG_EFFECTS_FLAGS))
1372	{	1120	{
1373	if (render_image (tr_flags))	1121	if (render_image (transparent))
1374	bg_flags \|= BG_IS_VALID;	1122	bg_flags \|= BG_IS_VALID;
1375	}	1123	}
1376	# endif	1124	# endif
1377		1125
1378	if (!(bg_flags & BG_IS_VALID))	1126	if (!(bg_flags & BG_IS_VALID))
…		…
1394		1142
1395	void	1143	void
1396	rxvt_term::bg_init ()	1144	rxvt_term::bg_init ()
1397	{	1145	{
1398	#ifdef ENABLE_TRANSPARENCY	1146	#ifdef ENABLE_TRANSPARENCY
1399	rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1400	tint.set (this, c);
1401	shade = 100;	1147	shade = 100;
1402	#endif	1148	#endif
1403		1149
1404	bg_flags &= ~(BG_HAS_RENDER \| BG_HAS_RENDER_CONV);	1150	bg_flags &= ~(BG_HAS_RENDER \| BG_HAS_RENDER_CONV);
1405	#if XRENDER	1151	#if XRENDER
…		…
1418	#endif	1164	#endif
1419	}	1165	}
1420		1166
1421	#endif /* HAVE_BG_PIXMAP */	1167	#endif /* HAVE_BG_PIXMAP */
1422		1168
1423	#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)	1169	#ifdef ENABLE_TRANSPARENCY
1424	/* based on code from aterm-0.4.2 */	1170	/* based on code from aterm-0.4.2 */
1425		1171
1426	static inline void	1172	static inline void
1427	fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)	1173	fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1428	{	1174	{
…		…
1508	break;	1254	break;
1509	default:	1255	default:
1510	return; /* we do not support this color depth */	1256	return; /* we do not support this color depth */
1511	}	1257	}
1512		1258
1513	rgba c;	1259	rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1514		1260
		1261	if (bg_flags & BG_TINT_SET)
1515	tint.get (c);	1262	tint.get (c);
1516		1263
1517	/* prepare limits for color transformation (each channel is handled separately) */	1264	/* prepare limits for color transformation (each channel is handled separately) */
1518	if (shade > 100)	1265	if (shade > 100)
1519	{	1266	{
1520	c.r = c.r * (200 - shade) / 100;	1267	c.r = c.r * (200 - shade) / 100;
…		…
1540	/* apply table to input image (replacing colors by newly calculated ones) */	1287	/* apply table to input image (replacing colors by newly calculated ones) */
1541	if (ximage->bits_per_pixel == 32	1288	if (ximage->bits_per_pixel == 32
1542	&& (ximage->depth == 24 \|\| ximage->depth == 32)	1289	&& (ximage->depth == 24 \|\| ximage->depth == 32)
1543	&& ximage->byte_order == host_byte_order)	1290	&& ximage->byte_order == host_byte_order)
1544	{	1291	{
1545	uint32_t p1, pf, p, pl;	1292	char *line = ximage->data;
1546	p1 = (uint32_t *) ximage->data;
1547	pf = (uint32_t ) (ximage->data + ximage->height ximage->bytes_per_line);
1548		1293
1549	while (p1 < pf)	1294	for (int y = 0; y < ximage->height; y++)
1550	{	1295	{
1551	p = p1;	1296	uint32_t p = (uint32_t )line;
1552	pl = p1 + ximage->width;	1297	for (int x = 0; x < ximage->width; x++)
1553	for (; p < pl; p++)
1554	{	1298	{
1555	p = lookup_r[(p & 0xff0000) >> 16] \|	1299	p = lookup_r[(p & 0xff0000) >> 16] \|
1556	lookup_g[(*p & 0x00ff00) >> 8] \|	1300	lookup_g[(*p & 0x00ff00) >> 8] \|
1557	lookup_b[(*p & 0x0000ff)] \|	1301	lookup_b[(*p & 0x0000ff)] \|
1558	(*p & 0xff000000);	1302	(*p & 0xff000000);
1559	}	1303	p++;
1560	p1 = (uint32_t ) ((char ) p1 + ximage->bytes_per_line);	1304	}
		1305	line += ximage->bytes_per_line;
1561	}	1306	}
1562	}	1307	}
1563	else	1308	else
1564	{	1309	{
1565	for (int y = 0; y < ximage->height; y++)	1310	for (int y = 0; y < ximage->height; y++)
…		…
1573	}	1318	}
1574	}	1319	}
1575		1320
1576	free (lookup);	1321	free (lookup);
1577	}	1322	}
1578	#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */	1323	#endif /* ENABLE_TRANSPARENCY */

Diff Legend

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

Comparing rxvt-unicode/src/background.C (file contents): Revision 1.190 by sf-exg, Thu Dec 29 20:35:37 2011 UTC vs. Revision 1.208 by sf-exg, Fri May 11 08:16:58 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.190 by sf-exg, Thu Dec 29 20:35:37 2011 UTC vs.
Revision 1.208 by sf-exg, Fri May 11 08:16:58 2012 UTC