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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.114 by sf-exg, Wed Nov 10 13:15:08 2010 UTC vs.
Revision 1.121 by sf-exg, Fri Nov 19 23:29:30 2010 UTC

…		…
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
		34	#define FilterConvolution "convolution"
		35	#endif
		36
33	#define DO_TIMING_TEST 0	37	#define DO_TIMING_TEST 0
34		38
35	#if DO_TIMING_TEST	39	#if DO_TIMING_TEST
36	# include <sys/time.h>	40	# include <sys/time.h>
37	#define TIMING_TEST_START(id) \	41	#define TIMING_TEST_START(id) \
…		…
62	*	66	*
63	* WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.	67	* WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
64	* W and H are percentages of the terminal window size.	68	* W and H are percentages of the terminal window size.
65	* X and Y are also percentages; e.g., +50+50 centers	69	* X and Y are also percentages; e.g., +50+50 centers
66	* the image in the window.	70	* the image in the window.
67	* WxH+X Assumes Y == X
68	* WxH Assumes Y == X == 50 (centers the image)
69	* W+X+Y Assumes H == W
70	* W+X Assumes H == W and Y == X
71	* W Assumes H == W and Y == X == 50
72	*
73	* Adjusting position only :
74	* =+X+Y Set position to X% by Y% (absolute).
75	* =+X Set position to X% by X%.
76	* +X+Y Adjust position horizontally X% and vertically Y%
77	* from current position (relative).
78	* +X Adjust position horizontally X% and vertically X%
79	* from current position.
80	*
81	* Adjusting scale only :
82	* Wx0 Multiply horizontal scaling factor by W%
83	* 0xH Multiply vertical scaling factor by H%
84	* 0x0 No scaling (show image at normal size).
85	*	71	*
86	* Pixmap Operations : (should be prepended by a colon)	72	* Pixmap Operations : (should be prepended by a colon)
87	* tile Tile image. Scaling/position modifiers above will affect	73	* tile Tile image. Scaling/position modifiers above will affect
88	* the tile size and origin.	74	* the tile size and origin.
89	* propscale When scaling, scale proportionally. That is, maintain the	75	* propscale When scaling, scale proportionally. That is, maintain the
…		…
117	#endif	103	#endif
118	flags = 0;	104	flags = 0;
119	pixmap = None;	105	pixmap = None;
120	valid_since = invalid_since = 0;	106	valid_since = invalid_since = 0;
121	target = 0;	107	target = 0;
		108	target_x = target_y = 0;
122	}	109	}
123		110
124	void	111	void
125	bgPixmap_t::destroy ()	112	bgPixmap_t::destroy ()
126	{	113	{
…		…
137	if (pixmap && target)	124	if (pixmap && target)
138	XFreePixmap (target->dpy, pixmap);	125	XFreePixmap (target->dpy, pixmap);
139	}	126	}
140		127
141	bool	128	bool
		129	bgPixmap_t::set_position (int x, int y)
		130	{
		131
		132	if (target_x != x
		133	\|\| target_y != y)
		134	{
		135	target_x = x;
		136	target_y = y;
		137	return true;
		138	}
		139	return false;
		140	}
		141
		142	bool
