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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.205 by sf-exg, Wed Apr 11 10:06:45 2012 UTC vs.
Revision 1.219 by sf-exg, Thu May 24 16:17:33 2012 UTC

…		…
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-2008 Marc Lehmann <schmorp@schmorp.de>	6	* Copyright (c) 2005-2008 Marc Lehmann <schmorp@schmorp.de>
7	* Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net>	7	* Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net>
8	* Copyright (c) 2010 Emanuele Giaquinta <e.giaquinta@glauco.it>	8	* Copyright (c) 2010-2012 Emanuele Giaquinta <e.giaquinta@glauco.it>
9	*	9	*
10	* This program is free software; you can redistribute it and/or modify	10	* This program is free software; you can redistribute it and/or modify
11	* it under the terms of the GNU General Public License as published by	11	* it under the terms of the GNU General Public License as published by
12	* the Free Software Foundation; either version 2 of the License, or	12	* the Free Software Foundation; either version 2 of the License, or
13	* (at your option) any later version.	13	* (at your option) any later version.
…		…
58	# endif	58	# endif
59		59
60	void	60	void
61	rxvt_term::bg_destroy ()	61	rxvt_term::bg_destroy ()
62	{	62	{
63	#ifdef HAVE_PIXBUF
64	if (pixbuf)
65	g_object_unref (pixbuf);
66	#endif
67
68	if (bg_pixmap)	63	if (bg_pixmap)
69	XFreePixmap (dpy, bg_pixmap);	64	XFreePixmap (dpy, bg_pixmap);
70	}	65	}
71		66
72	bool	67	bool
…		…
90	if (bg_flags & BG_IS_TRANSPARENT)	85	if (bg_flags & BG_IS_TRANSPARENT)
91	return true;	86	return true;
92	# endif	87	# endif
93		88
94	# ifdef BG_IMAGE_FROM_FILE	89	# ifdef BG_IMAGE_FROM_FILE
95	if (bg_flags & BG_IS_FROM_FILE)	90	if (bg_image.flags & IM_IS_SET)
96	{	91	{
97	if (bg_flags & BG_IS_SIZE_SENSITIVE)	92	if ((bg_image.flags & IM_IS_SIZE_SENSITIVE)
		93	\|\| bg_image.width () > szHint.width
		94	\|\| bg_image.height () > szHint.height)
98	return true;	95	return true;
99	}	96	}
100	# endif	97	# endif
101		98
102	return false;	99	return false;
…		…
109	if (bg_flags & BG_IS_TRANSPARENT)	106	if (bg_flags & BG_IS_TRANSPARENT)
110	return true;	107	return true;
111	# endif	108	# endif
112		109
113	# ifdef BG_IMAGE_FROM_FILE	110	# ifdef BG_IMAGE_FROM_FILE
114	if (bg_flags & BG_IS_FROM_FILE)	111	if (bg_image.flags & IM_IS_SET)
115	{	112	{
116	if (bg_flags & BG_ROOT_ALIGN)	113	if (bg_image.flags & IM_ROOT_ALIGN)
117	return true;	114	return true;
118	}	115	}
119	# endif	116	# endif
120		117
121	return false;	118	return false;
…		…
123		120
124	# ifdef BG_IMAGE_FROM_FILE	121	# ifdef BG_IMAGE_FROM_FILE
125	static inline int	122	static inline int
126	make_align_position (int align, int window_size, int image_size)	123	make_align_position (int align, int window_size, int image_size)
127	{	124	{
128	int diff = window_size - image_size;
129	int smaller = min (image_size, window_size);
130
131	if (align >= 0 && align <= 100)	125	if (align >= 0 && align <= 100)
132	return diff * align / 100;	126	return lerp (0, window_size - image_size, align);
133	else if (align > 100)	127	else if (align > 100)
134	return (align - 100) * smaller / 100 + window_size - smaller;	128	return lerp (window_size - image_size, window_size, align - 100);
135	else	129	else
136	return (align + 100) * smaller / 100 - image_size;	130	return lerp (-image_size, 0, align + 100);
137	}	131	}
138		132
139	static inline int	133	static inline int
140	make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)	134	make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
141	{	135	{
…		…
151		145
152	min_it (dst_size, target_size - dst_pos);	146	min_it (dst_size, target_size - dst_pos);
153	return src_pos;	147	return src_pos;
154	}	148	}
155		149
		150	static void
		151	parse_style (const char *style, int &x, int &y, unsigned int &w, unsigned int &h, uint8_t &flags)
		152	{
		153	if (!strcasecmp (style, "tiled"))
		154	{
		155	flags = IM_TILE;
		156	w = h = noScale;
		157	x = y = 0;
		158	}
		159	else if (!strcasecmp (style, "aspect-stretched"))
		160	{
		161	flags = IM_KEEP_ASPECT;
		162	w = h = windowScale;
		163	x = y = centerAlign;
		164	}
		165	else if (!strcasecmp (style, "stretched"))
		166	{
		167	flags = 0;
		168	w = h = windowScale;
		169	x = y = centerAlign;
		170	}
		171	else if (!strcasecmp (style, "centered"))
		172	{
		173	flags = 0;
		174	w = h = noScale;
		175	x = y = centerAlign;
		176	}
		177	else if (!strcasecmp (style, "root-tiled"))
		178	{
		179	flags = IM_TILE\|IM_ROOT_ALIGN;
		180	w = h = noScale;
		181	x = y = 0;
		182	}
		183	}
		184
