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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.19 by ayin, Tue Dec 18 11:15:24 2007 UTC vs.
Revision 1.42 by sf-exg, Sun Aug 29 13:24:30 2010 UTC

…		…
1	/----------------------------------------------------------------------	1	/----------------------------------------------------------------------
2	* File: background.C - former xpm.C	2	* File: background.C - former xpm.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	*	4	*
5	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
6	* Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com>	6	* Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com>
7	* Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net>	7	* Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net>
8	*	8	*
9	* This program is free software; you can redistribute it and/or modify	9	* This program is free software; you can redistribute it and/or modify
10	* it under the terms of the GNU General Public License as published by	10	* it under the terms of the GNU General Public License as published by
11	* the Free Software Foundation; either version 2 of the License, or	11	* the Free Software Foundation; either version 2 of the License, or
27	#define DO_TIMING_TEST 0	27	#define DO_TIMING_TEST 0
28		28
29	#if DO_TIMING_TEST	29	#if DO_TIMING_TEST
30	# include <sys/time.h>	30	# include <sys/time.h>
31	#define TIMING_TEST_START(id) \	31	#define TIMING_TEST_START(id) \
32	struct timeval timing_test_##id##_stv;\	32	struct timeval timing_test_##id##_stv; \
33	gettimeofday (&timing_test_##id##_stv, NULL);	33	gettimeofday (&timing_test_##id##_stv, NULL);
34		34
35	#define TIMING_TEST_PRINT_RESULT(id) \	35	#define TIMING_TEST_PRINT_RESULT(id) \
36	do{ struct timeval tv;gettimeofday (&tv, NULL); tv.tv_sec -= (timing_test_##id##_stv).tv_sec;\	36	do { \
		37	struct timeval tv; \
		38	gettimeofday (&tv, NULL); \
		39	tv.tv_sec -= (timing_test_##id##_stv).tv_sec; \
37	fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__,\	40	fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__, \
38	tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec);}while (0)	41	tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec); \
		42	} while (0)
