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

Comparing rxvt-unicode/src/xpm.C (file contents):
Revision 1.62 by sasha, Tue Aug 7 22:43:33 2007 UTC vs.
Revision 1.70 by sasha, Thu Aug 16 21:26:20 2007 UTC

…		…
72		72
73	#ifdef HAVE_BG_PIXMAP	73	#ifdef HAVE_BG_PIXMAP
74	bool	74	bool
75	bgPixmap_t::window_size_sensitive ()	75	bgPixmap_t::window_size_sensitive ()
76	{	76	{
77	#ifdef XPM_BACKGROUND	77	# ifdef XPM_BACKGROUND
78	#ifdef HAVE_AFTERIMAGE	78	# ifdef HAVE_AFTERIMAGE
79	if (original_asim != NULL)	79	if (original_asim != NULL)
80	#endif	80	# endif
81	{	81	{
82	if (h_scale != 0 \|\| v_scale != 0)	82	if (h_scale != 0 \|\| v_scale != 0)
83	return true;	83	return true;
84	}	84	}
85	#endif	85	# endif
86	#ifdef ENABLE_TRANSPARENCY	86	# ifdef ENABLE_TRANSPARENCY
87	if (flags & bgPmap_Transparent)	87	if (flags & isTransparent)
		88	return true;
		89	# endif
		90	return false;
		91	}
		92
		93	bool bgPixmap_t::need_client_side_rendering ()
		94	{
		95	# ifdef HAVE_AFTERIMAGE
		96	if (original_asim != NULL)
88	return true;	97	return true;
89	#endif	98	#endif
		99	# ifdef ENABLE_TRANSPARENCY
		100	if (flags & isTransparent)
		101	{
		102	if ((flags & blurNeeded)
		103	\|\| ((flags & tintNeeded) && !(flags & tintServerSide)))
		104	return true;
		105	}
		106	# endif
90	return false;	107	return false;
91	}	108	}
92		109
93	#ifdef XPM_BACKGROUND	110	# ifdef XPM_BACKGROUND
94	static inline bool	111	static inline bool
95	check_set_scale_value (int geom_flags, int flag, unsigned int &scale, unsigned int new_value)	112	check_set_scale_value (int geom_flags, int flag, unsigned int &scale, unsigned int new_value)
96	{	113	{
97	if (geom_flags & flag)	114	if (geom_flags & flag)
98	{	115	{
…		…
160	dst_size = target_size - dst_pos;	177	dst_size = target_size - dst_pos;
161	return src_pos;	178	return src_pos;
162	}	179	}
163		180
164	bool	181	bool
165	bgPixmap_t::handle_geometry (const char *geom)	182	bgPixmap_t::set_geometry (const char *geom)
166	{	183	{
167	int geom_flags = 0, changed = 0;	184	int geom_flags = 0, changed = 0;
168	int x = 0, y = 0;	185	int x = 0, y = 0;
169	unsigned int w = 0, h = 0;	186	unsigned int w = 0, h = 0;
170	unsigned int n;	187	unsigned int n;
171	unsigned long new_flags = (flags&(~bgPmap_geometryFlags));	188	unsigned long new_flags = (flags & (~geometryFlags));
172	char *p;	189	char *p;
173	#define MAXLEN_GEOM 256 /* could be longer then regular geometry string */	190	# define MAXLEN_GEOM 256 /* could be longer then regular geometry string */
174		191
175	if (geom == NULL)	192	if (geom == NULL)
176	return false;	193	return false;
177		194
178	char str[MAXLEN_GEOM];	195	char str[MAXLEN_GEOM];
179		196
180	if (!strcmp (geom, "?"))
181	{
182	#if 0 /* TODO: */
183	sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
184	min (h_scale, 32767), min (v_scale, 32767),
185	min (h_align, 32767), min (v_align, 32767));
186	process_xterm_seq (XTerm_title, str, CHAR_ST);
187	#endif
188	return false;
189	}
190	while (isspace(*geom)) ++geom;	197	while (isspace(*geom)) ++geom;
191	if ((p = strchr (geom, ';')) == NULL)	198	if ((p = strchr (geom, ';')) == NULL)
192	p = strchr (geom, '\0');	199	p = strchr (geom, '\0');
193		200
194	n = (p - geom);	201	n = (p - geom);
195	if (n < MAXLEN_GEOM)	202	if (n < MAXLEN_GEOM)
196	{	203	{
197	char *ops;	204	char *ops;
198	new_flags \|= bgPmap_geometrySet;	205	new_flags \|= geometrySet;
199		206
200	strncpy (str, geom, n);	207	strncpy (str, geom, n);
201	str[n] = '\0';	208	str[n] = '\0';
202	if (str[0] == ':')	209	if (str[0] == ':')
203	ops = &str[0];	210	ops = &str[0];
…		…
224	{	231	{
225	y = x;	232	y = x;
226	geom_flags \|= YValue;	233	geom_flags \|= YValue;
227	}	234	}
228		235
229	if (flags & bgPmap_geometrySet)	236	if (flags & geometrySet)
230	{/* new geometry is an adjustment to the old one ! */	237	{/* new geometry is an adjustment to the old one ! */
231	if ((geom_flags & WidthValue) && (geom_flags & HeightValue))	238	if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
232	{	239	{
233	if (w == 0 && h != 0)	240	if (w == 0 && h != 0)
234	{	241	{
…		…
252	}	259	}
253	else /* setting up geometry from scratch */	260	else /* setting up geometry from scratch */
254	{	261	{
255	if (!(geom_flags & XValue))	262	if (!(geom_flags & XValue))
256	{/* use default geometry - centered */	263	{/* use default geometry - centered */
257	x = y = bgPmap_defaultAlign;	264	x = y = defaultAlign;
258	}	265	}
259	else if (!(geom_flags & YValue))	266	else if (!(geom_flags & YValue))
260	y = x;	267	y = x;
261		268
262	if ((geom_flags & (WidthValue\|HeightValue)) == 0)	269	if ((geom_flags & (WidthValue\|HeightValue)) == 0)
263	{/* use default geometry - scaled */	270	{/* use default geometry - scaled */
264	w = h = bgPmap_defaultScale;	271	w = h = defaultScale;
265	}	272	}
266	else if (geom_flags & WidthValue)	273	else if (geom_flags & WidthValue)
267	{	274	{
268	if (!(geom_flags & HeightValue))	275	if (!(geom_flags & HeightValue))
269	h = w;	276	h = w;
270	}	277	}
271	else	278	else
272	w = h;	279	w = h;
273	}	280	}
274	} /* done parsing geometry string */	281	} /* done parsing geometry string */
275	else if (!(flags & bgPmap_geometrySet))	282	else if (!(flags & geometrySet))
276	{ /* default geometry - scaled and centered */	283	{ /* default geometry - scaled and centered */
277	x = y = bgPmap_defaultAlign;	284	x = y = defaultAlign;
278	w = h = bgPmap_defaultScale;	285	w = h = defaultScale;
279	}	286	}
280		287
281	if (!(flags & bgPmap_geometrySet))	288	if (!(flags & geometrySet))
282	geom_flags \|= WidthValue\|HeightValue\|XValue\|YValue;	289	geom_flags \|= WidthValue\|HeightValue\|XValue\|YValue;
283		290
284	if (ops)	291	if (ops)
285	{	292	{
286	while (*ops)	293	while (*ops)
287	{	294	{
288	while (ops == ':' \|\| isspace(ops)) ++ops;	295	while (ops == ':' \|\| isspace(ops)) ++ops;
289	#define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof(op_str)-1) == 0)	296	# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof(op_str)-1) == 0)
290	if (CHECK_GEOM_OPS("tile"))	297	if (CHECK_GEOM_OPS("tile"))
291	{	298	{
292	w = h = 0;	299	w = h = 0;
293	geom_flags \|= WidthValue\|HeightValue;	300	geom_flags \|= WidthValue\|HeightValue;
294	}	301	}
…		…
297	if (w == 0 && h == 0)	304	if (w == 0 && h == 0)
298	{	305	{
299	w = 100;	306	w = 100;
300	geom_flags \|= WidthValue;	307	geom_flags \|= WidthValue;
301	}	308	}
302	new_flags \|= bgPmap_propScale;	309	new_flags \|= propScale;
303	}	310	}
304	else if (CHECK_GEOM_OPS("hscale"))	311	else if (CHECK_GEOM_OPS("hscale"))
305	{	312	{
306	if (w == 0)	313	if (w == 0)
307	w = 100;	314	w = 100;
…		…
327	{	334	{
328	w = h = 100;	335	w = h = 100;
329	x = y = 50;	336	x = y = 50;
330	geom_flags \|= WidthValue\|HeightValue\|XValue\|YValue;	337	geom_flags \|= WidthValue\|HeightValue\|XValue\|YValue;
331	}	338	}
332	#undef CHECK_GEOM_OPS	339	# undef CHECK_GEOM_OPS
333	while (ops != ':' && ops != '\0') ++ops;	340	while (ops != ':' && ops != '\0') ++ops;
334	} /* done parsing ops */	341	} /* done parsing ops */
335	}	342	}
336		343
337	if (check_set_scale_value (geom_flags, WidthValue, h_scale, w))	344	if (check_set_scale_value (geom_flags, WidthValue, h_scale, w))
…		…
352	//fprintf( stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",	359	//fprintf( stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
353	// flags, h_scale, v_scale, h_align, v_align);	360	// flags, h_scale, v_scale, h_align, v_align);
354	return (changed > 0);	361	return (changed > 0);
355	}	362	}
356		363
357	#ifdef HAVE_AFTERIMAGE	364	# ifdef HAVE_AFTERIMAGE
358	bool	365	bool
359	bgPixmap_t::render_asim (rxvt_term target, ASImage background, ARGB32 background_tint)	366	bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint)
360	{	367	{
361	if (target == NULL)	368	if (target == NULL)
362	return false;	369	return false;
363		370
364	int target_width = (int)target->szHint.width;	371	int target_width = (int)target->szHint.width;
…		…
536	asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);	543	asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
537		544
538	if (result != background && result != original_asim)	545	if (result != background && result != original_asim)
539	destroy_asimage (&result);	546	destroy_asimage (&result);
540		547
541	/* set target's background to pixmap */
542	XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
543
544	XFreeGC (target->dpy, gc);	548	XFreeGC (target->dpy, gc);
545	}	549	}
546	else
547	{
548	/* set target background to a pixel */
549	XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
550	}
551		550
552	return true;	551	return true;
553	}	552	}
554	#endif	553	# endif /* HAVE_AFTERIMAGE */
555		554
556	void	555	bool
557	rxvt_term::resize_pixmap ()	556	bgPixmap_t::set_file (const char *file)
558	{
559
560	#ifdef ENABLE_TRANSPARENCY
561	if (option(Opt_transparent) && am_transparent)
562	{
563	/* we need to re-generate transparency pixmap in that case ! */
564	check_our_parents ();
565	return;
566	}
567	#endif
568	#ifdef HAVE_AFTERIMAGE
569	bgPixmap.render_asim(this, NULL, TINT_LEAVE_SAME);
570	#endif
571	}
572
573	void
574	rxvt_term::set_bgPixmap (const char *file)
575	{	557	{
576	char *f;	558	char *f;
577		559
578	assert (file != NULL);	560	assert (file != NULL);
579		561
580	if (bgPixmap.pixmap != None)
581	{
582	XFreePixmap (dpy, bgPixmap.pixmap);
583	bgPixmap.pixmap = None;
584	}
585
586	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
587	if (*file != '\0')	562	if (*file != '\0')
588	{	563	{
589	#ifdef HAVE_AFTERIMAGE	564	# ifdef HAVE_AFTERIMAGE
590	if (asimman == NULL)	565	if (target->asimman == NULL)
591	asimman = create_generic_imageman(rs[Rs_path]);	566	target->asimman = create_generic_imageman(target->rs[Rs_path]);
592	if ((f = strchr (file, ';')) == NULL)	567	if ((f = strchr (file, ';')) == NULL)
593	bgPixmap.original_asim = get_asimage( asimman, file, 0xFFFFFFFF, 100 );	568	original_asim = get_asimage( target->asimman, file, 0xFFFFFFFF, 100 );
594	else	569	else
595	{	570	{
596	size_t len = f - file;	571	size_t len = f - file;
597	f = (char *)malloc (len + 1);	572	f = (char *)malloc (len + 1);
598	strncpy (f, file, len);	573	strncpy (f, file, len);
599	f[len] = '\0';	574	f[len] = '\0';
600	bgPixmap.original_asim = get_asimage( asimman, f, 0xFFFFFFFF, 100 );	575	original_asim = get_asimage( target->asimman, f, 0xFFFFFFFF, 100 );
601	free( f );	576	free( f );
602	}	577	}
		578	return (original_asim != NULL);
603	#endif	579	# endif
604	}	580	}
605	resize_pixmap (); /* TODO: temporary fix - should be done by the caller! */	581	return false;
606	}	582	}
607		583
608	#endif /* XPM_BACKGROUND */	584	# endif /* XPM_BACKGROUND */
		585
		586	# ifdef ENABLE_TRANSPARENCY
		587	bool
		588	bgPixmap_t::set_transparent ()
		589	{
		590	if (!(flags & isTransparent))
		591	{
		592	flags \|= isTransparent;
		593	return true;
		594	}
		595	}
		596
		597	bool
		598	bgPixmap_t::set_blur_radius (const char *geom)
		599	{
		600	int changed = 0;
		601	unsigned int hr, vr;
		602	int junk;
		603	int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
		604	if (!(geom_flags&WidthValue))
		605	hr = 1;
		606	if (!(geom_flags&HeightValue))
		607	vr = hr;
		608
		609	if (h_blurRadius != hr)
		610	{
		611	++changed;
		612	h_blurRadius = hr;
		613	}
		614	if (v_blurRadius != vr)
		615	{
		616	++changed;
		617	v_blurRadius = vr;
		618	}
		619	if (v_blurRadius == 0 && h_blurRadius == 0)
		620	flags &= ~blurNeeded;
		621	else
		622	flags \|= blurNeeded;
		623	return (changed>0);
		624	}
		625
		626	static inline unsigned long
		627	compute_tint_shade_flags (rxvt_color *tint, int shade)
		628	{
		629	unsigned long flags = 0;
		630
		631	if (shade > 0 && shade <100)
		632	flags \|= bgPixmap_t::tintNeeded;
		633	else if (tint)
		634	{
		635	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
		636	tint->get (c);
		637
		638	flags \|= bgPixmap_t::tintNeeded;
		639	if ((c.r > 0x000700 \|\| c.g > 0x000700 \|\| c.b > 0x000700)
		640	&& (c.r < 0x00f700 \|\| c.g < 0x00f700 \|\| c.b < 0x00f700))
		641	{
		642	flags \|= bgPixmap_t::tintNeeded;
		643	#define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 \|\| (cmp) >= 0x00f700)
		644	if (IS_COMPONENT_WHOLESOME (c.r)
		645	&& IS_COMPONENT_WHOLESOME (c.g)
		646	&& IS_COMPONENT_WHOLESOME (c.b))
		647	flags \|= bgPixmap_t::tintServerSide;
		648	#undef IS_COMPONENT_WHOLESOME
		649	}
		650	}
		651	return flags;
		652	}
		653
		654	bool
		655	bgPixmap_t::set_tint (rxvt_color &new_tint)
		656	{
		657	if (tint != new_tint)
		658	{
		659	unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
		660	tint = new_tint;
		661	flags = (flags & ~tintFlags) \| new_flags \| tintSet;
		662	return true;
		663	}
		664	return false;
		665	}
		666
		667	bool
		668	bgPixmap_t::unset_tint ()
		669	{
		670	unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
		671
		672	if (new_flags != (flags & tintFlags))
		673	{
		674	flags = (flags&~tintFlags)\|new_flags;
		675	return true;
		676	}
		677	return false;
		678	}
		679
		680	bool
		681	bgPixmap_t::set_shade (const char *shade_str)
		682	{
		683	int new_shade = (shade_str) ? atoi (shade_str) : 0;
		684
		685	if (new_shade == 100)
		686	new_shade = 0;
		687
		688	if (new_shade != shade)
		689	{
		690	unsigned long new_flags = compute_tint_shade_flags (&tint, new_shade);
		691	shade = new_shade;
		692	flags = (flags & ~tintFlags) \| new_flags;
		693	return true;
		694	}
		695	return false;
		696	}
		697
		698
		699	/* make_transparency_pixmap()
		700	* Builds a pixmap sized the same as terminal window, with depth same as the root window
		701	* that pixmap contains tiled portion of the root pixmap that is supposed to be covered by
		702	* our window.
		703	*/
		704	unsigned long
		705	bgPixmap_t::make_transparency_pixmap ()
		706	{
		707	unsigned long result = 0;
		708
		709	if (target == NULL)
		710	return 0;
		711
		712	/* root dimentions may change from call to call - but Display structure should
		713	* be always up-to-date, so let's use it :
		714	*/
		715	Window root = target->display->root;
		716	int screen = target->display->screen;
		717	Display *dpy = target->dpy;
		718	int root_width = DisplayWidth (dpy, screen);
		719	int root_height = DisplayHeight (dpy, screen);
		720	unsigned int root_pmap_width, root_pmap_height;
		721	int window_width = target->szHint.width;
		722	int window_height = target->szHint.height;
		723	int sx, sy;
		724	XGCValues gcv;
		725
		726	target->get_window_origin (sx, sy);
		727
		728	/* check if we are outside of the visible part of the virtual screen : */
		729	if (sx + window_width <= 0 \|\| sy + window_height <= 0
		730	\|\| sx >= root_width \|\| sy >= root_height)
		731	return 0;
		732
		733	if (root_pixmap != None)
		734	{/* we want to validate the pixmap and get it's size at the same time : */
		735	int junk;
		736	unsigned int ujunk;
		737	/* root pixmap may be bad - allow a error */
		738	target->allowedxerror = -1;
		739	if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk))
		740	root_pixmap = None;
		741	target->allowedxerror = 0;
		742	}
		743
		744	Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth);
		745	GC gc = NULL;
		746
		747	if (tiled_root_pmap == None) /* something really bad happened - abort */
		748	return 0;
		749
		750	if (root_pixmap == None)
		751	{ /* use tricks to obtain the root background image :*/
		752	/* we want to create Overrideredirect window overlapping out window
		753	with background type of Parent Relative and then grab it */
		754	XSetWindowAttributes attr;
		755	Window src;
		756	bool success = false;
		757
		758	attr.background_pixmap = ParentRelative;
		759	attr.backing_store = Always;
		760	attr.event_mask = ExposureMask;
		761	attr.override_redirect = True;
		762	src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
		763	CopyFromParent, CopyFromParent, CopyFromParent,
		764	CWBackPixmap\|CWBackingStore\|CWOverrideRedirect\|CWEventMask,
		765	&attr);
		766
		767	if (src != None)
		768	{
		769	XEvent event;
		770	int ev_count = 0;
		771	XGrabServer (dpy);
		772	XMapRaised (dpy, src);
		773	XSync (dpy, False);
		774	/* XSync should get window where it's properly exposed,
		775	* but to be on the safe side - let's check for the actuall event to arrive : */
		776	while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
		777	++ev_count;
		778	if (ev_count > 0);
		779	{ /* hooray! - we can grab the image! */
		780	gc = XCreateGC (dpy, root, 0, NULL);
		781	if (gc)
		782	{
		783	XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
		784	success = true;
		785	}
		786	}
		787	XDestroyWindow (dpy, src);
		788	XUngrabServer (dpy);
		789	//fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
		790	}
		791	if (!success)
		792	{
		793	XFreePixmap (dpy, tiled_root_pmap);
		794	tiled_root_pmap = None;
		795	}
		796	else
		797	result \|= transpPmapTiled;
		798	}
		799	else
		800	{/* strightforward pixmap copy */
		801	gcv.tile = root_pixmap;
		802	gcv.fill_style = FillTiled;
		803	while (sx < 0) sx += (int)window_width;
		804	while (sy < 0) sy += (int)window_height;
		805	gcv.ts_x_origin = -sx;
		806	gcv.ts_y_origin = -sy;
		807	gc = XCreateGC (dpy, root, GCFillStyle \| GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin, &gcv);
		808	if (gc)
		809	{
		810	XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
		811	result \|= transpPmapTiled;
		812	}
		813	}
		814
		815	if (tiled_root_pmap != None)
		816	{
		817	if (flags & tintNeeded)
		818	{
		819	if ((flags & tintServerSide)
		820	&& h_blurRadius <= 1 && v_blurRadius <= 1
		821	# ifdef HAVE_AFTERIMAGE
		822	&& original_asim == NULL
		823	# endif
		824	)
		825	{ /* In this case we can tint image server-side getting significant
		826	* performance improvements, as we eliminate XImage transfer
		827	*/
		828	gcv.foreground = Pixel (tint);
		829	gcv.function = GXand;
		830	gcv.fill_style = FillSolid;
		831	if (gc)
		832	XChangeGC (dpy, gc, GCFillStyle \| GCForeground \| GCFunction, &gcv);
		833	else
		834	gc = XCreateGC (dpy, root, GCFillStyle \| GCForeground \| GCFunction, &gcv);
		835	if (gc)
		836	{
		837	XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
		838	result \|= transpPmapTinted;
		839	}
		840	}
		841	}
		842	if (pixmap)
		843	XFreePixmap (dpy, pixmap);
		844	pixmap = tiled_root_pmap;
		845	pmap_width = window_width;
		846	pmap_height = window_height;
		847	pmap_depth = root_depth;
		848	}
		849
		850	if (gc)
		851	XFreeGC (dpy, gc);
		852
		853	return result;
		854	}
		855
		856	bool
		857	bgPixmap_t::set_root_pixmap ()
		858	{
		859	Pixmap new_root_pixmap = None;
		860
		861	new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
		862	if (new_root_pixmap == None)
		863	new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
		864
		865	if (new_root_pixmap != root_pixmap)
		866	{
		867	root_pixmap = new_root_pixmap;
		868	return true;
		869	}
		870	return false;
		871	}
		872	# endif /* ENABLE_TRANSPARENCY */
		873
		874	# ifndef HAVE_AFTERIMAGE
		875	static void ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm);
		876	#endif
		877
		878
		879	bool
		880	bgPixmap_t::render ()
		881	{
		882	unsigned long background_flags = 0;
		883
		884	if (target == NULL)
		885	return false;
		886
		887	invalidate();
		888	# ifdef ENABLE_TRANSPARENCY
		889	if (flags & isTransparent)
		890	{
		891	/* we need to re-generate transparency pixmap in that case ! */
		892	background_flags = make_transparency_pixmap ();
		893	if (background_flags == 0)
		894	return false;
		895	else if ((background_flags & transpTransformations) == (flags & transpTransformations)
		896	&& pmap_depth == target->depth)
		897	flags = flags & ~isInvalid;
		898	}
		899	# endif
		900
		901	XImage *result = NULL;
		902	# ifdef HAVE_AFTERIMAGE
		903	if (original_asim
		904	\|\| (background_flags & transpTransformations) != (flags & transpTransformations))
		905	{
		906	ASImage *background = NULL;
		907	ARGB32 as_tint = TINT_LEAVE_SAME;
		908	if (background_flags)
		909	background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
		910
		911	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
		912	{
		913	ShadingInfo as_shade;
		914	as_shade.shading = (shade == 0) ? 100 : shade;
		915
		916	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
		917	if (flags & tintSet)
		918	tint.get (c);
		919	as_shade.tintColor.red = c.r;
		920	as_shade.tintColor.green = c.g;
		921	as_shade.tintColor.blue = c.b;
		922
		923	as_tint = shading2tint32 (&as_shade);
		924	}
		925
		926	if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
		927	{
		928	ASImage* tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
		929	(original_asim == NULL \|\| tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
		930	100, ASIMAGE_QUALITY_DEFAULT);
		931	if (tmp)
		932	{
		933	destroy_asimage (&background);
		934	background = tmp;
		935	}
		936	}
		937
		938	if (render_asim (background, as_tint))
		939	flags = flags & ~isInvalid;
		940	if (background)
		941	destroy_asimage (&background);
		942	}
		943	else if (background_flags && pmap_depth != target->depth)
		944	{
		945	result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
		946	}
		947	# else /* our own client-side tinting */
		948	if (background_flags && (flags & isInvalid))
		949	{
		950	result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
		951	if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
		952	{
		953	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
		954	if (flags & tintSet)
		955	tint.get (c);
		956	ShadeXImage (target, result, shade, c.r, c.g, c.b);
		957	}
		958	}
		959	# endif
		960	if (result != NULL)
		961	{
		962	GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
		963	if (gc)
		964	{
		965	if (pmap_depth != target->depth && pixmap != None)
		966	{
		967	XFreePixmap (target->dpy, pixmap);
		968	pixmap = None;
		969	}
		970	if (pixmap == None)
		971	{
		972	pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
		973	pmap_width = result->width;
		974	pmap_height = result->height;
		975	pmap_depth = target->depth;
		976	}
		977	XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
		978	XFreeGC (target->dpy, gc);
		979	flags = flags & ~isInvalid;
		980	}
		981	XDestroyImage (result);
		982	}
		983
		984	if (flags & isInvalid)
		985	{
		986	if (pixmap != None)
		987	{
		988	XFreePixmap (target->dpy, pixmap);
		989	pixmap = None;
		990	}
		991	// TODO : we need to get rid of that garbadge :
		992	target->am_transparent = target->am_pixmap_trans = 0;
		993	}
		994	else
		995	target->am_transparent = target->am_pixmap_trans = 1;
		996
		997	apply ();
		998
		999	return true;
		1000	}
		1001
		1002	bool
		1003	bgPixmap_t::set_target (rxvt_term *new_target)
		1004	{
		1005	if (new_target)
		1006	if (target != new_target)
		1007	{
		1008	target = new_target;
		1009	# ifdef ENABLE_TRANSPARENCY
		1010	root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
		1011	# endif
		1012	return true;
		1013	}
		1014	return false;
		1015	}
		1016
		1017	void
		1018	bgPixmap_t::apply()
		1019	{
		1020	if (target)
		1021	{
		1022	if (pixmap != None)
		1023	{ /* set target's background to pixmap */
		1024	# ifdef ENABLE_TRANSPARENCY
		1025	if (flags & isTransparent)
		1026	{
		1027	XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
		1028	XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
		1029	# if HAVE_SCROLLBARS
		1030	if (target->scrollBar.win)
		1031	XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
		1032	# endif
		1033	}
		1034	else
		1035	# endif
		1036	{
		1037	/* force old pixmap dereference in case it was transparent before :*/
		1038	XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
		1039	XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
		1040	/* do we also need to set scrollbar's background here ? */
		1041	# if HAVE_SCROLLBARS
		1042	if (target->scrollBar.win)
		1043	XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
		1044	# endif
		1045	}
		1046	}
		1047	else
		1048	{ /* set target background to a pixel */
		1049	XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
		1050	XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
		1051	/* do we also need to set scrollbar's background here ? */
		1052	# if HAVE_SCROLLBARS
		1053	if (target->scrollBar.win)
		1054	XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
		1055	# endif
		1056	}
		1057	/* don't want Expose on the parent */
		1058	XClearArea (target->dpy, target->parent[0], 0, 0, 0, 0, False);
		1059	/* do want Expose on the vt */
		1060	XClearArea (target->dpy, target->parent[0], 0, 0, 0, 0, True);
		1061	#if HAVE_SCROLLBARS
		1062	if (target->scrollBar.win)
		1063	{
		1064	target->scrollBar.setIdle ();
		1065	target->scrollbar_show (0);
		1066	}
		1067	#endif
		1068	/* Is that really neccessary? we did a XClearArea to generate Expose events alreday ! */
		1069	target->want_refresh = target->want_full_refresh = 1;
		1070	/* TODO: why do we need a flush here ??? It causes segfault on resize ! */
		1071	// target->flush ();
		1072	}
		1073	}