156	bool	185	bool
157	rxvt_term::bg_set_geometry (const char *geom, bool update)	186	rxvt_image::set_geometry (const char *geom, bool update)
158	{	187	{
159	bool changed = false;	188	bool changed = false;
160	int geom_flags = 0;	189	int geom_flags = 0;
161	int x = h_align;	190	int x = h_align;
162	int y = v_align;	191	int y = v_align;
163	unsigned int w = h_scale;	192	unsigned int w = h_scale;
164	unsigned int h = v_scale;	193	unsigned int h = v_scale;
165	unsigned long new_flags = 0;	194	uint8_t new_flags = 0;
166		195
167	if (geom == NULL)	196	if (geom == NULL)
168	return false;	197	return false;
169		198
170	if (geom[0])	199	if (geom[0])
171	{	200	{
172	char **arr = rxvt_strsplit (':', geom);	201	char **arr = rxvt_strsplit (':', geom);
173		202
174	for (int i = 0; arr[i]; i++)	203	for (int i = 0; arr[i]; i++)
175	{	204	{
176	if (!strcasecmp (arr[i], "style=tiled"))	205	if (!strncasecmp (arr[i], "style=", 6))
177	{	206	{
178	new_flags = BG_TILE;	207	parse_style (arr[i] + 6, x, y, w, h, new_flags);
179	w = h = noScale;
180	x = y = 0;
181	geom_flags = WidthValue\|HeightValue\|XValue\|YValue;	208	geom_flags = WidthValue\|HeightValue\|XValue\|YValue;
182	}	209	}
183	else if (!strcasecmp (arr[i], "style=aspect-stretched"))
184	{
185	new_flags = BG_KEEP_ASPECT;
186	w = h = windowScale;
187	x = y = centerAlign;
188	geom_flags = WidthValue\|HeightValue\|XValue\|YValue;
189	}
190	else if (!strcasecmp (arr[i], "style=stretched"))
191	{
192	new_flags = 0;
193	w = h = windowScale;
194	geom_flags = WidthValue\|HeightValue;
195	}
196	else if (!strcasecmp (arr[i], "style=centered"))
197	{
198	new_flags = 0;
199	w = h = noScale;
200	x = y = centerAlign;
201	geom_flags = WidthValue\|HeightValue\|XValue\|YValue;
202	}
203	else if (!strcasecmp (arr[i], "style=root-tiled"))
204	{
205	new_flags = BG_TILE\|BG_ROOT_ALIGN;
206	w = h = noScale;
207	geom_flags = WidthValue\|HeightValue;
208	}
209	else if (!strcasecmp (arr[i], "op=tile"))	210	else if (!strcasecmp (arr[i], "op=tile"))
210	new_flags \|= BG_TILE;	211	new_flags \|= IM_TILE;
211	else if (!strcasecmp (arr[i], "op=keep-aspect"))	212	else if (!strcasecmp (arr[i], "op=keep-aspect"))
212	new_flags \|= BG_KEEP_ASPECT;	213	new_flags \|= IM_KEEP_ASPECT;
213	else if (!strcasecmp (arr[i], "op=root-align"))	214	else if (!strcasecmp (arr[i], "op=root-align"))
214	new_flags \|= BG_ROOT_ALIGN;	215	new_flags \|= IM_ROOT_ALIGN;
215		216
216	// deprecated	217	// deprecated
217	else if (!strcasecmp (arr[i], "tile"))	218	else if (!strcasecmp (arr[i], "tile"))
218	{	219	{
219	new_flags \|= BG_TILE;	220	new_flags \|= IM_TILE;
220	w = h = noScale;	221	w = h = noScale;
221	geom_flags \|= WidthValue\|HeightValue;	222	geom_flags \|= WidthValue\|HeightValue;
222	}	223	}
223	else if (!strcasecmp (arr[i], "propscale"))	224	else if (!strcasecmp (arr[i], "propscale"))
224	{	225	{
225	new_flags \|= BG_KEEP_ASPECT;	226	new_flags \|= IM_KEEP_ASPECT;
226	w = h = windowScale;	227	w = h = windowScale;
227	geom_flags \|= WidthValue\|HeightValue;	228	geom_flags \|= WidthValue\|HeightValue;
228	}	229	}
229	else if (!strcasecmp (arr[i], "hscale"))	230	else if (!strcasecmp (arr[i], "hscale"))
230	{	231	{
231	new_flags \|= BG_TILE;	232	new_flags \|= IM_TILE;
232	w = windowScale;	233	w = windowScale;
233	h = noScale;	234	h = noScale;
234	geom_flags \|= WidthValue\|HeightValue;	235	geom_flags \|= WidthValue\|HeightValue;
235	}	236	}
236	else if (!strcasecmp (arr[i], "vscale"))	237	else if (!strcasecmp (arr[i], "vscale"))
237	{	238	{
238	new_flags \|= BG_TILE;	239	new_flags \|= IM_TILE;
239	h = windowScale;	240	h = windowScale;
240	w = noScale;	241	w = noScale;
241	geom_flags \|= WidthValue\|HeightValue;	242	geom_flags \|= WidthValue\|HeightValue;
242	}	243	}
243	else if (!strcasecmp (arr[i], "scale"))	244	else if (!strcasecmp (arr[i], "scale"))
…		…
251	x = y = centerAlign;	252	x = y = centerAlign;
252	geom_flags \|= WidthValue\|HeightValue\|XValue\|YValue;	253	geom_flags \|= WidthValue\|HeightValue\|XValue\|YValue;
253	}	254	}
254	else if (!strcasecmp (arr[i], "root"))	255	else if (!strcasecmp (arr[i], "root"))
255	{	256	{
256	new_flags \|= BG_TILE\|BG_ROOT_ALIGN;	257	new_flags \|= IM_TILE\|IM_ROOT_ALIGN;
257	w = h = noScale;	258	w = h = noScale;
258	geom_flags \|= WidthValue\|HeightValue;	259	geom_flags \|= WidthValue\|HeightValue;
259	}	260	}
260		261
261	else	262	else
…		…
263	} /* done parsing ops */	264	} /* done parsing ops */
264		265
265	rxvt_free_strsplit (arr);	266	rxvt_free_strsplit (arr);
266	}	267	}
267		268
268	new_flags \|= bg_flags & ~BG_GEOMETRY_FLAGS;	269	new_flags \|= flags & ~IM_GEOMETRY_FLAGS;
269		270
270	if (!update)	271	if (!update)
271	{	272	{
272	if (!(geom_flags & XValue))	273	if (!(geom_flags & XValue))
273	x = y = defaultAlign;	274	x = y = defaultAlign;
…		…
280	h = w;	281	h = w;
281	else if (!(geom_flags & WidthValue))	282	else if (!(geom_flags & WidthValue))
282	w = h;	283	w = h;
283	}	284	}
284		285
285	min_it (w, 1000);
286	min_it (h, 1000);
287	clamp_it (x, -100, 200);	286	clamp_it (x, -100, 200);
288	clamp_it (y, -100, 200);	287	clamp_it (y, -100, 200);
289		288
290	if (bg_flags != new_flags	289	if (flags != new_flags
291	\|\| h_scale != w	290	\|\| h_scale != w
292	\|\| v_scale != h	291	\|\| v_scale != h
293	\|\| h_align != x	292	\|\| h_align != x
294	\|\| v_align != y)	293	\|\| v_align != y)
295	{	294	{
296	bg_flags = new_flags;	295	flags = new_flags;
297	h_scale = w;	296	h_scale = w;
298	v_scale = h;	297	v_scale = h;
299	h_align = x;	298	h_align = x;
300	v_align = y;	299	v_align = y;
301	changed = true;	300	changed = true;
302	}	301	}
303		302
		303	if (!(flags & IM_TILE)
		304	\|\| h_scale \|\| v_scale
		305	\|\| (!(flags & IM_ROOT_ALIGN) && (h_align \|\| v_align)))
		306	flags \|= IM_IS_SIZE_SENSITIVE;
		307	else
		308	flags &= ~IM_IS_SIZE_SENSITIVE;
		309