39		43
40	#else	44	#else
41	#define TIMING_TEST_START(id) do{}while (0)	45	#define TIMING_TEST_START(id) do {} while (0)
42	#define TIMING_TEST_PRINT_RESULT(id) do{}while (0)	46	#define TIMING_TEST_PRINT_RESULT(id) do {} while (0)
43	#endif	47	#endif
44		48
45	/*	49	/*
46	* Pixmap geometry string interpretation :	50	* Pixmap geometry string interpretation :
47	* Each geometry string contains zero or one scale/position	51	* Each geometry string contains zero or one scale/position
48	* 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
49	* colon-delimited pixmap operations.	53	* colon-delimited pixmap operations.
50	* The following table shows the valid geometry strings and their	54	* The following table shows the valid geometry strings and their
51	* affects on the background image :	55	* effects on the background image :
52	*	56	*
53	* 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%.
54	* W and H are percentages of the terminal window size.	58	* W and H are percentages of the terminal window size.
55	* X and Y are also percentages; e.g., +50+50 centers	59	* X and Y are also percentages; e.g., +50+50 centers
56	* the image in the window.	60	* the image in the window.
…		…
87	*/	91	*/
88		92
89	#ifdef HAVE_BG_PIXMAP	93	#ifdef HAVE_BG_PIXMAP
90	bgPixmap_t::bgPixmap_t ()	94	bgPixmap_t::bgPixmap_t ()
91	{	95	{
		96	// this is basically redundant as bgPixmap_t is only used in
		97	// zero_initialised-derived structs
92	#ifdef HAVE_AFTERIMAGE	98	#ifdef HAVE_AFTERIMAGE
93	original_asim = NULL;	99	original_asim = NULL;
94	#endif	100	#endif
95	#ifdef BG_IMAGE_FROM_FILE	101	#ifdef BG_IMAGE_FROM_FILE
96	h_scale = v_scale = 0;	102	h_scale = v_scale = 0;
97	h_align = v_align = 0;	103	h_align = v_align = 0;
98	#endif	104	#endif
99	flags = 0;	105	flags = 0;
100	pixmap = None;	106	pixmap = None;
		107	valid_since = invalid_since = 0;
		108	target = 0;
101	}	109	}
102		110
103	void	111	void
104	bgPixmap_t::destroy ()	112	bgPixmap_t::destroy ()
105	{	113	{
…		…
120	return true;	128	return true;
121	# endif	129	# endif
122		130
123	# ifdef BG_IMAGE_FROM_FILE	131	# ifdef BG_IMAGE_FROM_FILE
124	# ifdef HAVE_AFTERIMAGE	132	# ifdef HAVE_AFTERIMAGE
125	if (original_asim != NULL)	133	if (original_asim)
126	# endif	134	# endif
127	{	135	{
128	if (h_scale != 0 \|\| v_scale != 0	136	if (h_scale != 0 \|\| v_scale != 0
129	\|\| h_align != 0 \|\| v_align != 0)	137	\|\| h_align != 0 \|\| v_align != 0)
130	return true;	138	return true;
…		…
132	# endif	140	# endif
133		141
134	return false;	142	return false;
135	}	143	}
136		144
137	bool	145	bool
138	bgPixmap_t::window_position_sensitive ()	146	bgPixmap_t::window_position_sensitive ()
139	{	147	{
140	# ifdef ENABLE_TRANSPARENCY	148	# ifdef ENABLE_TRANSPARENCY
141	if (flags & isTransparent)	149	if (flags & isTransparent)
142	return true;	150	return true;
143	# endif	151	# endif
144		152
145	# ifdef BG_IMAGE_FROM_FILE	153	# ifdef BG_IMAGE_FROM_FILE
146	# ifdef HAVE_AFTERIMAGE	154	# ifdef HAVE_AFTERIMAGE
147	if (original_asim != NULL)	155	if (original_asim)
148	# endif	156	# endif
149	{	157	{
150	if (h_align == rootAlign \|\| v_align == rootAlign)	158	if (h_align == rootAlign \|\| v_align == rootAlign)
151	return true;	159	return true;
152	}	160	}
…		…
156	};	164	};
157		165
158	bool bgPixmap_t::need_client_side_rendering ()	166	bool bgPixmap_t::need_client_side_rendering ()
159	{	167	{
160	# ifdef HAVE_AFTERIMAGE	168	# ifdef HAVE_AFTERIMAGE
161	if (original_asim != NULL)	169	if (original_asim)
162	return true;	170	return true;
163	# endif	171	# endif
164	# ifdef ENABLE_TRANSPARENCY	172	# ifdef ENABLE_TRANSPARENCY
165	if (flags & isTransparent)	173	if (flags & isTransparent)
166	{	174	{
…		…
255	int geom_flags = 0, changed = 0;	263	int geom_flags = 0, changed = 0;
256	int x = 0, y = 0;	264	int x = 0, y = 0;
257	unsigned int w = 0, h = 0;	265	unsigned int w = 0, h = 0;
258	unsigned int n;	266	unsigned int n;
259	unsigned long new_flags = (flags & (~geometryFlags));	267	unsigned long new_flags = (flags & (~geometryFlags));
260	char *p;	268	const char *p;
261	# define MAXLEN_GEOM 256 /* could be longer then regular geometry string */	269	# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
262		270
263	if (geom == NULL)	271	if (geom == NULL)
264	return false;	272	return false;
265		273
266	char str[MAXLEN_GEOM];	274	char str[MAXLEN_GEOM];
…		…
273	if (n < MAXLEN_GEOM)	281	if (n < MAXLEN_GEOM)
274	{	282	{
275	char *ops;	283	char *ops;
276	new_flags \|= geometrySet;	284	new_flags \|= geometrySet;
277		285
278	strncpy (str, geom, n);	286	memcpy (str, geom, n);
279	str[n] = '\0';	287	str[n] = '\0';
280	if (str[0] == ':')	288	if (str[0] == ':')
281	ops = &str[0];	289	ops = &str[0];
282	else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))	290	else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
283	ops = &str[0];	291	ops = &str[0];
…		…
366	if (ops)	374	if (ops)
367	{	375	{
368	while (*ops)	376	while (*ops)
369	{	377	{
370	while (ops == ':' \|\| isspace(ops)) ++ops;	378	while (ops == ':' \|\| isspace(ops)) ++ops;
		379
371	# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof(op_str)-1) == 0)	380	# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0)
372	if (CHECK_GEOM_OPS("tile"))	381	if (CHECK_GEOM_OPS ("tile"))
373	{	382	{
374	w = h = noScale;	383	w = h = noScale;
375	geom_flags \|= WidthValue\|HeightValue;	384	geom_flags \|= WidthValue\|HeightValue;
376	}	385	}
377	else if (CHECK_GEOM_OPS("propscale"))	386	else if (CHECK_GEOM_OPS ("propscale"))
378	{	387	{
379	if (w == 0 && h == 0)	388	if (w == 0 && h == 0)
380	{	389	{
381	w = windowScale;	390	w = windowScale;
382	geom_flags \|= WidthValue;	391	geom_flags \|= WidthValue;
383	}	392	}
384	new_flags \|= propScale;	393	new_flags \|= propScale;
385	}	394	}
386	else if (CHECK_GEOM_OPS("hscale"))	395	else if (CHECK_GEOM_OPS ("hscale"))
387	{	396	{
388	if (w == 0)
389	w = windowScale;	397	if (w == 0) w = windowScale;
		398
390	h = noScale;	399	h = noScale;
391	geom_flags \|= WidthValue\|HeightValue;	400	geom_flags \|= WidthValue\|HeightValue;
392	}	401	}
393	else if (CHECK_GEOM_OPS("vscale"))	402	else if (CHECK_GEOM_OPS ("vscale"))
394	{	403	{
395	if (h == 0)
396	h = windowScale;	404	if (h == 0) h = windowScale;
		405
397	w = noScale;	406	w = noScale;
398	geom_flags \|= WidthValue\|HeightValue;	407	geom_flags \|= WidthValue\|HeightValue;
399	}	408	}
400	else if (CHECK_GEOM_OPS("scale"))	409	else if (CHECK_GEOM_OPS ("scale"))
401	{	410	{
402	if (h == 0)
403	h = windowScale;	411	if (h == 0) h = windowScale;
404	if (w == 0)
405	w = windowScale;	412	if (w == 0) w = windowScale;
		413
406	geom_flags \|= WidthValue\|HeightValue;	414	geom_flags \|= WidthValue\|HeightValue;
407	}	415	}
408	else if (CHECK_GEOM_OPS("auto"))	416	else if (CHECK_GEOM_OPS ("auto"))
409	{	417	{
410	w = h = windowScale;	418	w = h = windowScale;
411	x = y = centerAlign;	419	x = y = centerAlign;
412	geom_flags \|= WidthValue\|HeightValue\|XValue\|YValue;	420	geom_flags \|= WidthValue\|HeightValue\|XValue\|YValue;
413	}	421	}
414	else if (CHECK_GEOM_OPS("root"))	422	else if (CHECK_GEOM_OPS ("root"))
415	{	423	{
416	w = h = noScale;	424	w = h = noScale;
417	x = y = rootAlign;	425	x = y = rootAlign;
418	geom_flags \|= WidthValue\|HeightValue\|XValue\|YValue;	426	geom_flags \|= WidthValue\|HeightValue\|XValue\|YValue;
419	}	427	}
420	# undef CHECK_GEOM_OPS	428	# undef CHECK_GEOM_OPS
		429
421	while (ops != ':' && ops != '\0') ++ops;	430	while (ops != ':' && ops != '\0') ++ops;
422	} /* done parsing ops */	431	} /* done parsing ops */
423	}	432	}
424		433
425	if (check_set_scale_value (geom_flags, WidthValue, h_scale, w))	434	if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed;
426	++changed;
427	if (check_set_scale_value (geom_flags, HeightValue, v_scale, h))	435	if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed;
428	++changed;
429	if (check_set_align_value (geom_flags, XValue, h_align, x))	436	if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed;
430	++changed;
431	if (check_set_align_value (geom_flags, YValue, v_align, y))	437	if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed;
432	++changed;
433	}	438	}
434		439
435	if (new_flags != flags)	440	if (new_flags != flags)
436	{	441	{
437	flags = new_flags;	442	flags = new_flags;
438	changed++;	443	changed++;
439	}	444	}
		445
440	//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",	446	//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
441	// flags, h_scale, v_scale, h_align, v_align);	447	// flags, h_scale, v_scale, h_align, v_align);
442	return (changed > 0);	448	return (changed > 0);
443	}	449	}
444		450
…		…
447	bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint)	453	bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint)
448	{	454	{
449	if (target == NULL)	455	if (target == NULL)
450	return false;	456	return false;
451		457
		458	target->init_asv ();
		459
		460	ASImage *result = 0;
		461
452	int target_width = (int)target->szHint.width;	462	int target_width = target->szHint.width;
453	int target_height = (int)target->szHint.height;	463	int target_height = target->szHint.height;
454	int new_pmap_width = target_width, new_pmap_height = target_height;	464	int new_pmap_width = target_width;
455	ASImage *result = NULL;	465	int new_pmap_height = target_height;
456		466
457	int x = 0;	467	int x = 0;
458	int y = 0;	468	int y = 0;
459	int w = h_scale * target_width / 100;	469	int w = h_scale * target_width / 100;
460	int h = v_scale * target_height / 100;	470	int h = v_scale * target_height / 100;
…		…
467	{	477	{
468	target->get_window_origin(x, y);	478	target->get_window_origin(x, y);
469	x = -x;	479	x = -x;
470	y = -y;	480	y = -y;
471	}	481	}
		482
472	if (h_align != rootAlign)	483	if (h_align != rootAlign)
473	x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);	484	x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
		485
474	if (v_align != rootAlign)	486	if (v_align != rootAlign)
475	y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);	487	y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
476	}	488	}
477		489
478	if (original_asim == NULL	490	if (!original_asim
479	\|\| x >= target_width	491	\|\| x >= target_width
480	\|\| y >= target_height	492	\|\| y >= target_height
481	\|\| (w > 0 && x + w <= 0)	493	\|\| (w > 0 && x + w <= 0)
482	\|\| (h > 0 && y + h <= 0))	494	\|\| (h > 0 && y + h <= 0))
483	{	495	{
484	if (background)	496	if (background)
485	{	497	{
486	new_pmap_width = background->width;	498	new_pmap_width = background->width;
487	new_pmap_height = background->height;	499	new_pmap_height = background->height;
488	result = background;	500	result = background;
		501
489	if (background_tint != TINT_LEAVE_SAME)	502	if (background_tint != TINT_LEAVE_SAME)
490	{	503	{
491	ASImage* tmp = tile_asimage (target->asv, background, 0, 0,	504	ASImage *tmp = tile_asimage (target->asv, background, 0, 0,
492	target_width, target_height, background_tint,	505	target_width, target_height, background_tint,
493	ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);	506	ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
494	if (tmp)	507	if (tmp)
495	result = tmp;	508	result = tmp;
496	}	509	}
…		…
499	new_pmap_width = new_pmap_height = 0;	512	new_pmap_width = new_pmap_height = 0;
500	}	513	}
501	else	514	else
502	{	515	{
503	result = original_asim;	516	result = original_asim;
		517
504	if ((w > 0 && w != original_asim->width)	518	if ((w > 0 && w != original_asim->width)
505	\|\| (h > 0 && h != original_asim->height))	519	\|\| (h > 0 && h != original_asim->height))
506	{	520	{
507	result = scale_asimage (target->asv, original_asim,	521	result = scale_asimage (target->asv, original_asim,
508	w > 0 ? w : original_asim->width,	522	w > 0 ? w : original_asim->width,
509	h > 0 ? h : original_asim->height,	523	h > 0 ? h : original_asim->height,
510	background ? ASA_ASImage : ASA_XImage,	524	background ? ASA_ASImage : ASA_XImage,
511	100, ASIMAGE_QUALITY_DEFAULT);	525	100, ASIMAGE_QUALITY_DEFAULT);
512	}	526	}
		527
513	if (background == NULL)	528	if (background == NULL)
514	{	529	{
515	/* if tiling - pixmap has to be sized exactly as the image,	530	/* if tiling - pixmap has to be sized exactly as the image,
516	but there is no need to make it bigger then the window! */	531	but there is no need to make it bigger than the window! */
517	if (h_scale == 0)	532	if (h_scale == 0)
518	new_pmap_width = min (result->width, target_width);	533	new_pmap_width = min (result->width, target_width);
519	if (v_scale == 0)	534	if (v_scale == 0)
520	new_pmap_height = min (result->height, target_height);	535	new_pmap_height = min (result->height, target_height);
521	/* we also need to tile our image in one or both directions */	536	/* we also need to tile our image in one or both directions */
522	if (h_scale == 0 \|\| v_scale == 0)	537	if (h_scale == 0 \|\| v_scale == 0)
523	{	538	{
524	ASImage *tmp = tile_asimage (target->asv, result,	539	ASImage *tmp = tile_asimage (target->asv, result,
525	(h_scale > 0) ? 0 : (int)result->width - x,	540	(h_scale > 0) ? 0 : (int)result->width - x,
526	(v_scale > 0) ? 0 : (int)result->height - y,	541	(v_scale > 0) ? 0 : (int)result->height - y,
527	new_pmap_width,	542	new_pmap_width,
528	new_pmap_height,	543	new_pmap_height,
529	TINT_LEAVE_SAME, ASA_XImage,	544	TINT_LEAVE_SAME, ASA_XImage,
530	100, ASIMAGE_QUALITY_DEFAULT);	545	100, ASIMAGE_QUALITY_DEFAULT);
531	if (tmp)	546	if (tmp)
532	{	547	{
533	if (result != original_asim)	548	if (result != original_asim)
534	destroy_asimage (&result);	549	destroy_asimage (&result);
		550
535	result = tmp;	551	result = tmp;
536	}	552	}
537	}	553	}
538	}	554	}
539	else	555	else
540	{	556	{
541	/* if blending background and image - pixmap has to be sized same as target window */	557	/* if blending background and image - pixmap has to be sized same as target window */
542	ASImageLayer *layers = create_image_layers (2);	558	ASImageLayer *layers = create_image_layers (2);
543	ASImage *merged_im = NULL;
544		559
545	layers[0].im = background;	560	layers[0].im = background;
546	layers[0].clip_width = target_width;	561	layers[0].clip_width = target_width;
547	layers[0].clip_height = target_height;	562	layers[0].clip_height = target_height;
548	layers[0].tint = background_tint;	563	layers[0].tint = background_tint;
549	layers[1].im = result;	564	layers[1].im = result;
		565
550	if (w <= 0)	566	if (w <= 0)
551	{	567	{
552	/* tile horizontally */	568	/* tile horizontally */
553	while (x > 0) x -= (int)result->width;	569	while (x > 0) x -= (int)result->width;
554	layers[1].dst_x = x;	570	layers[1].dst_x = x;
…		…
558	{	574	{
559	/* clip horizontally */	575	/* clip horizontally */
560	layers[1].dst_x = x;	576	layers[1].dst_x = x;
561	layers[1].clip_width = result->width;	577	layers[1].clip_width = result->width;
562	}	578	}
		579
563	if (h <= 0)	580	if (h <= 0)
564	{	581	{
565	while (y > 0) y -= (int)result->height;	582	while (y > 0) y -= (int)result->height;
566	layers[1].dst_y = y;	583	layers[1].dst_y = y;
567	layers[1].clip_height = result->height + target_height;	584	layers[1].clip_height = result->height + target_height;
…		…
569	else	586	else
570	{	587	{
571	layers[1].dst_y = y;	588	layers[1].dst_y = y;
572	layers[1].clip_height = result->height;	589	layers[1].clip_height = result->height;
573	}	590	}
		591
574	if (target->rs[Rs_blendtype])	592	if (target->rs[Rs_blendtype])
575	{	593	{
576	layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]);	594	layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]);
577	if (layers[1].merge_scanlines == NULL)	595	if (layers[1].merge_scanlines == NULL)
578	layers[1].merge_scanlines = alphablend_scanlines;	596	layers[1].merge_scanlines = alphablend_scanlines;
579	}	597	}
		598
580	ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height,	599	ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height,
581	ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);	600	ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
		601
582	if (tmp)	602	if (tmp)
583	{	603	{
584	if (result != original_asim)	604	if (result != original_asim)
585	destroy_asimage (&result);	605	destroy_asimage (&result);
		606
586	result = tmp;	607	result = tmp;
587	}	608	}
		609
588	free (layers);	610	free (layers);
589	}	611	}
590	}	612	}
591	TIMING_TEST_PRINT_RESULT (asim);	613	TIMING_TEST_PRINT_RESULT (asim);
592		614
…		…
621		643
622	int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;	644	int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
623	int dst_width = result->width, dst_height = result->height;	645	int dst_width = result->width, dst_height = result->height;
624	if (background == NULL)	646	if (background == NULL)
625	{	647	{
626	if (h_scale > 0)
627	src_x = make_clip_rectangle (x, result->width, new_pmap_width, dst_x, dst_width);	648	if (h_scale > 0) src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
628	if (v_scale > 0)
629	src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);	649	if (v_scale > 0) src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
630		650
631	if (dst_x > 0 \|\| dst_y > 0	651	if (dst_x > 0 \|\| dst_y > 0
632	\|\| dst_x + dst_width < new_pmap_width	652	\|\| dst_x + dst_width < new_pmap_width
633	\|\| dst_y + dst_height < new_pmap_height)	653	\|\| dst_y + dst_height < new_pmap_height)
634	{
635	XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);	654	XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
636	}
637	}	655	}
638		656
639	/* put result on pixmap */	657	/* put result on pixmap */
640	if (dst_x < new_pmap_width && dst_y < new_pmap_height)	658	if (dst_x < new_pmap_width && dst_y < new_pmap_height)
641	asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);	659	asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
…		…
652	# endif /* HAVE_AFTERIMAGE */	670	# endif /* HAVE_AFTERIMAGE */
653		671
654	bool	672	bool
655	bgPixmap_t::set_file (const char *file)	673	bgPixmap_t::set_file (const char *file)
656	{	674	{
657	char *f;
658
659	assert (file != NULL);	675	assert (file);
660		676
661	if (*file != '\0')	677	if (*file)
662	{	678	{
663	# ifdef HAVE_AFTERIMAGE	679	# ifdef HAVE_AFTERIMAGE
664	if (target->asimman == NULL)	680	if (!target->asimman)
665	target->asimman = create_generic_imageman (target->rs[Rs_path]);	681	target->asimman = create_generic_imageman (target->rs[Rs_path]);
666	if ((f = strchr (file, ';')) == NULL)	682
667	original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);	683	if (const char *p = strchr (file, ';'))
668	else
669	{	684	{
670	size_t len = f - file;	685	size_t len = p - file;
671	f = (char *)malloc (len + 1);	686	char f = (char )malloc (len + 1);
672	strncpy (f, file, len);	687	memcpy (f, file, len);
673	f[len] = '\0';	688	f[len] = '\0';
674	original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);	689	original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);
675	free (f);	690	free (f);
676	}	691	}
		692	else
		693	original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
		694
677	return (original_asim != NULL);	695	return original_asim;
678	# endif	696	# endif
679	}	697	}
		698