609	#endif /* HAVE_BG_PIXMAP */	1074	#endif /* HAVE_BG_PIXMAP */
		1075
		1076
		1077	void
		1078	rxvt_term::get_window_origin (int &x, int &y)
		1079	{
		1080	Window cr;
		1081	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
		1082	/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
		1083	}
		1084
		1085	Pixmap
		1086	rxvt_term::get_pixmap_property (int prop_id)
		1087	{
		1088	if (prop_id > 0 && prop_id < NUM_XA)
		1089	if (xa[prop_id])
		1090	{
		1091	int aformat, rootdepth;
		1092	unsigned long nitems, bytes_after;
		1093	Atom atype;
		1094	unsigned char *prop = NULL;
		1095	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
		1096	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
		1097	&nitems, &bytes_after, &prop);
		1098	if (result == Success && prop && atype == XA_PIXMAP)
		1099	{
		1100	return (Pixmap )prop;
		1101	}
		1102	}
		1103	return None;
		1104	}
		1105
610		1106
611	#ifdef ENABLE_TRANSPARENCY	1107	#ifdef ENABLE_TRANSPARENCY
612	#ifndef HAVE_AFTERIMAGE	1108	#ifndef HAVE_AFTERIMAGE
613	/* taken from aterm-0.4.2 */	1109	/* taken from aterm-0.4.2 */
614		1110
…		…
624	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	1120	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
625	int i;	1121	int i;
626		1122
627	Visual *visual = term->visual;	1123	Visual *visual = term->visual;
628		1124
629	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;	1125	if (visual->c_class != TrueColor \|\| srcImage->format != ZPixmap) return ;
630		1126
		1127	if (shade == 0)
		1128	shade = 100;
		1129