304	return changed;	310	return changed;
305	}	311	}
306		312
307	void	313	void
308	rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)	314	rxvt_term::get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y)
309	{	315	{
		316	int image_width = image.width ();
		317	int image_height = image.height ();
310	int target_width = szHint.width;	318	int target_width = szHint.width;
311	int target_height = szHint.height;	319	int target_height = szHint.height;
		320	int h_scale = min (image.h_scale, 32767 * 100 / target_width);
		321	int v_scale = min (image.v_scale, 32767 * 100 / target_height);
312		322
313	w = h_scale * target_width / 100;	323	w = h_scale * target_width / 100;
314	h = v_scale * target_height / 100;	324	h = v_scale * target_height / 100;
315		325
316	if (bg_flags & BG_KEEP_ASPECT)	326	if (image.flags & IM_KEEP_ASPECT)
317	{	327	{
318	float scale = (float)w / image_width;	328	float scale = (float)w / image_width;
319	min_it (scale, (float)h / image_height);	329	min_it (scale, (float)h / image_height);
320	w = image_width * scale + 0.5;	330	w = image_width * scale + 0.5;
321	h = image_height * scale + 0.5;	331	h = image_height * scale + 0.5;
322	}	332	}
323		333
324	if (!w) w = image_width;	334	if (!w) w = image_width;
325	if (!h) h = image_height;	335	if (!h) h = image_height;
326		336
327	if (bg_flags & BG_ROOT_ALIGN)	337	if (image.flags & IM_ROOT_ALIGN)
328	{	338	{
329	x = -target_x;	339	x = -target_x;
330	y = -target_y;	340	y = -target_y;
331	}	341	}
332	else	342	else
333	{	343	{
334	x = make_align_position (h_align, target_width, w);	344	x = make_align_position (image.h_align, target_width, w);
335	y = make_align_position (v_align, target_height, h);	345	y = make_align_position (image.v_align, target_height, h);
336	}	346	}
337
338	if (!(bg_flags & BG_TILE)
339	\|\| h_scale \|\| v_scale
340	\|\| (!(bg_flags & BG_ROOT_ALIGN) && (h_align \|\| v_align))
341	\|\| image_width > target_width \|\| image_height > target_height)
342	bg_flags \|= BG_IS_SIZE_SENSITIVE;
343	else
344	bg_flags &= ~BG_IS_SIZE_SENSITIVE;
345	}	347	}
346		348
347	# ifdef HAVE_PIXBUF	349	# ifdef HAVE_PIXBUF
348	bool	350	bool
349	rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,	351	rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
350	int src_x, int src_y, int dst_x, int dst_y,	352	int src_x, int src_y, int dst_x, int dst_y,
351	unsigned int width, unsigned int height)	353	unsigned int width, unsigned int height, bool argb)
352	{	354	{
353	XImage *ximage;	355	XImage *ximage;
354	char data, line;	356	char *line;
355	int bytes_per_pixel;
356	int width_r, width_g, width_b;	357	int width_r, width_g, width_b, width_a;
357	int sh_r, sh_g, sh_b;	358	int sh_r, sh_g, sh_b, sh_a;
		359	uint32_t red_mask, green_mask, blue_mask, alpha_mask;
358	int rowstride;	360	int rowstride;
359	int channels;	361	int channels;
360	unsigned char *row;	362	unsigned char *row;
361		363
362	if (visual->c_class != TrueColor)	364	if (visual->c_class != TrueColor)
363	return false;	365	return false;
364		366
365	if (depth == 24 \|\| depth == 32)	367	if (argb)
366	bytes_per_pixel = 4;	368	{
367	else if (depth == 15 \|\| depth == 16)	369	red_mask = 0xff << 16;
368	bytes_per_pixel = 2;	370	green_mask = 0xff << 8;
		371	blue_mask = 0xff;
		372	alpha_mask = 0xff << 24;
		373	}
369	else	374	else
		375	{
		376	red_mask = visual->red_mask;
		377	green_mask = visual->green_mask;
		378	blue_mask = visual->blue_mask;
		379	#if XRENDER
		380	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
		381	if (format)
		382	alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha;
		383	else
		384	#endif
		385	alpha_mask = 0;
		386	}
		387
		388	width_r = ecb_popcount32 (red_mask);
		389	width_g = ecb_popcount32 (green_mask);
		390	width_b = ecb_popcount32 (blue_mask);
		391	width_a = ecb_popcount32 (alpha_mask);
		392
		393	if (width_r > 8 \|\| width_g > 8 \|\| width_b > 8 \|\| width_a > 8)
370	return false;	394	return false;
371		395
372	width_r = ecb_popcount32 (visual->red_mask);	396	sh_r = ecb_ctz32 (red_mask);
373	width_g = ecb_popcount32 (visual->green_mask);	397	sh_g = ecb_ctz32 (green_mask);
374	width_b = ecb_popcount32 (visual->blue_mask);	398	sh_b = ecb_ctz32 (blue_mask);
		399	sh_a = ecb_ctz32 (alpha_mask);
375		400
376	if (width_r > 8 \|\| width_g > 8 \|\| width_b > 8)	401	if (width > 32767 \|\| height > 32767)
377	return false;	402	return false;
378		403
379	sh_r = ecb_ctz32 (visual->red_mask);	404	ximage = XCreateImage (dpy, visual, argb ? 32 : depth, ZPixmap, 0, 0,
380	sh_g = ecb_ctz32 (visual->green_mask);	405	width, height, 32, 0);
381	sh_b = ecb_ctz32 (visual->blue_mask);	406	if (!ximage)
382
383	if (width > INT_MAX / height / bytes_per_pixel)
384	return false;	407	return false;
385		408
386	data = (char )malloc (width height * bytes_per_pixel);	409	if (height > INT_MAX / ximage->bytes_per_line
387	if (!data)	410	\|\| !(ximage->data = (char )malloc (height ximage->bytes_per_line)))
388	return false;
389
390	ximage = XCreateImage (dpy, visual, depth, ZPixmap, 0, data,
391	width, height, bytes_per_pixel * 8, 0);
392	if (!ximage)
393	{	411	{
394	free (data);	412	XDestroyImage (ximage);
395	return false;	413	return false;
396	}	414	}
397		415
398	ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;	416	ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
399		417
400	rowstride = gdk_pixbuf_get_rowstride (pixbuf);	418	rowstride = gdk_pixbuf_get_rowstride (pixbuf);
401	channels = gdk_pixbuf_get_n_channels (pixbuf);	419	channels = gdk_pixbuf_get_n_channels (pixbuf);
402	row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;	420	row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
403	line = data;	421	line = ximage->data;
		422
		423	rgba c (0, 0, 0);
		424
		425	if (channels == 4 && alpha_mask == 0)
		426	{
		427	pix_colors[Color_bg].get (c);
		428	c.r >>= 8;
		429	c.g >>= 8;
		430	c.b >>= 8;
		431	}
404		432
405	for (int y = 0; y < height; y++)	433	for (int y = 0; y < height; y++)
406	{	434	{
407	for (int x = 0; x < width; x++)	435	for (int x = 0; x < width; x++)
408	{	436	{
409	unsigned char pixel = row + x channels;	437	unsigned char pixel = row + x channels;
410	uint32_t value;	438	uint32_t value;
		439	unsigned char r, g, b, a;
411		440
		441	if (channels == 4)
		442	{
		443	a = pixel[3];
		444	r = (pixel[0] * a + c.r * (0xff - a)) / 0xff;
		445	g = (pixel[1] * a + c.g * (0xff - a)) / 0xff;
		446	b = (pixel[2] * a + c.b * (0xff - a)) / 0xff;
		447	}
		448	else
		449	{
		450	a = 0xff;
		451	r = pixel[0];
		452	g = pixel[1];
		453	b = pixel[2];
		454	}
		455
412	value = ((pixel[0] >> (8 - width_r)) << sh_r)	456	value = ((r >> (8 - width_r)) << sh_r)
413	\| ((pixel[1] >> (8 - width_g)) << sh_g)	457	\| ((g >> (8 - width_g)) << sh_g)
414	\| ((pixel[2] >> (8 - width_b)) << sh_b);	458	\| ((b >> (8 - width_b)) << sh_b)
		459	\| ((a >> (8 - width_a)) << sh_a);
415		460
416	if (bytes_per_pixel == 4)	461	if (ximage->bits_per_pixel == 32)
417	((uint32_t *)line)[x] = value;	462	((uint32_t *)line)[x] = value;
418	else	463	else
419	((uint16_t *)line)[x] = value;	464	XPutPixel (ximage, x, y, value);
420	}	465	}
421		466
422	row += rowstride;	467	row += rowstride;
423	line += ximage->bytes_per_line;	468	line += ximage->bytes_per_line;
424	}	469	}
…		…
427	XDestroyImage (ximage);	472	XDestroyImage (ximage);
428	return true;	473	return true;
429	}	474	}
430		475
431	bool	476	bool
432	rxvt_term::render_image (bool transparent)	477	rxvt_term::render_image (rxvt_image &image)
433	{	478	{
		479	GdkPixbuf *pixbuf = image.pixbuf;
434	if (!pixbuf)	480	if (!pixbuf)
435	return false;	481	return false;
436		482
437	if (transparent	483	bool need_blend = bg_flags & BG_IS_VALID;
		484
		485	if (need_blend
438	&& !(bg_flags & BG_HAS_RENDER))	486	&& !(bg_flags & BG_HAS_RENDER))
439	return false;	487	return false;
440		488
441	GdkPixbuf *result;	489	GdkPixbuf *result;
442		490
…		…
451	int x = 0;	499	int x = 0;
452	int y = 0;	500	int y = 0;
453	int w = 0;	501	int w = 0;
454	int h = 0;	502	int h = 0;
455		503
456	get_image_geometry (image_width, image_height, w, h, x, y);	504	get_image_geometry (image, w, h, x, y);
457		505
458	if (!(bg_flags & BG_ROOT_ALIGN)	506	if (!(image.flags & IM_ROOT_ALIGN)
459	&& (x >= target_width	507	&& (x >= target_width
460	\|\| y >= target_height	508	\|\| y >= target_height
461	\|\| x + w <= 0	509	\|\| x + w <= 0
462	\|\| y + h <= 0))	510	\|\| y + h <= 0))
463	return false;	511	return false;
…		…
477		525
478	bool ret = false;	526	bool ret = false;
479		527
480	XGCValues gcv;	528	XGCValues gcv;
481	GC gc;	529	GC gc;
482	Pixmap root_pmap;	530	Pixmap tmp_pixmap;
483		531
484	image_width = gdk_pixbuf_get_width (result);	532	image_width = gdk_pixbuf_get_width (result);
485	image_height = gdk_pixbuf_get_height (result);	533	image_height = gdk_pixbuf_get_height (result);
486		534
487	if (transparent)	535	if (need_blend)
488	{	536	tmp_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, 32);
489	root_pmap = bg_pixmap;
490	bg_pixmap = None;
491	}
492	else	537	else
493	{	538	{
494	if (bg_flags & BG_TILE)	539	if (image.flags & IM_TILE)
495	{	540	{
496	new_pmap_width = min (image_width, target_width);	541	new_pmap_width = min (image_width, target_width);
497	new_pmap_height = min (image_height, target_height);	542	new_pmap_height = min (image_height, target_height);
498	}	543	}
499	}
500		544
501	if (bg_pixmap == None	545	if (bg_pixmap == None
502	\|\| bg_pmap_width != new_pmap_width	546	\|\| bg_pmap_width != new_pmap_width
503	\|\| bg_pmap_height != new_pmap_height)	547	\|\| bg_pmap_height != new_pmap_height)
504	{	548	{
505	if (bg_pixmap)	549	if (bg_pixmap)
506	XFreePixmap (dpy, bg_pixmap);	550	XFreePixmap (dpy, bg_pixmap);
507	bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);	551	bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
508	bg_pmap_width = new_pmap_width;	552	bg_pmap_width = new_pmap_width;
509	bg_pmap_height = new_pmap_height;	553	bg_pmap_height = new_pmap_height;
		554	}
		555
		556	tmp_pixmap = bg_pixmap;
510	}	557	}
511		558
512	gcv.foreground = pix_colors[Color_bg];	559	gcv.foreground = pix_colors[Color_bg];
513	gc = XCreateGC (dpy, vt, GCForeground, &gcv);	560	gc = XCreateGC (dpy, tmp_pixmap, GCForeground, &gcv);
514		561
515	if (gc)	562	if (gc)
516	{	563	{
517	if (bg_flags & BG_TILE)	564	if (image.flags & IM_TILE)
518	{	565	{
519	Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth);	566	Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, need_blend ? 32 : depth);
520	pixbuf_to_pixmap (result, tile, gc,	567	pixbuf_to_pixmap (result, tile, gc,
521	0, 0,	568	0, 0,
522	0, 0,	569	0, 0,
523	image_width, image_height);	570	image_width, image_height, need_blend);
524		571
525	gcv.tile = tile;	572	gcv.tile = tile;
526	gcv.fill_style = FillTiled;	573	gcv.fill_style = FillTiled;
527	gcv.ts_x_origin = x;	574	gcv.ts_x_origin = x;
528	gcv.ts_y_origin = y;	575	gcv.ts_y_origin = y;
529	XChangeGC (dpy, gc, GCFillStyle \| GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin, &gcv);	576	XChangeGC (dpy, gc, GCFillStyle \| GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin, &gcv);
530		577
531	XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);	578	XFillRectangle (dpy, tmp_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
532	XFreePixmap (dpy, tile);	579	XFreePixmap (dpy, tile);
533	}	580	}
534	else	581	else
535	{	582	{
536	int src_x, src_y, dst_x, dst_y;	583	int src_x, src_y, dst_x, dst_y;
…		…
540	src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);	587	src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
541		588
542	if (dst_x > 0 \|\| dst_y > 0	589	if (dst_x > 0 \|\| dst_y > 0
543	\|\| dst_x + dst_width < new_pmap_width	590	\|\| dst_x + dst_width < new_pmap_width
544	\|\| dst_y + dst_height < new_pmap_height)	591	\|\| dst_y + dst_height < new_pmap_height)
545	XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);	592	XFillRectangle (dpy, tmp_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
546		593
547	if (dst_x < new_pmap_width && dst_y < new_pmap_height)	594	if (dst_x < new_pmap_width && dst_y < new_pmap_height)
548	pixbuf_to_pixmap (result, bg_pixmap, gc,	595	pixbuf_to_pixmap (result, tmp_pixmap, gc,
549	src_x, src_y,	596	src_x, src_y,
550	dst_x, dst_y,	597	dst_x, dst_y,
551	dst_width, dst_height);	598	dst_width, dst_height, need_blend);
552	}	599	}
553		600
554	#if XRENDER	601	#if XRENDER
555	if (transparent)	602	if (need_blend)
556	{	603	{
		604	XRenderPictFormat *argb_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
557	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);	605	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
558		606
559	Picture src = XRenderCreatePicture (dpy, root_pmap, format, 0, 0);	607	Picture src = XRenderCreatePicture (dpy, tmp_pixmap, argb_format, 0, 0);
560		608
561	Picture dst = XRenderCreatePicture (dpy, bg_pixmap, format, 0, 0);	609	Picture dst = XRenderCreatePicture (dpy, bg_pixmap, format, 0, 0);
562		610
563	Picture mask = create_xrender_mask (dpy, vt, False, False);	611	Picture mask = create_xrender_mask (dpy, vt, False, False);
564		612
…		…
584	}	632	}
585		633
586	if (result != pixbuf)	634	if (result != pixbuf)
587	g_object_unref (result);	635	g_object_unref (result);
588		636
589	if (transparent)	637	if (need_blend)
590	XFreePixmap (dpy, root_pmap);	638	XFreePixmap (dpy, tmp_pixmap);
591		639
592	return ret;	640	return ret;
593	}	641	}
594	# endif /* HAVE_PIXBUF */	642	# endif /* HAVE_PIXBUF */
595		643
596	bool	644	bool
597	rxvt_term::bg_set_file (const char *file)	645	rxvt_image::set_file (const char *file)
598	{	646	{
599	if (!file \|\| !*file)	647	if (!file \|\| !*file)
600	return false;	648	return false;
601		649
602	bool ret = false;	650	bool ret = false;
…		…
616	if (image)	664	if (image)
617	{	665	{
618	if (pixbuf)	666	if (pixbuf)
619	g_object_unref (pixbuf);	667	g_object_unref (pixbuf);
620	pixbuf = image;	668	pixbuf = image;
621	bg_flags \|= BG_IS_FROM_FILE;
622	ret = true;	669	ret = true;
623	}	670	}
624	# endif	671	# endif
625		672
626	if (ret)	673	if (ret)
627	{	674	{
		675	flags = IM_IS_SET \| IM_IS_SIZE_SENSITIVE;
		676	h_scale = v_scale = defaultScale;
		677	h_align = v_align = defaultAlign;
		678
628	if (p)	679	if (p)
629	bg_set_geometry (p + 1);	680	set_geometry (p + 1);
630	else
631	bg_set_default_geometry ();
632	}	681	}
633		682
634	return ret;	683	return ret;
635	}	684	}
636		685
637	# endif /* BG_IMAGE_FROM_FILE */	686	# endif /* BG_IMAGE_FROM_FILE */
638		687
639	# ifdef ENABLE_TRANSPARENCY	688	# ifdef ENABLE_TRANSPARENCY
640	bool
641	rxvt_term::bg_set_transparent ()
642	{
643	if (!(bg_flags & BG_IS_TRANSPARENT))
644	{
645	bg_flags \|= BG_IS_TRANSPARENT;
646	return true;
647	}
648
649	return false;
650	}
651
652	bool	689	bool
653	rxvt_term::bg_set_blur (const char *geom)	690	rxvt_term::bg_set_blur (const char *geom)
654	{	691	{
655	bool changed = false;	692	bool changed = false;
656	unsigned int hr, vr;	693	unsigned int hr, vr;
…		…
675	{	712	{
676	changed = true;	713	changed = true;
677	v_blurRadius = vr;	714	v_blurRadius = vr;
678	}	715	}
679		716
680	if (h_blurRadius && v_blurRadius)
681	bg_flags \|= BG_NEEDS_BLUR;
682	else
683	bg_flags &= ~BG_NEEDS_BLUR;
684
685	return changed;	717	return changed;
686	}
687
688	void
689	rxvt_term::set_tint_shade_flags ()
690	{
691	if (shade != 100 \|\| (bg_flags & BG_TINT_SET))
692	bg_flags \|= BG_NEEDS_TINT;
693	else
694	bg_flags &= ~BG_NEEDS_TINT;
695	}	718	}
696		719
697	bool	720	bool
698	rxvt_term::bg_set_tint (rxvt_color &new_tint)	721	rxvt_term::bg_set_tint (rxvt_color &new_tint)
699	{	722	{
…		…
709	&& (c.b <= 0x00ff \|\| c.b >= 0xff00))	732	&& (c.b <= 0x00ff \|\| c.b >= 0xff00))
710	bg_flags \|= BG_TINT_BITAND;	733	bg_flags \|= BG_TINT_BITAND;
711	else	734	else
712	bg_flags &= ~BG_TINT_BITAND;	735	bg_flags &= ~BG_TINT_BITAND;
713		736
714	set_tint_shade_flags ();
715	return true;	737	return true;
716	}	738	}
717		739
718	return false;	740	return false;
719	}	741	}
…		…
728	new_shade = 200 - (100 + new_shade);	750	new_shade = 200 - (100 + new_shade);
729		751
730	if (new_shade != shade)	752	if (new_shade != shade)
731	{	753	{
732	shade = new_shade;	754	shade = new_shade;
733	set_tint_shade_flags ();
734	return true;	755	return true;
735	}	756	}
736		757
737	return false;	758	return false;
738	}	759	}
…		…
759	params[i+2] = XDoubleToFixed (kernel[i] / sum);	780	params[i+2] = XDoubleToFixed (kernel[i] / sum);
760	}	781	}
761	#endif	782	#endif
762		783
763	bool	784	bool
764	rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height, int depth)	785	rxvt_term::blur_pixmap (Pixmap pixmap, int width, int height)
765	{	786	{
766	bool ret = false;	787	bool ret = false;
767	#if XRENDER	788	#if XRENDER
768	if (!(bg_flags & BG_HAS_RENDER_CONV))	789	if (!(bg_flags & BG_HAS_RENDER_CONV))
769	return false;	790	return false;
…		…
824	#endif	845	#endif
825	return ret;	846	return ret;
826	}	847	}
827		848
828	bool	849	bool
829	rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)	850	rxvt_term::tint_pixmap (Pixmap pixmap, int width, int height)
830	{	851	{
831	bool ret = false;	852	bool ret = false;
832		853
833	if (shade == 100 && (bg_flags & BG_TINT_BITAND))	854	if (shade == 100 && (bg_flags & BG_TINT_BITAND))
834	{	855	{
…		…
1014		1035
1015	if (gc)	1036	if (gc)
1016	{	1037	{
1017	XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);	1038	XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1018	ret = true;	1039	ret = true;
1019	unsigned long tr_flags = bg_flags & BG_EFFECTS_FLAGS;	1040	bool need_blur = h_blurRadius && v_blurRadius;
		1041	bool need_tint = shade != 100 \|\| (bg_flags & BG_TINT_SET);
1020		1042
1021	if (!(bg_flags & BG_CLIENT_RENDER))	1043	if (!(bg_flags & BG_CLIENT_RENDER))
1022	{	1044	{
1023	if (bg_flags & BG_NEEDS_BLUR)	1045	if (need_blur)
1024	{
1025	if (blur_pixmap (bg_pixmap, visual, window_width, window_height, depth))
1026	tr_flags &= ~BG_NEEDS_BLUR;
1027	}	1046	{
1028	if (bg_flags & BG_NEEDS_TINT)	1047	if (blur_pixmap (bg_pixmap, window_width, window_height))
		1048	need_blur = false;
1029	{	1049	}
		1050	if (need_tint)
		1051	{
1030	if (tint_pixmap (bg_pixmap, visual, window_width, window_height))	1052	if (tint_pixmap (bg_pixmap, window_width, window_height))
1031	tr_flags &= ~BG_NEEDS_TINT;	1053	need_tint = false;
1032	}	1054	}
1033	if (tr_flags & BG_NEEDS_TINT)	1055	if (need_tint)
1034	{	1056	{
1035	XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);	1057	XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1036	if (ximage)	1058	if (ximage)
1037	{	1059	{
1038	/* our own client-side tinting */	1060	/* our own client-side tinting */
1039	tint_ximage (DefaultVisual (dpy, display->screen), ximage);	1061	tint_ximage (ximage);
1040		1062
1041	XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height);	1063	XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height);
1042	XDestroyImage (ximage);	1064	XDestroyImage (ximage);
1043	}	1065	}
1044	}	1066	}
…		…
1065	# endif /* ENABLE_TRANSPARENCY */	1087	# endif /* ENABLE_TRANSPARENCY */
1066		1088
1067	bool	1089	bool
1068	rxvt_term::bg_render ()	1090	rxvt_term::bg_render ()
1069	{	1091	{
1070	bool transparent = false;
1071
1072	bg_invalidate ();	1092	bg_invalidate ();
1073	# ifdef ENABLE_TRANSPARENCY	1093	# ifdef ENABLE_TRANSPARENCY
1074	if (bg_flags & BG_IS_TRANSPARENT)	1094	if (bg_flags & BG_IS_TRANSPARENT)
1075	{	1095	{
1076	/* we need to re-generate transparency pixmap in that case ! */	1096	/* we need to re-generate transparency pixmap in that case ! */
1077	transparent = make_transparency_pixmap ();	1097	if (make_transparency_pixmap ())
1078	if (transparent)
1079	bg_flags \|= BG_IS_VALID;	1098	bg_flags \|= BG_IS_VALID;
1080	}	1099	}
1081	# endif	1100	# endif
1082		1101
1083	# ifdef BG_IMAGE_FROM_FILE	1102	# ifdef BG_IMAGE_FROM_FILE
1084	if (bg_flags & BG_IS_FROM_FILE)	1103	if (bg_image.flags & IM_IS_SET)
1085	{	1104	{
1086	if (render_image (transparent))	1105	if (render_image (bg_image))
1087	bg_flags \|= BG_IS_VALID;	1106	bg_flags \|= BG_IS_VALID;
1088	}	1107	}
1089	# endif	1108	# endif
1090		1109
1091	if (!(bg_flags & BG_IS_VALID))	1110	if (!(bg_flags & BG_IS_VALID))
…		…
1145	lookup[i] = (tmp / 0xffff) << sh;	1164	lookup[i] = (tmp / 0xffff) << sh;
1146	}	1165	}
1147	}	1166	}
1148		1167
1149	void	1168	void
1150	rxvt_term::tint_ximage (Visual visual, XImage ximage)	1169	rxvt_term::tint_ximage (XImage *ximage)
1151	{	1170	{
		1171	unsigned int size_r, size_g, size_b;
1152	int sh_r, sh_g, sh_b;	1172	int sh_r, sh_g, sh_b;
1153	uint32_t mask_r, mask_g, mask_b;	1173	uint32_t mask_r, mask_g, mask_b;
1154	uint32_t lookup, lookup_r, lookup_g, lookup_b;	1174	uint32_t lookup, lookup_r, lookup_g, lookup_b;
1155	unsigned short low;	1175	unsigned short low;
1156	int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;	1176	int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
…		…
1161	mask_r = visual->red_mask;	1181	mask_r = visual->red_mask;
1162	mask_g = visual->green_mask;	1182	mask_g = visual->green_mask;
1163	mask_b = visual->blue_mask;	1183	mask_b = visual->blue_mask;
1164		1184
1165	/* boring lookup table pre-initialization */	1185	/* boring lookup table pre-initialization */
1166	switch (ximage->depth)	1186	sh_r = ecb_ctz32 (mask_r);
1167	{	1187	sh_g = ecb_ctz32 (mask_g);
1168	case 15:	1188	sh_b = ecb_ctz32 (mask_b);
1169	if ((mask_r != 0x7c00) \|\|	1189
1170	(mask_g != 0x03e0) \|\|	1190	size_r = mask_r >> sh_r;
1171	(mask_b != 0x001f))	1191	size_g = mask_g >> sh_g;
		1192	size_b = mask_b >> sh_b;
		1193
		1194	if (size_r++ > 255 \|\| size_g++ > 255 \|\| size_b++ > 255)
1172	return;	1195	return;
1173	lookup = (uint32_t ) malloc (sizeof (uint32_t)(32+32+32));	1196
		1197	lookup = (uint32_t )malloc (sizeof (uint32_t) (size_r + size_g + size_b));
1174	lookup_r = lookup;	1198	lookup_r = lookup;
1175	lookup_g = lookup+32;	1199	lookup_g = lookup + size_r;
1176	lookup_b = lookup+32+32;	1200	lookup_b = lookup + size_r + size_g;
1177	sh_r = 10;
1178	sh_g = 5;
1179	sh_b = 0;
1180	break;
1181	case 16:
1182	if ((mask_r != 0xf800) \|\|
1183	(mask_g != 0x07e0) \|\|
1184	(mask_b != 0x001f))
1185	return;
1186	lookup = (uint32_t ) malloc (sizeof (uint32_t)(32+64+32));
1187	lookup_r = lookup;
1188	lookup_g = lookup+32;
1189	lookup_b = lookup+32+64;
1190	sh_r = 11;
1191	sh_g = 5;
1192	sh_b = 0;
1193	break;
1194	case 24:
1195	if ((mask_r != 0xff0000) \|\|
1196	(mask_g != 0x00ff00) \|\|
1197	(mask_b != 0x0000ff))
1198	return;
1199	lookup = (uint32_t ) malloc (sizeof (uint32_t)(256+256+256));
1200	lookup_r = lookup;
1201	lookup_g = lookup+256;
1202	lookup_b = lookup+256+256;
1203	sh_r = 16;
1204	sh_g = 8;
1205	sh_b = 0;
1206	break;
1207	case 32:
1208	if ((mask_r != 0xff0000) \|\|
1209	(mask_g != 0x00ff00) \|\|
1210	(mask_b != 0x0000ff))
1211	return;
1212	lookup = (uint32_t ) malloc (sizeof (uint32_t)(256+256+256));
1213	lookup_r = lookup;
1214	lookup_g = lookup+256;
1215	lookup_b = lookup+256+256;
1216	sh_r = 16;
1217	sh_g = 8;
1218	sh_b = 0;
1219	break;
1220	default:
1221	return; /* we do not support this color depth */
1222	}
1223		1201
1224	rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);	1202	rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1225		1203
1226	if (bg_flags & BG_TINT_SET)	1204	if (bg_flags & BG_TINT_SET)
1227	tint.get (c);	1205	tint.get (c);
…		…
1249	fill_lut (lookup_g, mask_g, sh_g, low, c.g);	1227	fill_lut (lookup_g, mask_g, sh_g, low, c.g);
1250	fill_lut (lookup_b, mask_b, sh_b, low, c.b);	1228	fill_lut (lookup_b, mask_b, sh_b, low, c.b);
1251		1229
1252	/* apply table to input image (replacing colors by newly calculated ones) */	1230	/* apply table to input image (replacing colors by newly calculated ones) */
1253	if (ximage->bits_per_pixel == 32	1231	if (ximage->bits_per_pixel == 32
1254	&& (ximage->depth == 24 \|\| ximage->depth == 32)
1255	&& ximage->byte_order == host_byte_order)	1232	&& ximage->byte_order == host_byte_order)
1256	{	1233	{
1257	uint32_t p1, pf, p, pl;	1234	char *line = ximage->data;
1258	p1 = (uint32_t *) ximage->data;
1259	pf = (uint32_t ) (ximage->data + ximage->height ximage->bytes_per_line);
1260		1235
1261	while (p1 < pf)	1236	for (int y = 0; y < ximage->height; y++)
1262	{
1263	p = p1;
1264	pl = p1 + ximage->width;
1265	for (; p < pl; p++)
1266	{	1237	{
1267	p = lookup_r[(p & 0xff0000) >> 16] \|	1238	uint32_t p = (uint32_t )line;
1268	lookup_g[(*p & 0x00ff00) >> 8] \|	1239	for (int x = 0; x < ximage->width; x++)
1269	lookup_b[(*p & 0x0000ff)] \|
1270	(*p & 0xff000000);
1271	}	1240	{
1272	p1 = (uint32_t ) ((char ) p1 + ximage->bytes_per_line);	1241	p = lookup_r[(p & mask_r) >> sh_r] \|
		1242	lookup_g[(*p & mask_g) >> sh_g] \|
		1243	lookup_b[(*p & mask_b) >> sh_b];
		1244	p++;
		1245	}
		1246	line += ximage->bytes_per_line;
1273	}	1247	}
1274	}	1248	}
1275	else	1249	else
1276	{	1250	{
1277	for (int y = 0; y < ximage->height; y++)	1251	for (int y = 0; y < ximage->height; y++)

Diff Legend

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

Comparing rxvt-unicode/src/background.C (file contents): Revision 1.205 by sf-exg, Wed Apr 11 10:06:45 2012 UTC vs. Revision 1.219 by sf-exg, Thu May 24 16:17:33 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.205 by sf-exg, Wed Apr 11 10:06:45 2012 UTC vs.
Revision 1.219 by sf-exg, Thu May 24 16:17:33 2012 UTC