680	return false;	699	return false;
681	}	700	}
682		701
683	# endif /* BG_IMAGE_FROM_FILE */	702	# endif /* BG_IMAGE_FROM_FILE */
684		703
…		…
689	if (!(flags & isTransparent))	708	if (!(flags & isTransparent))
690	{	709	{
691	flags \|= isTransparent;	710	flags \|= isTransparent;
692	return true;	711	return true;
693	}	712	}
		713
694	return false;	714	return false;
695	}	715	}
696		716
697	bool	717	bool
698	bgPixmap_t::set_blur_radius (const char *geom)	718	bgPixmap_t::set_blur_radius (const char *geom)
…		…
779	unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);	799	unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
780	tint = new_tint;	800	tint = new_tint;
781	flags = (flags & ~tintFlags) \| new_flags \| tintSet;	801	flags = (flags & ~tintFlags) \| new_flags \| tintSet;
782	return true;	802	return true;
783	}	803	}
		804
784	return false;	805	return false;
785	}	806	}
786		807
787	bool	808	bool
788	bgPixmap_t::unset_tint ()	809	bgPixmap_t::unset_tint ()
…		…
792	if (new_flags != (flags & tintFlags))	813	if (new_flags != (flags & tintFlags))
793	{	814	{
794	flags = (flags&~tintFlags)\|new_flags;	815	flags = (flags&~tintFlags)\|new_flags;
795	return true;	816	return true;
796	}	817	}
		818