631	/* for convenience */	1130	/* for convenience */
632	mask_r = visual->red_mask;	1131	mask_r = visual->red_mask;
633	mask_g = visual->green_mask;	1132	mask_g = visual->green_mask;
634	mask_b = visual->blue_mask;	1133	mask_b = visual->blue_mask;
635		1134
…		…
844	/*	1343	/*
845	* Check our parents are still who we think they are.	1344	* Check our parents are still who we think they are.
846	* Do transparency updates if required	1345	* Do transparency updates if required
847	*/	1346	*/
848	int	1347	int
849	rxvt_term::check_our_parents ()	1348	rxvt_term::update_background ()
850	{	1349	{
851	check_our_parents_ev.stop ();	1350	bgPixmap.invalidate();
852	check_our_parents_ev.start (NOW + .1);	1351	/* no chance of real time refresh if we are blurring ! */
		1352	if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
		1353	bgPixmap.render();
		1354	else
		1355	{
		1356	update_background_ev.stop ();
		1357	if (!bgPixmap.need_client_side_rendering())
		1358	update_background_ev.start (NOW + .05);
		1359	else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
		1360	update_background_ev.start (NOW + .2); /* very slow !!! */
		1361	else
		1362	update_background_ev.start (NOW + .07);
		1363	}
853	return 0;	1364	return 0;
854	}	1365	}
855		1366
		1367	void
		1368	rxvt_term::update_background_cb (time_watcher &w)
		1369	{
		1370	bgPixmap.render ();
		1371	}
		1372	#endif /* HAVE_BG_PIXMAP */
		1373
		1374
		1375	#if 0 /* replaced by a bgPixmap_t::render() - leve here temporarily for reference */