142	bgPixmap_t::window_size_sensitive ()	143	bgPixmap_t::window_size_sensitive ()
143	{	144	{
144	# ifdef ENABLE_TRANSPARENCY	145	# ifdef ENABLE_TRANSPARENCY
145	if (flags & isTransparent)	146	if (flags & isTransparent)
146	return true;	147	return true;
…		…
172	return true;	173	return true;
173	}	174	}
174	# endif	175	# endif
175		176
176	return false;	177	return false;
177	};	178	}
178		179
179	bool bgPixmap_t::need_client_side_rendering ()	180	bool bgPixmap_t::need_client_side_rendering ()
180	{	181	{
181	# ifdef HAVE_AFTERIMAGE	182	# ifdef HAVE_AFTERIMAGE
182	if (original_asim)	183	if (original_asim)
…		…
252	dst_size = target_size - dst_pos;	253	dst_size = target_size - dst_pos;
253	return src_pos;	254	return src_pos;
254	}	255	}
255		256
256	bool	257	bool
257	bgPixmap_t::set_geometry (const char *geom)	258	bgPixmap_t::set_geometry (const char *geom, bool update)
258	{	259	{
259	bool changed = false;	260	bool changed = false;
260	int geom_flags = 0;	261	int geom_flags = 0;
261	int x = 0, y = 0;	262	int x = 0, y = 0;
262	unsigned int w = 0, h = 0;	263	unsigned int w = 0, h = 0;
263	unsigned int n;	264	unsigned int n;
264	unsigned long new_flags = (flags & (~geometryFlags));	265	unsigned long new_flags = (flags & (~geometryFlags));
265	const char *p;	266	const char *ops;
266	# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */	267	# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
267		268
268	if (geom == NULL)	269	if (geom == NULL)
269	return false;	270	return false;
270		271
271	char str[MAXLEN_GEOM];	272	char str[MAXLEN_GEOM];
272		273
273	while (isspace(*geom)) ++geom;
274	if ((p = strchr (geom, ';')) == NULL)
275	p = strchr (geom, '\0');	274	ops = strchr (geom, ':');
276		275	if (ops == NULL)
		276	n = strlen (geom);
		277	else
277	n = (p - geom);	278	n = ops - geom;
		279
278	if (n < MAXLEN_GEOM)	280	if (n < MAXLEN_GEOM)
279	{	281	{
280	char *ops;
281	new_flags \|= geometrySet;
282
283	memcpy (str, geom, n);	282	memcpy (str, geom, n);
284	str[n] = '\0';	283	str[n] = '\0';
		284	rxvt_strtrim (str);
		285
285	if (str[0] == ':')	286	if (str[0])
286	ops = &str[0];
287	else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
288	ops = &str[0];
289	else
290	{
291	char *tmp;
292	ops = strchr (str, ':');
293	if (ops != NULL)
294	{
295	for (tmp = ops-1; tmp >= str && isspace(*tmp); --tmp);
296	*(++tmp) = '\0';
297	if (ops == tmp) ++ops;
298	}
299	}
300
301	if (ops > str \|\| ops == NULL)
302	{	287	{
303	/* we have geometry string - let's handle it prior to applying ops */	288	/* we have geometry string - let's handle it prior to applying ops */
304	geom_flags = XParseGeometry (str, &x, &y, &w, &h);	289	geom_flags = XParseGeometry (str, &x, &y, &w, &h);
305
306	if ((geom_flags & XValue) && !(geom_flags & YValue))
307	{
308	y = x;
309	geom_flags \|= YValue;
310	}
311
312	if (flags & geometrySet)
313	{
314	/* new geometry is an adjustment to the old one ! */
315	if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
316	{
317	if (w == 0 && h != 0)
318	{
319	w = h_scale;
320	h = (v_scale * h) / 100;
321	}
322	else if (h == 0 && w != 0)
323	{
324	w = (h_scale * w) / 100;
325	h = v_scale;
326	}
327	}
328	if (geom_flags & XValue)
329	{
330	if (str[0] != '=')
331	{
332	y += v_align;
333	x += h_align;
334	}
335	}
336	}
337	else /* setting up geometry from scratch */
338	{
339	if (!(geom_flags & XValue))
340	{
341	/* use default geometry - centered */
342	x = y = defaultAlign;
343	}
344	else if (!(geom_flags & YValue))
345	y = x;
346
347	if ((geom_flags & (WidthValue\|HeightValue)) == 0)
348	{
349	/* use default geometry - scaled */
350	w = h = defaultScale;
351	}
352	else if (geom_flags & WidthValue)
353	{
354	if (!(geom_flags & HeightValue))
355	h = w;
356	}
357	else
358	w = h;
359	}
360	} /* done parsing geometry string */	290	} /* done parsing geometry string */
361	else if (!(flags & geometrySet))	291
		292	if (!update)
362	{	293	{
363	/* default geometry - scaled and centered */	294	if (!(geom_flags & XValue))
364	x = y = defaultAlign;	295	x = y = defaultAlign;
		296	else if (!(geom_flags & YValue))
		297	y = x;
		298
		299	if (!(geom_flags & (WidthValue\|HeightValue)))
365	w = h = defaultScale;	300	w = h = defaultScale;
366	}	301	else if (!(geom_flags & HeightValue))
		302	h = w;
		303	else if (!(geom_flags & WidthValue))
		304	w = h;
367		305
368	if (!(flags & geometrySet))
369	geom_flags \|= WidthValue\|HeightValue\|XValue\|YValue;	306	geom_flags \|= WidthValue\|HeightValue\|XValue\|YValue;
		307	}
370		308
371	if (ops)	309	if (ops)
372	{	310	{
373	while (*ops)	311	while (*ops)
374	{	312	{
…		…
460	if (!w) w = image_width;	398	if (!w) w = image_width;
461	if (!h) h = image_height;	399	if (!h) h = image_height;
462		400
463	if (flags & rootAlign)	401	if (flags & rootAlign)
464	{	402	{
465	target->get_window_origin (x, y);
466	x = -x;	403	x = -target_x;
467	y = -y;	404	y = -target_y;
468	}	405	}
469	else	406	else
470	{	407	{
471	x = make_align_position (h_align, target_width, w);	408	x = make_align_position (h_align, target_width, w);
472	y = make_align_position (v_align, target_height, h);	409	y = make_align_position (v_align, target_height, h);
…		…
666	if (result)	603	if (result)
667	{	604	{
668	XGCValues gcv;	605	XGCValues gcv;
669	GC gc;	606	GC gc;
670		607
671	if (pixmap)
672	{
673	if (pmap_width != new_pmap_width
674	\|\| pmap_height != new_pmap_height
675	\|\| pmap_depth != target->depth)
676	{
677	XFreePixmap (target->dpy, pixmap);
678	pixmap = None;
679	}
680	}
681
682	/* create Pixmap */	608	/* create Pixmap */
683	if (pixmap == None)	609	if (pixmap == None
		610	\|\| pmap_width != new_pmap_width
		611	\|\| pmap_height != new_pmap_height
		612	\|\| pmap_depth != target->depth)
684	{	613	{
		614	if (pixmap)
		615	XFreePixmap (target->dpy, pixmap);
685	pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);	616	pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
686	pmap_width = new_pmap_width;	617	pmap_width = new_pmap_width;
687	pmap_height = new_pmap_height;	618	pmap_height = new_pmap_height;
688	pmap_depth = target->depth;	619	pmap_depth = target->depth;
689	}	620	}
…		…
797	new_pmap_width = min (image_width, target_width);	728	new_pmap_width = min (image_width, target_width);
798	new_pmap_height = min (image_height, target_height);	729	new_pmap_height = min (image_height, target_height);
799	}	730	}
800	}	731	}
801		732
802	if (pixmap)
803	{
804	if (pmap_width != new_pmap_width
805	\|\| pmap_height != new_pmap_height
806	\|\| pmap_depth != target->depth)
807	{
808	XFreePixmap (target->dpy, pixmap);
809	pixmap = None;
810	}
811	}
812
813	if (pixmap == None)	733	if (pixmap == None
		734	\|\| pmap_width != new_pmap_width
		735	\|\| pmap_height != new_pmap_height
		736	\|\| pmap_depth != target->depth)
814	{	737	{
		738	if (pixmap)
		739	XFreePixmap (target->dpy, pixmap);
815	pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);	740	pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
816	pmap_width = new_pmap_width;	741	pmap_width = new_pmap_width;
817	pmap_height = new_pmap_height;	742	pmap_height = new_pmap_height;
818	pmap_depth = target->depth;	743	pmap_depth = target->depth;
819	}	744	}
…		…
1239		1164
1240	if (mask_pic && overlay_pic && back_pic)	1165	if (mask_pic && overlay_pic && back_pic)
1241	{	1166	{
1242	XRenderColor mask_c;	1167	XRenderColor mask_c;
1243		1168
1244	memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));	1169	mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0;
1245	mask_c.alpha = 0xffff;	1170	mask_c.alpha = 0xffff;
1246	XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);	1171	XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1247		1172
1248	mask_c.alpha = 0;	1173	mask_c.alpha = 0;
1249	mask_c.red = 0xffff - c.r;	1174	mask_c.red = 0xffff - c.r;
…		…
1289	int window_height = target->szHint.height;	1214	int window_height = target->szHint.height;
1290	int sx, sy;	1215	int sx, sy;
1291	XGCValues gcv;	1216	XGCValues gcv;
1292	GC gc;	1217	GC gc;
1293		1218
1294	target->get_window_origin (sx, sy);	1219	sx = target_x;
		1220	sy = target_y;
1295		1221
1296	/* check if we are outside of the visible part of the virtual screen : */	1222	/* check if we are outside of the visible part of the virtual screen : */
1297	if (sx + window_width <= 0 \|\| sy + window_height <= 0	1223	if (sx + window_width <= 0 \|\| sy + window_height <= 0
1298	\|\| sx >= root_width \|\| sy >= root_height)	1224	\|\| sx >= root_width \|\| sy >= root_height)
1299	return 0;	1225	return 0;

Diff Legend

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

Comparing rxvt-unicode/src/background.C (file contents): Revision 1.114 by sf-exg, Wed Nov 10 13:15:08 2010 UTC vs. Revision 1.121 by sf-exg, Fri Nov 19 23:29:30 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.114 by sf-exg, Wed Nov 10 13:15:08 2010 UTC vs.
Revision 1.121 by sf-exg, Fri Nov 19 23:29:30 2010 UTC