797	return false;	819	return false;
798	}	820	}
799		821
800	bool	822	bool
801	bgPixmap_t::set_shade (const char *shade_str)	823	bgPixmap_t::set_shade (const char *shade_str)
802	{	824	{
803	int new_shade = (shade_str) ? atoi (shade_str) : 0;	825	int new_shade = (shade_str) ? atoi (shade_str) : 0;
804		826
805	if (new_shade < 0 && new_shade > -100)	827	if (new_shade < 0 && new_shade > -100)
806	new_shade = 200 - (100 + new_shade);	828	new_shade = 200 - (100 + new_shade);
807	else if (new_shade == 100)	829	else if (new_shade == 100)
808	new_shade = 0;	830	new_shade = 0;
809		831
810	if (new_shade != shade)	832	if (new_shade != shade)
811	{	833	{
812	unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);	834	unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
813	shade = new_shade;	835	shade = new_shade;
814	flags = (flags & (~tintFlags \| tintSet)) \| new_flags;	836	flags = (flags & (~tintFlags \| tintSet)) \| new_flags;
815	return true;	837	return true;
816	}	838	}
		839
817	return false;	840	return false;
818	}	841	}
819		842
820	/* make_transparency_pixmap()	843	/* make_transparency_pixmap()
821	* Builds a pixmap sized the same as terminal window, with depth same as the root window	844	* Builds a pixmap sized the same as terminal window, with depth same as the root window
…		…
828	unsigned long result = 0;	851	unsigned long result = 0;
829		852
830	if (target == NULL)	853	if (target == NULL)
831	return 0;	854	return 0;
832		855
833	/* root dimentions may change from call to call - but Display structure should	856	/* root dimensions may change from call to call - but Display structure should
834	* be always up-to-date, so let's use it :	857	* be always up-to-date, so let's use it :
835	*/	858	*/
836	Window root = target->display->root;	859	Window root = target->display->root;
837	int screen = target->display->screen;	860	int screen = target->display->screen;
838	Display *dpy = target->dpy;	861	Display *dpy = target->dpy;
…		…
897	XGrabServer (dpy);	920	XGrabServer (dpy);
898	XMapRaised (dpy, src);	921	XMapRaised (dpy, src);
899	XSync (dpy, False);	922	XSync (dpy, False);
900		923
901	/* XSync should get window where it's properly exposed,	924	/* XSync should get window where it's properly exposed,
902	* but to be on the safe side - let's check for the actuall event to arrive : */	925	* but to be on the safe side - let's check for the actual event to arrive : */
903	while (XCheckWindowEvent (dpy, src, ExposureMask, &event))	926	while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
904	++ev_count;	927	++ev_count;
905		928
906	if (ev_count > 0);	929	if (ev_count > 0);
907	{	930	{
…		…
911	{	934	{
912	XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);	935	XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
913	success = true;	936	success = true;
914	}	937	}
915	}	938	}
		939