856	void	1376	void
857	rxvt_term::check_our_parents_cb (time_watcher &w)	1377	rxvt_term::check_our_parents_cb (time_watcher &w)
858	{	1378	{
		1379
859	int i, pchanged, aformat, rootdepth;	1380	int i, aformat, rootdepth;
860	unsigned long nitems, bytes_after;	1381	unsigned long nitems, bytes_after;
861	Atom atype;	1382	Atom atype;
862	unsigned char *prop = NULL;	1383	unsigned char *prop = NULL;
863	Window root, oldp, *list;	1384	Window root, oldp, *list;
864	Pixmap rootpixmap = None;	1385	Pixmap rootpixmap = None;
865	XWindowAttributes wattr, wrootattr;	1386	XWindowAttributes wattr, wrootattr;
866	int sx, sy;	1387	int sx, sy;
867	Window cr;	1388	Window cr;
868	unsigned int rootpixmap_w = 0, rootpixmap_h = 0;	1389	unsigned int rootpixmap_w = 0, rootpixmap_h = 0;
869		1390
870	pchanged = 0;
871
872	if (!option (Opt_transparent))	1391	if (!option (Opt_transparent))
873	return /pchanged/; /* Don't try any more */	1392	return; /* Don't try any more */
874
875	#if 0	1393	#if 0
876	struct timeval stv;	1394	struct timeval stv;
877	gettimeofday (&stv,NULL);	1395	gettimeofday (&stv,NULL);
878	#define PRINT_BACKGROUND_OP_TIME do{ struct timeval tv;gettimeofday (&tv,NULL); tv.tv_sec-= stv.tv_sec;\	1396	#define PRINT_BACKGROUND_OP_TIME do{ struct timeval tv;gettimeofday (&tv,NULL); tv.tv_sec-= stv.tv_sec;\
879	fprintf (stderr,"%d: elapsed %ld usec\n",__LINE__,\	1397	fprintf (stderr,"%d: elapsed %ld usec\n",__LINE__,\
…		…
890		1408
891	if (rootdepth != wattr.depth)	1409	if (rootdepth != wattr.depth)
892	{	1410	{
893	if (am_transparent)	1411	if (am_transparent)
894	{	1412	{
895	pchanged = 1;
896	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);	1413	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
897	am_transparent = am_pixmap_trans = 0;	1414	am_transparent = am_pixmap_trans = 0;
898	}	1415	}
899		1416
900	return /pchanged/; /* Don't try any more */	1417	return; /* Don't try any more */
901	}	1418	}
902		1419
903	/* Get all X ops out of the queue so that our information is up-to-date. */	1420	/* Get all X ops out of the queue so that our information is up-to-date. */
904	XSync (dpy, False);	1421	XSync (dpy, False);
905		1422
…		…
963	whole_tint = (IS_COMPONENT_WHOLESOME(c.r)	1480	whole_tint = (IS_COMPONENT_WHOLESOME(c.r)
964	&& IS_COMPONENT_WHOLESOME(c.g)	1481	&& IS_COMPONENT_WHOLESOME(c.g)
965	&& IS_COMPONENT_WHOLESOME(c.b));	1482	&& IS_COMPONENT_WHOLESOME(c.b));
966	no_tint = (c.r >= 0x00f700 && c.g >= 0x00f700 && c.b >= 0x00f700);	1483	no_tint = (c.r >= 0x00f700 && c.g >= 0x00f700 && c.b >= 0x00f700);
967	#undef IS_COMPONENT_WHOLESOME	1484	#undef IS_COMPONENT_WHOLESOME
968	/* theer are no performance advantages to reusing same pixmap */
969	if (bgPixmap.pixmap != None)
970	XFreePixmap (dpy, bgPixmap.pixmap);
971	bgPixmap.pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, rootdepth);
972	bgPixmap.pmap_width = szHint.width;
973	bgPixmap.pmap_height = szHint.height;
974	bgPixmap.pmap_depth = rootdepth;
975		1485
976	#if 0 /* TODO : identify cases where this will be detrimental to performance : */	1486	bgPixmap.make_transparency_pixmap();
977	/* we want to tile root pixmap into our own pixmap in this cases :
978	* 1) rootpixmap does not cover our window entirely
979	* 2) whole_tint - we can use server-side tinting or tinting disabled
980	*/
981	if ( whole_tint \|\| no_tint \|\| pmap_w < sx + szHint.width \|\| pmap_h < sy + szHint.height)
982	{
983	}
984	#endif
985	gcvalue.tile = rootpixmap;
986	gcvalue.fill_style = FillTiled;
987	gcvalue.ts_x_origin = -sx;
988	gcvalue.ts_y_origin = -sy;
989	gc = XCreateGC (dpy, rootpixmap, GCFillStyle \| GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin, &gcvalue);
990	XFillRectangle (dpy, bgPixmap.pixmap, gc, 0, 0, szHint.width, szHint.height);
991		1487
992	if (whole_tint && !no_tint)	1488	if (whole_tint && !no_tint)
993	{	1489	{
994	/* In this case we can tint image server-side getting significant
995	* performance improvements, as we eliminate XImage transfer
996	*/
997	gcvalue.foreground = Pixel (pix_colors_focused [Color_tint]);
998	gcvalue.function = GXand;
999	gcvalue.fill_style = FillSolid;
1000	XChangeGC (dpy, gc, GCFillStyle \| GCForeground \| GCFunction, &gcvalue);
1001	XFillRectangle (dpy, bgPixmap.pixmap, gc, 0, 0, szHint.width, szHint.height);
1002	}	1490	}
1003	success = True;	1491	success = True;
1004	#ifdef HAVE_AFTERIMAGE	1492	#ifdef HAVE_AFTERIMAGE
1005	if (rs[Rs_blurradius] \|\| bgPixmap.original_asim != NULL \|\| (!whole_tint && (!no_tint \|\| shade !=100)))	1493	if (rs[Rs_blurradius] \|\| bgPixmap.original_asim != NULL \|\| (!whole_tint && (!no_tint \|\| shade !=100)))
1006	{	1494	{
…		…
1039	back_im = tmp;	1527	back_im = tmp;
1040	}	1528	}
1041	}	1529	}
1042	/* TODO: temporary fix - redo the logic, so that same function can do both	1530	/* TODO: temporary fix - redo the logic, so that same function can do both
1043	transparency and non-transparency */	1531	transparency and non-transparency */
1044	bgPixmap.render_asim (this, back_im, tint);	1532	bgPixmap.render_asim (back_im, tint);
1045	destroy_asimage (&back_im);	1533	destroy_asimage (&back_im);
1046		1534
1047	} /* back_im != NULL */	1535	} /* back_im != NULL */
1048	else	1536	else
1049	success = False;	1537	success = False;
…		…
1068	#endif /* HAVE_AFTERIMAGE */	1556	#endif /* HAVE_AFTERIMAGE */
1069	PRINT_BACKGROUND_OP_TIME;	1557	PRINT_BACKGROUND_OP_TIME;
1070		1558
1071	if (gc != NULL)	1559	if (gc != NULL)
1072	XFreeGC (dpy, gc);	1560	XFreeGC (dpy, gc);
1073		1561
		1562	bgPixmap.apply();