916	XDestroyWindow (dpy, src);	940	XDestroyWindow (dpy, src);
917	XUngrabServer (dpy);	941	XUngrabServer (dpy);
918	//fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);	942	//fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
919	}	943	}
920		944
…		…
926	else	950	else
927	result \|= transpPmapTiled;	951	result \|= transpPmapTiled;
928	}	952	}
929	else	953	else
930	{	954	{
931	/* strightforward pixmap copy */	955	/* straightforward pixmap copy */
932	gcv.tile = root_pixmap;	956	gcv.tile = root_pixmap;
933	gcv.fill_style = FillTiled;	957	gcv.fill_style = FillTiled;
934		958
935	while (sx < 0) sx += (int)root_width;	959	while (sx < 0) sx += (int)root_width;
936	while (sy < 0) sy += (int)root_height;	960	while (sy < 0) sy += (int)root_height;
…		…
1040	mask_c.blue = 0xffff - c.b;	1064	mask_c.blue = 0xffff - c.b;
1041	XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);	1065	XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1042	XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);	1066	XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
1043	result \|= transpPmapTinted;	1067	result \|= transpPmapTinted;
1044	}	1068	}
		1069
1045	XRenderFreePicture (dpy, mask_pic);	1070	XRenderFreePicture (dpy, mask_pic);
1046	XRenderFreePicture (dpy, overlay_pic);	1071	XRenderFreePicture (dpy, overlay_pic);
1047	XRenderFreePicture (dpy, back_pic);	1072	XRenderFreePicture (dpy, back_pic);
1048	# if DO_TIMING_TEST	1073	# if DO_TIMING_TEST
1049	XSync (dpy, False);	1074	XSync (dpy, False);
…		…
1071	}	1096	}
1072		1097
1073	bool	1098	bool
1074	bgPixmap_t::set_root_pixmap ()	1099	bgPixmap_t::set_root_pixmap ()
1075	{	1100	{
1076	Pixmap new_root_pixmap = None;
1077
1078	new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);	1101	Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1079	if (new_root_pixmap == None)	1102	if (new_root_pixmap == None)
1080	new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);	1103	new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1081		1104
1082	if (new_root_pixmap != root_pixmap)	1105	if (new_root_pixmap != root_pixmap)
1083	{	1106	{
1084	root_pixmap = new_root_pixmap;	1107	root_pixmap = new_root_pixmap;
1085	return true;	1108	return true;
1086	}	1109	}
		1110
1087	return false;	1111	return false;
1088	}	1112	}
1089	# endif /* ENABLE_TRANSPARENCY */	1113	# endif /* ENABLE_TRANSPARENCY */
1090		1114
1091	# ifndef HAVE_AFTERIMAGE	1115	# ifndef HAVE_AFTERIMAGE
1092	static void ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm);	1116	static void ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm);
1093	# endif	1117	# endif
1094
1095		1118
1096	bool	1119	bool
1097	bgPixmap_t::render ()	1120	bgPixmap_t::render ()
1098	{	1121	{
1099	unsigned long background_flags = 0;	1122	unsigned long background_flags = 0;
…		…
1101	if (target == NULL)	1124	if (target == NULL)
1102	return false;	1125	return false;
1103		1126
1104	TIMING_TEST_START (tp);	1127	TIMING_TEST_START (tp);
1105		1128
1106	invalidate();	1129	invalidate ();
1107	# ifdef ENABLE_TRANSPARENCY	1130	# ifdef ENABLE_TRANSPARENCY
1108	if (flags & isTransparent)	1131	if (flags & isTransparent)
1109	{	1132	{
1110	/* we need to re-generate transparency pixmap in that case ! */	1133	/* we need to re-generate transparency pixmap in that case ! */
1111	background_flags = make_transparency_pixmap ();	1134	background_flags = make_transparency_pixmap ();
…		…
1120	XImage *result = NULL;	1143	XImage *result = NULL;
1121	# ifdef HAVE_AFTERIMAGE	1144	# ifdef HAVE_AFTERIMAGE
1122	if (original_asim	1145	if (original_asim
1123	\|\| (background_flags & transpTransformations) != (flags & transpTransformations))	1146	\|\| (background_flags & transpTransformations) != (flags & transpTransformations))
1124	{	1147	{
		1148	target->init_asv ();
		1149
1125	ASImage *background = NULL;	1150	ASImage *background = NULL;
1126	ARGB32 as_tint = TINT_LEAVE_SAME;	1151	ARGB32 as_tint = TINT_LEAVE_SAME;
1127	if (background_flags)	1152	if (background_flags)
1128	background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);	1153	background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
1129		1154
1130	# ifdef ENABLE_TRANSPARENCY	1155	# ifdef ENABLE_TRANSPARENCY
1131	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))	1156	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1132	{	1157	{
1133	ShadingInfo as_shade;	1158	ShadingInfo as_shade;
…		…
1140	as_shade.tintColor.green = c.g;	1165	as_shade.tintColor.green = c.g;
1141	as_shade.tintColor.blue = c.b;	1166	as_shade.tintColor.blue = c.b;
1142		1167
1143	as_tint = shading2tint32 (&as_shade);	1168	as_tint = shading2tint32 (&as_shade);
1144	}	1169	}
		1170
1145	if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)	1171	if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
1146	{	1172	{
1147	ASImage* tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,	1173	ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
1148	(original_asim == NULL \|\| tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,	1174	(original_asim == NULL \|\| tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
1149	100, ASIMAGE_QUALITY_DEFAULT);	1175	100, ASIMAGE_QUALITY_DEFAULT);
1150	if (tmp)	1176	if (tmp)
1151	{	1177	{
1152	destroy_asimage (&background);	1178	destroy_asimage (&background);
…		…
1156	# endif	1182	# endif
1157		1183
1158	if (render_asim (background, as_tint))	1184	if (render_asim (background, as_tint))
1159	flags = flags & ~isInvalid;	1185	flags = flags & ~isInvalid;
1160	if (background)	1186	if (background)
1161	destroy_asimage (&background);	1187	destroy_asimage (&background);
1162	}	1188	}
1163	else if (background_flags && pmap_depth != target->depth)	1189	else if (background_flags && pmap_depth != target->depth)
		1190	result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
		1191
		1192	# elif !XFT /* our own client-side tinting */
		1193
		1194	/* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
		1195	This may need to be changed in need_client_side_rendering() logic is altered !!! */
		1196
		1197	if (background_flags && (flags & isInvalid))
1164	{	1198	{
1165	result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);	1199	result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1166	}
1167		1200
1168	# elif !XFT /* our own client-side tinting */
1169
1170	/* ATTENTION: We ASSUME that XFT will let us do all the tinting neccessary server-side.
1171	This may need to be changed in need_client_side_rendering() logic is altered !!! */
1172
1173	if (background_flags && (flags & isInvalid))
1174	{
1175	result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1176	if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))	1201	if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1177	{	1202	{
1178	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);	1203	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1179	if (flags & tintSet)	1204	if (flags & tintSet)
1180	tint.get (c);	1205	tint.get (c);
1181	ShadeXImage (target, result, shade, c.r, c.g, c.b);	1206	ShadeXImage (target, result, shade, c.r, c.g, c.b);
1182	}	1207	}
1183	}	1208	}
1184	# endif /* HAVE_AFTERIMAGE */	1209	# endif /* HAVE_AFTERIMAGE */
1185		1210
1186	if (result != NULL)	1211	if (result)
1187	{	1212	{
1188	GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);	1213	GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
		1214
1189	if (gc)	1215	if (gc)
1190	{	1216	{
1191	if (/pmap_depth != target->depth &&/ pixmap != None)	1217	if (/pmap_depth != target->depth &&/ pixmap != None)
1192	{	1218	{
1193	XFreePixmap (target->dpy, pixmap);	1219	XFreePixmap (target->dpy, pixmap);
1194	pixmap = None;	1220	pixmap = None;
1195	}	1221	}
		1222
1196	if (pixmap == None)	1223	if (pixmap == None)
1197	{	1224	{
1198	pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);	1225	pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1199	pmap_width = result->width;	1226	pmap_width = result->width;
1200	pmap_height = result->height;	1227	pmap_height = result->height;
1201	pmap_depth = target->depth;	1228	pmap_depth = target->depth;
1202	}	1229	}
		1230
1203	if (pmap_depth != result->depth)	1231	if (pmap_depth != result->depth)
1204	{	1232	{
1205	/* Bad Match error will ensue ! stupid X !!!! */	1233	/* Bad Match error will ensue ! stupid X !!!! */
1206	if (result->depth == 24 && pmap_depth == 32)	1234	if (result->depth == 24 && pmap_depth == 32)
1207	result->depth = 32;	1235	result->depth = 32;
…		…
1210	else	1238	else
1211	{	1239	{
1212	/* TODO: implement image recoding */	1240	/* TODO: implement image recoding */
1213	}	1241	}
1214	}	1242	}
		1243
1215	if (pmap_depth == result->depth)	1244	if (pmap_depth == result->depth)
1216	XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);	1245	XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
		1246
1217	XFreeGC (target->dpy, gc);	1247	XFreeGC (target->dpy, gc);
1218	flags = flags & ~isInvalid;	1248	flags = flags & ~isInvalid;
1219	}	1249	}
		1250