1074	if (!success)	1563	if (!success)
1075	{
1076	if (am_transparent && am_pixmap_trans)
1077	{
1078	pchanged = 1;
1079	if (bgPixmap.pixmap != None)
1080	{
1081	XFreePixmap (dpy, bgPixmap.pixmap);
1082	bgPixmap.pixmap = None;
1083	}
1084	}
1085
1086	am_pixmap_trans = 0;	1564	am_pixmap_trans = 0;
1087	}
1088	else	1565	else
1089	{	1566	{
1090	XSetWindowBackgroundPixmap (dpy, parent[0], bgPixmap.pixmap);
1091	XClearWindow (dpy, parent[0]);
1092
1093	if (!am_transparent \|\| !am_pixmap_trans)
1094	pchanged = 1;
1095
1096	am_transparent = am_pixmap_trans = 1;	1567	am_transparent = am_pixmap_trans = 1;
1097	}	1568	}
1098	} /* rootpixmap != None */	1569	} /* rootpixmap != None */
1099		1570
1100	if (am_pixmap_trans)	1571	if (am_pixmap_trans)
1101	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);	1572	{
1102	else
1103	return;
1104
1105	if (scrollBar.win)	1573	if (scrollBar.win)
1106	{	1574	{
1107	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
1108	scrollBar.setIdle ();	1575	scrollBar.setIdle ();
1109	scrollbar_show (0);	1576	scrollbar_show (0);
1110	}	1577	}
1111		1578
1112	if (am_transparent)	1579	if (am_transparent)
1113	{	1580	{
1114	want_refresh = want_full_refresh = 1;	1581	want_refresh = want_full_refresh = 1;
1115	if (am_pixmap_trans)	1582	if (am_pixmap_trans)
1116	flush ();	1583	flush ();
		1584	}
1117	}	1585	}
1118
1119	// return pchanged;
1120	}	1586	}
1121	#endif	1587	#endif

Diff Legend

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

Comparing rxvt-unicode/src/xpm.C (file contents): Revision 1.62 by sasha, Tue Aug 7 22:43:33 2007 UTC vs. Revision 1.70 by sasha, Thu Aug 16 21:26:20 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/xpm.C (file contents):
Revision 1.62 by sasha, Tue Aug 7 22:43:33 2007 UTC vs.
Revision 1.70 by sasha, Thu Aug 16 21:26:20 2007 UTC