1220	XDestroyImage (result);	1251	XDestroyImage (result);
1221	}	1252	}
1222		1253
1223	if (flags & isInvalid)	1254	if (flags & isInvalid)
1224	{	1255	{
…		…
1228	pixmap = None;	1259	pixmap = None;
1229	}	1260	}
1230	}	1261	}
1231		1262
1232	apply ();	1263	apply ();
		1264
		1265	XSync (target->dpy, False);
		1266	valid_since = ev::now ();
1233		1267
1234	TIMING_TEST_PRINT_RESULT (tp);	1268	TIMING_TEST_PRINT_RESULT (tp);
1235		1269
1236	return true;	1270	return true;
1237	}	1271	}
…		…
1246	# ifdef ENABLE_TRANSPARENCY	1280	# ifdef ENABLE_TRANSPARENCY
1247	root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));	1281	root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1248	# endif	1282	# endif
1249	return true;	1283	return true;
1250	}	1284	}
		1285
1251	return false;	1286	return false;
1252	}	1287	}
1253		1288
1254	void	1289	void
1255	bgPixmap_t::apply()	1290	bgPixmap_t::apply ()
1256	{	1291	{
1257	if (target)	1292	if (target)
1258	{	1293	{
1259	flags &= ~isVtOrigin;	1294	flags &= ~isVtOrigin;
		1295
1260	if (pixmap != None)	1296	if (pixmap != None)
1261	{	1297	{
1262	/* set target's background to pixmap */	1298	/* set target's background to pixmap */
1263	# ifdef ENABLE_TRANSPARENCY	1299	# ifdef ENABLE_TRANSPARENCY
1264	if (flags & isTransparent)	1300	if (flags & isTransparent)
1265	{	1301	{
1266	XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);	1302	XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1267	XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);	1303	XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1268	# if HAVE_SCROLLBARS	1304
1269	if (target->scrollBar.win)	1305	if (target->scrollBar.win)
1270	XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);	1306	XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1271	# endif
1272	}	1307	}
1273	else	1308	else
1274	# endif	1309	# endif
1275	{	1310	{
1276	flags \|= isVtOrigin;	1311	flags \|= isVtOrigin;
1277	/* force old pixmap dereference in case it was transparent before :*/	1312	/* force old pixmap dereference in case it was transparent before :*/
1278	XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);	1313	XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1279	XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);	1314	XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1280	/* do we also need to set scrollbar's background here ? */	1315	/* do we also need to set scrollbar's background here ? */
1281	# if HAVE_SCROLLBARS	1316
1282	if (target->scrollBar.win)	1317	if (target->scrollBar.win)
1283	XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);	1318	XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1284	# endif
1285	}	1319	}
1286	}	1320	}
1287	else	1321	else
1288	{	1322	{
1289	/* set target background to a pixel */	1323	/* set target background to a pixel */
1290	XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);	1324	XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1291	XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);	1325	XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1292	/* do we also need to set scrollbar's background here ? */	1326	/* do we also need to set scrollbar's background here ? */
1293	# if HAVE_SCROLLBARS
1294	if (target->scrollBar.win)	1327	if (target->scrollBar.win)
1295	XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);	1328	XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1296	# endif
1297	}	1329	}
		1330
1298	/* don't want Expose on the parent or vt. It is better to use	1331	/* don't want Expose on the parent or vt. It is better to use
1299	scr_touch or we get a great deal of flicker otherwise: */	1332	scr_touch or we get a great deal of flicker otherwise: */
1300	XClearWindow (target->dpy, target->parent[0]);	1333	XClearWindow (target->dpy, target->parent[0]);
1301		1334
1302	# if HAVE_SCROLLBARS	1335	if (target->scrollBar.state && target->scrollBar.win)
1303	if (target->scrollBar.win)
1304	{	1336	{
1305	target->scrollBar.setIdle ();	1337	target->scrollBar.state = STATE_IDLE;
1306	target->scrollbar_show (0);	1338	target->scrollBar.show (0);
1307	}	1339	}
1308	# endif
1309		1340
1310	target->want_refresh = 1;	1341	target->want_refresh = 1;
1311	flags \|= hasChanged;	1342	flags \|= hasChanged;
1312	}	1343	}
1313	}	1344	}
…		…
1318	/* taken from aterm-0.4.2 */	1349	/* taken from aterm-0.4.2 */
1319		1350
1320	typedef uint32_t RUINT32T;	1351	typedef uint32_t RUINT32T;
1321		1352
1322	static void	1353	static void
1323	ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm)	1354	ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm)
1324	{	1355	{
1325	int sh_r, sh_g, sh_b;	1356	int sh_r, sh_g, sh_b;
1326	RUINT32T mask_r, mask_g, mask_b;	1357	RUINT32T mask_r, mask_g, mask_b;
1327	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	1358	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
1328	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	1359	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;

Diff Legend

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

Comparing rxvt-unicode/src/background.C (file contents): Revision 1.19 by ayin, Tue Dec 18 11:15:24 2007 UTC vs. Revision 1.42 by sf-exg, Sun Aug 29 13:24:30 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.19 by ayin, Tue Dec 18 11:15:24 2007 UTC vs.
Revision 1.42 by sf-exg, Sun Aug 29 13:24:30 2010 UTC