ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/background.C
(Generate patch)

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.158 by sf-exg, Wed Aug 10 07:28:36 2011 UTC vs.
Revision 1.216 by sf-exg, Sun May 20 16:23:42 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.
20 * You should have received a copy of the GNU General Public License 20 * You should have received a copy of the GNU General Public License
21 * along with this program; if not, write to the Free Software 21 * along with this program; if not, write to the Free Software
22 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 22 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
23 *---------------------------------------------------------------------*/ 23 *---------------------------------------------------------------------*/
24 24
25#include <cmath> 25#include <math.h>
26#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
27#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
28 28
29#if XRENDER 29#if XRENDER
30# include <X11/extensions/Xrender.h> 30# include <X11/extensions/Xrender.h>
32 32
33#ifndef FilterConvolution 33#ifndef FilterConvolution
34#define FilterConvolution "convolution" 34#define FilterConvolution "convolution"
35#endif 35#endif
36 36
37/* 37#ifndef RepeatPad
38 * Pixmap geometry string interpretation : 38#define RepeatPad True
39 * Each geometry string contains zero or one scale/position 39#endif
40 * adjustment and may optionally be followed by a colon and one or more
41 * colon-delimited pixmap operations.
42 * The following table shows the valid geometry strings and their
43 * effects on the background image :
44 *
45 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
46 * W and H are percentages of the terminal window size.
47 * X and Y are also percentages; e.g., +50+50 centers
48 * the image in the window.
49 *
50 * Pixmap Operations : (should be prepended by a colon)
51 * tile Tile image. Scaling/position modifiers above will affect
52 * the tile size and origin.
53 * propscale When scaling, scale proportionally. That is, maintain the
54 * proper aspect ratio for the image. Any portion of the
55 * background not covered by the image is filled with the
56 * current background color.
57 * scale Scale both up and down
58 */
59 40
60#ifdef HAVE_BG_PIXMAP 41#ifdef HAVE_BG_PIXMAP
42# if XRENDER
43static Picture
44create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
45{
46 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
47
48 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
49 XRenderPictureAttributes pa;
50 pa.repeat = True;
51 pa.component_alpha = component_alpha;
52 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat | CPComponentAlpha, &pa);
53
54 XFreePixmap (dpy, pixmap);
55
56 return mask;
57}
58# endif
59
61void 60void
62rxvt_term::bg_destroy () 61rxvt_term::bg_destroy ()
63{ 62{
64#ifdef HAVE_AFTERIMAGE
65 if (original_asim)
66 safe_asimage_destroy (original_asim);
67 if (asv)
68 destroy_asvisual (asv, 0);
69 if (asimman)
70 destroy_image_manager (asimman, 0);
71#endif
72
73#ifdef HAVE_PIXBUF
74 if (pixbuf)
75 g_object_unref (pixbuf);
76#endif
77
78 if (bg_pixmap) 63 if (bg_pixmap)
79 XFreePixmap (dpy, bg_pixmap); 64 XFreePixmap (dpy, bg_pixmap);
80} 65}
81 66
82bool 67bool
100 if (bg_flags & BG_IS_TRANSPARENT) 85 if (bg_flags & BG_IS_TRANSPARENT)
101 return true; 86 return true;
102# endif 87# endif
103 88
104# ifdef BG_IMAGE_FROM_FILE 89# ifdef BG_IMAGE_FROM_FILE
105 if (bg_flags & BG_IS_FROM_FILE) 90 if (bg_image.flags & IM_IS_SET)
106 { 91 {
107 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)
108 return true; 95 return true;
109 } 96 }
110# endif 97# endif
111 98
112 return false; 99 return false;
119 if (bg_flags & BG_IS_TRANSPARENT) 106 if (bg_flags & BG_IS_TRANSPARENT)
120 return true; 107 return true;
121# endif 108# endif
122 109
123# ifdef BG_IMAGE_FROM_FILE 110# ifdef BG_IMAGE_FROM_FILE
124 if (bg_flags & BG_IS_FROM_FILE) 111 if (bg_image.flags & IM_IS_SET)
125 { 112 {
126 if (bg_flags & BG_ROOT_ALIGN) 113 if (bg_image.flags & IM_ROOT_ALIGN)
127 return true; 114 return true;
128 } 115 }
129# endif 116# endif
130 117
131 return false; 118 return false;
132} 119}
133 120
134# ifdef BG_IMAGE_FROM_FILE 121# ifdef BG_IMAGE_FROM_FILE
135static inline bool
136check_set_scale_value (int geom_flags, int flag, unsigned int &scale, unsigned int new_value)
137{
138 if (geom_flags & flag)
139 {
140 if (new_value > 1000)
141 new_value = 1000;
142 if (new_value != scale)
143 {
144 scale = new_value;
145 return true;
146 }
147 }
148 return false;
149}
150
151static inline bool
152check_set_align_value (int geom_flags, int flag, int &align, int new_value)
153{
154 if (geom_flags & flag)
155 {
156 if (new_value < -100)
157 new_value = -100;
158 else if (new_value > 200)
159 new_value = 200;
160 if (new_value != align)
161 {
162 align = new_value;
163 return true;
164 }
165 }
166 return false;
167}
168
169static inline int 122static inline int
170make_align_position (int align, int window_size, int image_size) 123make_align_position (int align, int window_size, int image_size)
171{ 124{
172 int diff = window_size - image_size;
173 int smaller = min (image_size, window_size);
174
175 if (align >= 0 && align <= 100) 125 if (align >= 0 && align <= 100)
176 return diff * align / 100; 126 return lerp (0, window_size - image_size, align);
177 else if (align > 100 && align <= 200) 127 else if (align > 100)
178 return ((align - 100) * smaller / 100) + window_size - smaller; 128 return lerp (window_size - image_size, window_size, align - 100);
179 else if (align >= -100 && align < 0) 129 else
180 return ((align + 100) * smaller / 100) - image_size; 130 return lerp (-image_size, 0, align + 100);
181 return 0;
182} 131}
183 132
184static inline int 133static inline int
185make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 134make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
186{ 135{
192 src_pos = -pos; 141 src_pos = -pos;
193 dst_pos = 0; 142 dst_pos = 0;
194 dst_size += pos; 143 dst_size += pos;
195 } 144 }
196 145
197 if (dst_pos + dst_size > target_size)
198 dst_size = target_size - dst_pos; 146 min_it (dst_size, target_size - dst_pos);
199 return src_pos; 147 return src_pos;
200} 148}
201 149
202bool 150bool
203rxvt_term::bg_set_geometry (const char *geom, bool update) 151rxvt_image::set_geometry (const char *geom, bool update)
204{ 152{
205 bool changed = false; 153 bool changed = false;
206 int geom_flags = 0; 154 int geom_flags = 0;
207 int x = 0, y = 0; 155 int x = h_align;
156 int y = v_align;
208 unsigned int w = 0, h = 0; 157 unsigned int w = h_scale;
209 unsigned int n; 158 unsigned int h = v_scale;
210 unsigned long new_flags = (bg_flags & (~BG_GEOMETRY_FLAGS)); 159 unsigned long new_flags = 0;
211 const char *ops;
212 160
213 if (geom == NULL) 161 if (geom == NULL)
214 return false; 162 return false;
215 163
216 char str[256]; 164 if (geom[0])
217
218 ops = strchr (geom, ':');
219 if (ops == NULL)
220 n = strlen (geom);
221 else
222 n = ops - geom;
223
224 if (n >= sizeof (str))
225 return false;
226
227 memcpy (str, geom, n);
228 str[n] = '\0';
229 rxvt_strtrim (str);
230
231 if (str[0])
232 { 165 {
233 /* we have geometry string - let's handle it prior to applying ops */ 166 char **arr = rxvt_strsplit (':', geom);
167
168 for (int i = 0; arr[i]; i++)
169 {
170 if (!strcasecmp (arr[i], "style=tiled"))
171 {
172 new_flags = IM_TILE;
173 w = h = noScale;
174 x = y = 0;
175 geom_flags = WidthValue|HeightValue|XValue|YValue;
176 }
177 else if (!strcasecmp (arr[i], "style=aspect-stretched"))
178 {
179 new_flags = IM_KEEP_ASPECT;
180 w = h = windowScale;
181 x = y = centerAlign;
182 geom_flags = WidthValue|HeightValue|XValue|YValue;
183 }
184 else if (!strcasecmp (arr[i], "style=stretched"))
185 {
186 new_flags = 0;
187 w = h = windowScale;
188 geom_flags = WidthValue|HeightValue;
189 }
190 else if (!strcasecmp (arr[i], "style=centered"))
191 {
192 new_flags = 0;
193 w = h = noScale;
194 x = y = centerAlign;
195 geom_flags = WidthValue|HeightValue|XValue|YValue;
196 }
197 else if (!strcasecmp (arr[i], "style=root-tiled"))
198 {
199 new_flags = IM_TILE|IM_ROOT_ALIGN;
200 w = h = noScale;
201 geom_flags = WidthValue|HeightValue;
202 }
203 else if (!strcasecmp (arr[i], "op=tile"))
204 new_flags |= IM_TILE;
205 else if (!strcasecmp (arr[i], "op=keep-aspect"))
206 new_flags |= IM_KEEP_ASPECT;
207 else if (!strcasecmp (arr[i], "op=root-align"))
208 new_flags |= IM_ROOT_ALIGN;
209
210 // deprecated
211 else if (!strcasecmp (arr[i], "tile"))
212 {
213 new_flags |= IM_TILE;
214 w = h = noScale;
215 geom_flags |= WidthValue|HeightValue;
216 }
217 else if (!strcasecmp (arr[i], "propscale"))
218 {
219 new_flags |= IM_KEEP_ASPECT;
220 w = h = windowScale;
221 geom_flags |= WidthValue|HeightValue;
222 }
223 else if (!strcasecmp (arr[i], "hscale"))
224 {
225 new_flags |= IM_TILE;
226 w = windowScale;
227 h = noScale;
228 geom_flags |= WidthValue|HeightValue;
229 }
230 else if (!strcasecmp (arr[i], "vscale"))
231 {
232 new_flags |= IM_TILE;
233 h = windowScale;
234 w = noScale;
235 geom_flags |= WidthValue|HeightValue;
236 }
237 else if (!strcasecmp (arr[i], "scale"))
238 {
239 w = h = windowScale;
240 geom_flags |= WidthValue|HeightValue;
241 }
242 else if (!strcasecmp (arr[i], "auto"))
243 {
244 w = h = windowScale;
245 x = y = centerAlign;
246 geom_flags |= WidthValue|HeightValue|XValue|YValue;
247 }
248 else if (!strcasecmp (arr[i], "root"))
249 {
250 new_flags |= IM_TILE|IM_ROOT_ALIGN;
251 w = h = noScale;
252 geom_flags |= WidthValue|HeightValue;
253 }
254
255 else
234 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 256 geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h);
235 } /* done parsing geometry string */ 257 } /* done parsing ops */
258
259 rxvt_free_strsplit (arr);
260 }
261
262 new_flags |= flags & ~IM_GEOMETRY_FLAGS;
236 263
237 if (!update) 264 if (!update)
238 { 265 {
239 if (!(geom_flags & XValue)) 266 if (!(geom_flags & XValue))
240 x = y = defaultAlign; 267 x = y = defaultAlign;
245 w = h = defaultScale; 272 w = h = defaultScale;
246 else if (!(geom_flags & HeightValue)) 273 else if (!(geom_flags & HeightValue))
247 h = w; 274 h = w;
248 else if (!(geom_flags & WidthValue)) 275 else if (!(geom_flags & WidthValue))
249 w = h; 276 w = h;
250
251 geom_flags |= WidthValue|HeightValue|XValue|YValue;
252 }
253
254 if (ops)
255 { 277 }
256 char **arr = rxvt_strsplit (':', ops + 1);
257 278
258 for (int i = 0; arr[i]; i++) 279 min_it (w, 1000);
259 { 280 min_it (h, 1000);
260 if (!strcasecmp (arr[i], "tile")) 281 clamp_it (x, -100, 200);
261 { 282 clamp_it (y, -100, 200);
262 new_flags |= BG_TILE;
263 w = h = noScale;
264 geom_flags |= WidthValue|HeightValue;
265 }
266 else if (!strcasecmp (arr[i], "propscale"))
267 {
268 new_flags |= BG_PROP_SCALE;
269 }
270 else if (!strcasecmp (arr[i], "scale"))
271 {
272 if (h == 0) h = windowScale;
273 if (w == 0) w = windowScale;
274 283
275 geom_flags |= WidthValue|HeightValue; 284 if (flags != new_flags
276 } 285 || h_scale != w
277 else if (!strcasecmp (arr[i], "root")) 286 || v_scale != h
278 { 287 || h_align != x
279 new_flags |= BG_TILE|BG_ROOT_ALIGN; 288 || v_align != y)
280 w = h = noScale;
281 geom_flags |= WidthValue|HeightValue;
282 }
283 } /* done parsing ops */
284
285 rxvt_free_strsplit (arr);
286 } 289 {
287
288 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
289 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
290 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
291 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
292
293 if (new_flags != bg_flags)
294 {
295 bg_flags = new_flags; 290 flags = new_flags;
291 h_scale = w;
292 v_scale = h;
293 h_align = x;
294 v_align = y;
296 changed = true; 295 changed = true;
297 } 296 }
298 297
298 if (!(flags & IM_TILE)
299 || h_scale || v_scale
300 || (!(flags & IM_ROOT_ALIGN) && (h_align || v_align)))
301 flags |= IM_IS_SIZE_SENSITIVE;
302 else
303 flags &= ~IM_IS_SIZE_SENSITIVE;
304
299 return changed; 305 return changed;
300} 306}
301 307
302void 308void
303rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 309rxvt_term::get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y)
304{ 310{
311 int image_width = image.width ();
312 int image_height = image.height ();
305 int target_width = szHint.width; 313 int target_width = szHint.width;
306 int target_height = szHint.height; 314 int target_height = szHint.height;
307 315
308 if (bg_flags & BG_PROP_SCALE) 316 w = image.h_scale * target_width / 100;
317 h = image.v_scale * target_height / 100;
318
319 if (image.flags & IM_KEEP_ASPECT)
309 { 320 {
310 float scale = (float)target_width / image_width; 321 float scale = (float)w / image_width;
311 min_it (scale, (float)target_height / image_height); 322 min_it (scale, (float)h / image_height);
312 w = image_width * scale + 0.5; 323 w = image_width * scale + 0.5;
313 h = image_height * scale + 0.5; 324 h = image_height * scale + 0.5;
314 } 325 }
315 else
316 {
317 w = h_scale * target_width / 100;
318 h = v_scale * target_height / 100;
319 }
320 326
321 if (!w) w = image_width; 327 if (!w) w = image_width;
322 if (!h) h = image_height; 328 if (!h) h = image_height;
323 329
324 if (bg_flags & BG_ROOT_ALIGN) 330 if (image.flags & IM_ROOT_ALIGN)
325 { 331 {
326 x = -target_x; 332 x = -target_x;
327 y = -target_y; 333 y = -target_y;
328 } 334 }
329 else 335 else
330 { 336 {
331 x = make_align_position (h_align, target_width, w); 337 x = make_align_position (image.h_align, target_width, w);
332 y = make_align_position (v_align, target_height, h); 338 y = make_align_position (image.v_align, target_height, h);
333 }
334
335 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
336 if (!(bg_flags & BG_TILE)
337 || (bg_flags & BG_PROP_SCALE) || h_scale || v_scale
338 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
339 || w > target_width || h > target_height)
340 bg_flags |= BG_IS_SIZE_SENSITIVE;
341}
342
343# ifdef HAVE_AFTERIMAGE
344bool
345rxvt_term::render_image (unsigned long tr_flags)
346{
347 init_asv ();
348
349 ASImage *background = NULL;
350 ARGB32 background_tint = TINT_LEAVE_SAME;
351
352# ifdef ENABLE_TRANSPARENCY
353 if (tr_flags)
354 background = pixmap2ximage (asv, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, 100);
355
356 if (tr_flags & BG_NEEDS_TINT)
357 { 339 }
358 ShadingInfo as_shade; 340}
359 as_shade.shading = shade;
360 341
361 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 342# ifdef HAVE_PIXBUF
362 if (bg_flags & BG_TINT_SET) 343bool
363 tint.get (c); 344rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
364 as_shade.tintColor.red = c.r; 345 int src_x, int src_y, int dst_x, int dst_y,
365 as_shade.tintColor.green = c.g; 346 unsigned int width, unsigned int height)
366 as_shade.tintColor.blue = c.b; 347{
348 XImage *ximage;
349 char *line;
350 int width_r, width_g, width_b, width_a;
351 int sh_r, sh_g, sh_b, sh_a;
352 uint32_t alpha_mask;
353 int rowstride;
354 int channels;
355 unsigned char *row;
367 356
368 background_tint = shading2tint32 (&as_shade); 357 if (visual->c_class != TrueColor)
358 return false;
359
360#if XRENDER
361 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
362 if (format)
363 alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha;
364 else
365#endif
366 alpha_mask = 0;
367
368 width_r = ecb_popcount32 (visual->red_mask);
369 width_g = ecb_popcount32 (visual->green_mask);
370 width_b = ecb_popcount32 (visual->blue_mask);
371 width_a = ecb_popcount32 (alpha_mask);
372
373 if (width_r > 8 || width_g > 8 || width_b > 8 || width_a > 8)
374 return false;
375
376 sh_r = ecb_ctz32 (visual->red_mask);
377 sh_g = ecb_ctz32 (visual->green_mask);
378 sh_b = ecb_ctz32 (visual->blue_mask);
379 sh_a = ecb_ctz32 (alpha_mask);
380
381 if (width > 32767 || height > 32767)
382 return false;
383
384 ximage = XCreateImage (dpy, visual, depth, ZPixmap, 0, 0,
385 width, height, 32, 0);
386 if (!ximage)
387 return false;
388
389 if (height > INT_MAX / ximage->bytes_per_line
390 || !(ximage->data = (char *)malloc (height * ximage->bytes_per_line)))
369 } 391 {
370 392 XDestroyImage (ximage);
371 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) 393 return false;
372 { 394 }
373 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 395
374 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 396 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
375 100, ASIMAGE_QUALITY_DEFAULT); 397
376 if (tmp) 398 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
399 channels = gdk_pixbuf_get_n_channels (pixbuf);
400 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
401 line = ximage->data;
402
403 rgba c (0, 0, 0);
404
405 if (channels == 4 && alpha_mask == 0)
406 {
407 pix_colors[Color_bg].get (c);
408 c.r >>= 8;
409 c.g >>= 8;
410 c.b >>= 8;
411 }
412
413 for (int y = 0; y < height; y++)
414 {
415 for (int x = 0; x < width; x++)
416 {
417 unsigned char *pixel = row + x * channels;
418 uint32_t value;
419 unsigned char r, g, b, a;
420
421 if (channels == 4)
377 { 422 {
378 destroy_asimage (&background); 423 a = pixel[3];
379 background = tmp; 424 r = (pixel[0] * a + c.r * (0xff - a)) / 0xff;
425 g = (pixel[1] * a + c.g * (0xff - a)) / 0xff;
426 b = (pixel[2] * a + c.b * (0xff - a)) / 0xff;
427 }
428 else
429 {
430 a = 0xff;
431 r = pixel[0];
432 g = pixel[1];
433 b = pixel[2];
434 }
435
436 value = ((r >> (8 - width_r)) << sh_r)
437 | ((g >> (8 - width_g)) << sh_g)
438 | ((b >> (8 - width_b)) << sh_b)
439 | ((a >> (8 - width_a)) << sh_a);
440
441 if (ximage->bits_per_pixel == 32)
442 ((uint32_t *)line)[x] = value;
443 else
444 XPutPixel (ximage, x, y, value);
380 } 445 }
381 }
382# endif
383 446
384 ASImage *result = 0; 447 row += rowstride;
448 line += ximage->bytes_per_line;
449 }
450
451 XPutImage (dpy, pixmap, gc, ximage, 0, 0, dst_x, dst_y, width, height);
452 XDestroyImage (ximage);
453 return true;
454}
455
456bool
457rxvt_term::render_image (rxvt_image &image)
458{
459 GdkPixbuf *pixbuf = image.pixbuf;
460 if (!pixbuf)
461 return false;
462
463 bool need_blend = bg_flags & BG_IS_VALID;
464
465 if (need_blend
466 && !(bg_flags & BG_HAS_RENDER))
467 return false;
468
469 GdkPixbuf *result;
470
471 int image_width = gdk_pixbuf_get_width (pixbuf);
472 int image_height = gdk_pixbuf_get_height (pixbuf);
385 473
386 int target_width = szHint.width; 474 int target_width = szHint.width;
387 int target_height = szHint.height; 475 int target_height = szHint.height;
388 int new_pmap_width = target_width; 476 int new_pmap_width = target_width;
389 int new_pmap_height = target_height; 477 int new_pmap_height = target_height;
391 int x = 0; 479 int x = 0;
392 int y = 0; 480 int y = 0;
393 int w = 0; 481 int w = 0;
394 int h = 0; 482 int h = 0;
395 483
396 if (original_asim) 484 get_image_geometry (image, w, h, x, y);
397 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
398 485
399 if (!original_asim
400 || (!(bg_flags & BG_ROOT_ALIGN)
401 && (x >= target_width
402 || y >= target_height
403 || (x + w <= 0)
404 || (y + h <= 0))))
405 {
406 if (background)
407 {
408 new_pmap_width = background->width;
409 new_pmap_height = background->height;
410 result = background;
411
412 if (background_tint != TINT_LEAVE_SAME)
413 {
414 ASImage *tmp = tile_asimage (asv, background, 0, 0,
415 target_width, target_height, background_tint,
416 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
417 if (tmp)
418 result = tmp;
419 }
420 }
421 else
422 new_pmap_width = new_pmap_height = 0;
423 }
424 else
425 {
426 result = original_asim;
427
428 if ((w != original_asim->width)
429 || (h != original_asim->height))
430 {
431 result = scale_asimage (asv, original_asim,
432 w, h,
433 background ? ASA_ASImage : ASA_XImage,
434 100, ASIMAGE_QUALITY_DEFAULT);
435 }
436
437 if (background == NULL)
438 {
439 if (bg_flags & BG_TILE)
440 {
441 /* if tiling - pixmap has to be sized exactly as the image,
442 but there is no need to make it bigger than the window! */
443 new_pmap_width = min (result->width, target_width);
444 new_pmap_height = min (result->height, target_height);
445
446 /* we also need to tile our image in both directions */
447 ASImage *tmp = tile_asimage (asv, result,
448 (int)result->width - x,
449 (int)result->height - y,
450 new_pmap_width,
451 new_pmap_height,
452 TINT_LEAVE_SAME, ASA_XImage,
453 100, ASIMAGE_QUALITY_DEFAULT);
454 if (tmp)
455 {
456 if (result != original_asim)
457 destroy_asimage (&result);
458
459 result = tmp;
460 }
461 }
462 }
463 else
464 {
465 /* if blending background and image - pixmap has to be sized same as target window */
466 ASImageLayer *layers = create_image_layers (2);
467
468 layers[0].im = background;
469 layers[0].clip_width = target_width;
470 layers[0].clip_height = target_height;
471 layers[0].tint = background_tint;
472 layers[1].im = result;
473
474 if (bg_flags & BG_TILE)
475 {
476 /* tile horizontally */
477 while (x > 0) x -= (int)result->width;
478 layers[1].dst_x = x;
479 layers[1].clip_width = result->width+target_width;
480 }
481 else
482 {
483 /* clip horizontally */
484 layers[1].dst_x = x;
485 layers[1].clip_width = result->width;
486 }
487
488 if (bg_flags & BG_TILE)
489 {
490 while (y > 0) y -= (int)result->height;
491 layers[1].dst_y = y;
492 layers[1].clip_height = result->height + target_height;
493 }
494 else
495 {
496 layers[1].dst_y = y;
497 layers[1].clip_height = result->height;
498 }
499
500 if (rs[Rs_blendtype])
501 {
502 layers[1].merge_scanlines = blend_scanlines_name2func (rs[Rs_blendtype]);
503 if (layers[1].merge_scanlines == NULL)
504 layers[1].merge_scanlines = alphablend_scanlines;
505 }
506
507 ASImage *tmp = merge_layers (asv, layers, 2, target_width, target_height,
508 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
509
510 if (tmp)
511 {
512 if (result != original_asim)
513 destroy_asimage (&result);
514
515 result = tmp;
516 }
517
518 free (layers);
519 }
520 }
521
522 bool ret = false;
523
524 if (result)
525 {
526 XGCValues gcv;
527 GC gc;
528
529 /* create Pixmap */
530 if (bg_pixmap == None
531 || bg_pmap_width != new_pmap_width
532 || bg_pmap_height != new_pmap_height)
533 {
534 if (bg_pixmap)
535 XFreePixmap (dpy, bg_pixmap);
536 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
537 bg_pmap_width = new_pmap_width;
538 bg_pmap_height = new_pmap_height;
539 }
540 /* fill with background color (if result's not completely overlapping it) */
541 gcv.foreground = pix_colors[Color_bg];
542 gc = XCreateGC (dpy, vt, GCForeground, &gcv);
543
544 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
545 int dst_width = result->width, dst_height = result->height;
546 if (background == NULL)
547 {
548 if (!(bg_flags & BG_TILE))
549 {
550 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
551 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
552 }
553
554 if (dst_x > 0 || dst_y > 0
555 || dst_x + dst_width < new_pmap_width
556 || dst_y + dst_height < new_pmap_height)
557 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
558 }
559
560 /* put result on pixmap */
561 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
562 asimage2drawable (asv, bg_pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
563
564 if (result != background && result != original_asim)
565 destroy_asimage (&result);
566
567 XFreeGC (dpy, gc);
568
569 ret = true;
570 }
571
572 if (background)
573 destroy_asimage (&background);
574
575 return ret;
576}
577# endif /* HAVE_AFTERIMAGE */
578
579# ifdef HAVE_PIXBUF
580bool
581rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
582 int src_x, int src_y, int dst_x, int dst_y,
583 unsigned int width, unsigned int height)
584{
585 XImage *ximage;
586 char *data, *line;
587 int bytes_per_pixel;
588 int width_r, width_g, width_b;
589 int sh_r, sh_g, sh_b;
590 int rowstride;
591 int channels;
592 unsigned char *row;
593
594 if (visual->c_class != TrueColor)
595 return false;
596
597 if (depth == 24 || depth == 32)
598 bytes_per_pixel = 4;
599 else if (depth == 15 || depth == 16)
600 bytes_per_pixel = 2;
601 else
602 return false;
603
604 width_r = ecb_popcount32 (visual->red_mask);
605 width_g = ecb_popcount32 (visual->green_mask);
606 width_b = ecb_popcount32 (visual->blue_mask);
607
608 if (width_r > 8 || width_g > 8 || width_b > 8)
609 return false;
610
611 sh_r = ecb_ctz32 (visual->red_mask);
612 sh_g = ecb_ctz32 (visual->green_mask);
613 sh_b = ecb_ctz32 (visual->blue_mask);
614
615 if (width > INT_MAX / height / bytes_per_pixel)
616 return false;
617
618 data = (char *)malloc (width * height * bytes_per_pixel);
619 if (!data)
620 return false;
621
622 ximage = XCreateImage (dpy, visual, depth, ZPixmap, 0, data,
623 width, height, bytes_per_pixel * 8, 0);
624 if (!ximage)
625 {
626 free (data);
627 return false;
628 }
629
630 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
631
632 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
633 channels = gdk_pixbuf_get_n_channels (pixbuf);
634 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
635 line = data;
636
637 for (int y = 0; y < height; y++)
638 {
639 for (int x = 0; x < width; x++)
640 {
641 unsigned char *pixel = row + x * channels;
642 uint32_t value;
643
644 value = ((pixel[0] >> (8 - width_r)) << sh_r)
645 | ((pixel[1] >> (8 - width_g)) << sh_g)
646 | ((pixel[2] >> (8 - width_b)) << sh_b);
647
648 if (bytes_per_pixel == 4)
649 ((uint32_t *)line)[x] = value;
650 else
651 ((uint16_t *)line)[x] = value;
652 }
653
654 row += rowstride;
655 line += ximage->bytes_per_line;
656 }
657
658 XPutImage (dpy, pixmap, gc, ximage, 0, 0, dst_x, dst_y, width, height);
659 XDestroyImage (ximage);
660 return true;
661}
662
663bool
664rxvt_term::render_image (unsigned long tr_flags)
665{
666 if (!pixbuf)
667 return false;
668
669 if (tr_flags
670 && !(bg_flags & BG_HAS_RENDER))
671 return false;
672
673 GdkPixbuf *result;
674
675 int image_width = gdk_pixbuf_get_width (pixbuf);
676 int image_height = gdk_pixbuf_get_height (pixbuf);
677
678 int target_width = szHint.width;
679 int target_height = szHint.height;
680 int new_pmap_width = target_width;
681 int new_pmap_height = target_height;
682
683 int x = 0;
684 int y = 0;
685 int w = 0;
686 int h = 0;
687
688 get_image_geometry (image_width, image_height, w, h, x, y);
689
690 if (!(bg_flags & BG_ROOT_ALIGN) 486 if (!(image.flags & IM_ROOT_ALIGN)
691 && (x >= target_width 487 && (x >= target_width
692 || y >= target_height 488 || y >= target_height
693 || (x + w <= 0) 489 || x + w <= 0
694 || (y + h <= 0))) 490 || y + h <= 0))
695 return false; 491 return false;
696 492
697 result = pixbuf; 493 result = pixbuf;
698 494
699 if ((w != image_width) 495 if (w != image_width
700 || (h != image_height)) 496 || h != image_height)
701 { 497 {
702 result = gdk_pixbuf_scale_simple (pixbuf, 498 result = gdk_pixbuf_scale_simple (pixbuf,
703 w, h, 499 w, h,
704 GDK_INTERP_BILINEAR); 500 GDK_INTERP_BILINEAR);
705 } 501 }
709 505
710 bool ret = false; 506 bool ret = false;
711 507
712 XGCValues gcv; 508 XGCValues gcv;
713 GC gc; 509 GC gc;
714 Pixmap root_pmap; 510 Pixmap tmp_pixmap;
715 511
716 image_width = gdk_pixbuf_get_width (result); 512 image_width = gdk_pixbuf_get_width (result);
717 image_height = gdk_pixbuf_get_height (result); 513 image_height = gdk_pixbuf_get_height (result);
718 514
719 if (tr_flags) 515 if (need_blend)
720 { 516 {
721 root_pmap = bg_pixmap; 517 tmp_pixmap = bg_pixmap;
722 bg_pixmap = None; 518 bg_pixmap = None;
723 } 519 }
724 else 520 else
725 { 521 {
726 if (bg_flags & BG_TILE) 522 if (image.flags & IM_TILE)
727 { 523 {
728 new_pmap_width = min (image_width, target_width); 524 new_pmap_width = min (image_width, target_width);
729 new_pmap_height = min (image_height, target_height); 525 new_pmap_height = min (image_height, target_height);
730 } 526 }
731 } 527 }
744 gcv.foreground = pix_colors[Color_bg]; 540 gcv.foreground = pix_colors[Color_bg];
745 gc = XCreateGC (dpy, vt, GCForeground, &gcv); 541 gc = XCreateGC (dpy, vt, GCForeground, &gcv);
746 542
747 if (gc) 543 if (gc)
748 { 544 {
749 if (bg_flags & BG_TILE) 545 if (image.flags & IM_TILE)
750 { 546 {
751 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth); 547 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth);
752 pixbuf_to_pixmap (result, tile, gc, 548 pixbuf_to_pixmap (result, tile, gc,
753 0, 0, 549 0, 0,
754 0, 0, 550 0, 0,
782 dst_x, dst_y, 578 dst_x, dst_y,
783 dst_width, dst_height); 579 dst_width, dst_height);
784 } 580 }
785 581
786#if XRENDER 582#if XRENDER
787 if (tr_flags) 583 if (need_blend)
788 { 584 {
789 XRenderPictureAttributes pa;
790
791 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, visual); 585 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
586
792 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 587 Picture src = XRenderCreatePicture (dpy, tmp_pixmap, format, 0, 0);
793 588
794 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
795 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, dst_format, 0, &pa); 589 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, format, 0, 0);
796 590
797 pa.repeat = True; 591 Picture mask = create_xrender_mask (dpy, vt, False, False);
798 Pixmap mask_pmap = XCreatePixmap (dpy, vt, 1, 1, 8);
799 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
800 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
801 XFreePixmap (dpy, mask_pmap);
802 592
803 XRenderColor mask_c; 593 XRenderColor mask_c;
804 594
805 mask_c.alpha = 0x8000; 595 mask_c.alpha = 0x8000;
806 mask_c.red = 0; 596 mask_c.red =
807 mask_c.green = 0; 597 mask_c.green =
808 mask_c.blue = 0; 598 mask_c.blue = 0;
809 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1); 599 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
600
810 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height); 601 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
811 602
812 XRenderFreePicture (dpy, src); 603 XRenderFreePicture (dpy, src);
813 XRenderFreePicture (dpy, dst); 604 XRenderFreePicture (dpy, dst);
814 XRenderFreePicture (dpy, mask); 605 XRenderFreePicture (dpy, mask);
821 } 612 }
822 613
823 if (result != pixbuf) 614 if (result != pixbuf)
824 g_object_unref (result); 615 g_object_unref (result);
825 616
826 if (tr_flags) 617 if (need_blend)
827 XFreePixmap (dpy, root_pmap); 618 XFreePixmap (dpy, tmp_pixmap);
828 619
829 return ret; 620 return ret;
830} 621}
831# endif /* HAVE_PIXBUF */ 622# endif /* HAVE_PIXBUF */
832 623
833bool 624bool
834rxvt_term::bg_set_file (const char *file) 625rxvt_image::set_file (const char *file)
835{ 626{
836 if (!file || !*file) 627 if (!file || !*file)
837 return false; 628 return false;
838 629
630 bool ret = false;
839 if (const char *p = strchr (file, ';')) 631 const char *p = strchr (file, ';');
632
633 if (p)
840 { 634 {
841 size_t len = p - file; 635 size_t len = p - file;
842 char *f = rxvt_temp_buf<char> (len + 1); 636 char *f = rxvt_temp_buf<char> (len + 1);
843 memcpy (f, file, len); 637 memcpy (f, file, len);
844 f[len] = '\0'; 638 f[len] = '\0';
845 file = f; 639 file = f;
846 } 640 }
847 641
848# ifdef HAVE_AFTERIMAGE
849 if (!asimman)
850 asimman = create_generic_imageman (rs[Rs_path]);
851 ASImage *image = get_asimage (asimman, file, 0xFFFFFFFF, 100);
852 if (image)
853 {
854 if (original_asim)
855 safe_asimage_destroy (original_asim);
856 original_asim = image;
857 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
858 return true;
859 }
860# endif
861
862# ifdef HAVE_PIXBUF 642# ifdef HAVE_PIXBUF
863 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 643 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
864 if (image) 644 if (image)
865 { 645 {
866 if (pixbuf) 646 if (pixbuf)
867 g_object_unref (pixbuf); 647 g_object_unref (pixbuf);
868 pixbuf = image; 648 pixbuf = image;
869 bg_flags |= BG_IS_FROM_FILE;
870 return true; 649 ret = true;
871 } 650 }
872# endif 651# endif
873 652
653 if (ret)
654 {
655 flags = IM_IS_SET | IM_IS_SIZE_SENSITIVE;
656 h_scale = v_scale = defaultScale;
657 h_align = v_align = defaultAlign;
658
659 if (p)
660 set_geometry (p + 1);
661 }
662
874 return false; 663 return ret;
875} 664}
876 665
877# endif /* BG_IMAGE_FROM_FILE */ 666# endif /* BG_IMAGE_FROM_FILE */
878 667
879# ifdef ENABLE_TRANSPARENCY 668# ifdef ENABLE_TRANSPARENCY
880bool
881rxvt_term::bg_set_transparent ()
882{
883 if (!(bg_flags & BG_IS_TRANSPARENT))
884 {
885 bg_flags |= BG_IS_TRANSPARENT;
886 return true;
887 }
888
889 return false;
890}
891
892bool 669bool
893rxvt_term::bg_set_blur (const char *geom) 670rxvt_term::bg_set_blur (const char *geom)
894{ 671{
895 bool changed = false; 672 bool changed = false;
896 unsigned int hr, vr; 673 unsigned int hr, vr;
915 { 692 {
916 changed = true; 693 changed = true;
917 v_blurRadius = vr; 694 v_blurRadius = vr;
918 } 695 }
919 696
920 if (v_blurRadius == 0 && h_blurRadius == 0)
921 bg_flags &= ~BG_NEEDS_BLUR;
922 else
923 bg_flags |= BG_NEEDS_BLUR;
924
925 return changed; 697 return changed;
926} 698}
927 699
928void 700bool
929rxvt_term::set_tint_shade_flags () 701rxvt_term::bg_set_tint (rxvt_color &new_tint)
930{ 702{
931 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 703 if (!(bg_flags & BG_TINT_SET) || tint != new_tint)
932 bool has_shade = shade != 100; 704 {
933 705 tint = new_tint;
934 bg_flags &= ~BG_TINT_FLAGS; 706 bg_flags |= BG_TINT_SET;
935 707
936 if (bg_flags & BG_TINT_SET) 708 rgba c;
937 {
938 tint.get (c); 709 tint.get (c);
939 if (!has_shade
940 && (c.r <= 0x00ff || c.r >= 0xff00) 710 if ((c.r <= 0x00ff || c.r >= 0xff00)
941 && (c.g <= 0x00ff || c.g >= 0xff00) 711 && (c.g <= 0x00ff || c.g >= 0xff00)
942 && (c.b <= 0x00ff || c.b >= 0xff00)) 712 && (c.b <= 0x00ff || c.b >= 0xff00))
943 bg_flags |= BG_TINT_BITAND; 713 bg_flags |= BG_TINT_BITAND;
944 } 714 else
945
946 if (has_shade || (bg_flags & BG_TINT_SET))
947 bg_flags |= BG_NEEDS_TINT;
948}
949
950bool
951rxvt_term::bg_set_tint (rxvt_color &new_tint)
952{
953 if (!(bg_flags & BG_TINT_SET) || tint != new_tint)
954 {
955 tint = new_tint;
956 bg_flags |= BG_TINT_SET; 715 bg_flags &= ~BG_TINT_BITAND;
957 set_tint_shade_flags (); 716
958 return true; 717 return true;
959 } 718 }
960 719
961 return false; 720 return false;
962} 721}
963 722
964bool 723bool
965rxvt_term::bg_set_shade (const char *shade_str) 724rxvt_term::bg_set_shade (const char *shade_str)
966{ 725{
967 int new_shade = (shade_str) ? atoi (shade_str) : 100; 726 int new_shade = atoi (shade_str);
968 727
969 clamp_it (new_shade, -100, 200); 728 clamp_it (new_shade, -100, 200);
970 if (new_shade < 0) 729 if (new_shade < 0)
971 new_shade = 200 - (100 + new_shade); 730 new_shade = 200 - (100 + new_shade);
972 731
973 if (new_shade != shade) 732 if (new_shade != shade)
974 { 733 {
975 shade = new_shade; 734 shade = new_shade;
976 set_tint_shade_flags ();
977 return true; 735 return true;
978 } 736 }
979 737
980 return false; 738 return false;
981} 739}
1002 params[i+2] = XDoubleToFixed (kernel[i] / sum); 760 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1003} 761}
1004#endif 762#endif
1005 763
1006bool 764bool
1007rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 765rxvt_term::blur_pixmap (Pixmap pixmap, int width, int height)
1008{ 766{
1009 bool ret = false; 767 bool ret = false;
1010#if XRENDER 768#if XRENDER
769 if (!(bg_flags & BG_HAS_RENDER_CONV))
770 return false;
771
1011 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 772 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1012 double *kernel = (double *)malloc (size * sizeof (double)); 773 double *kernel = (double *)malloc (size * sizeof (double));
1013 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 774 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1014 775
1015 XRenderPictureAttributes pa; 776 XRenderPictureAttributes pa;
1016 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 777 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1017 778
779 pa.repeat = RepeatPad;
1018 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 780 Picture src = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
781 Pixmap tmp = XCreatePixmap (dpy, pixmap, width, height, depth);
1019 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 782 Picture dst = XRenderCreatePicture (dpy, tmp, format, CPRepeat, &pa);
783 XFreePixmap (dpy, tmp);
1020 784
1021 if (kernel && params) 785 if (kernel && params)
1022 { 786 {
1023 if (h_blurRadius)
1024 {
1025 size = h_blurRadius * 2 + 1; 787 size = h_blurRadius * 2 + 1;
1026 get_gaussian_kernel (h_blurRadius, size, kernel, params); 788 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1027 789
1028 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 790 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1029 XRenderComposite (dpy, 791 XRenderComposite (dpy,
1030 PictOpSrc, 792 PictOpSrc,
1031 src, 793 src,
1032 None, 794 None,
1033 dst, 795 dst,
1034 0, 0, 796 0, 0,
1035 0, 0, 797 0, 0,
1036 0, 0, 798 0, 0,
1037 width, height); 799 width, height);
1038 }
1039 800
1040 if (v_blurRadius) 801 ::swap (src, dst);
1041 { 802
1042 size = v_blurRadius * 2 + 1; 803 size = v_blurRadius * 2 + 1;
1043 get_gaussian_kernel (v_blurRadius, size, kernel, params); 804 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1044 ::swap (params[0], params[1]); 805 ::swap (params[0], params[1]);
1045 806
1046 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 807 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1047 XRenderComposite (dpy, 808 XRenderComposite (dpy,
1048 PictOpSrc, 809 PictOpSrc,
1049 src, 810 src,
1050 None, 811 None,
1051 dst, 812 dst,
1052 0, 0, 813 0, 0,
1053 0, 0, 814 0, 0,
1054 0, 0, 815 0, 0,
1055 width, height); 816 width, height);
1056 }
1057 817
1058 ret = true; 818 ret = true;
1059 } 819 }
1060 820
1061 free (kernel); 821 free (kernel);
1065#endif 825#endif
1066 return ret; 826 return ret;
1067} 827}
1068 828
1069bool 829bool
1070rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 830rxvt_term::tint_pixmap (Pixmap pixmap, int width, int height)
1071{ 831{
1072 bool ret = false; 832 bool ret = false;
1073 833
1074 if (bg_flags & BG_TINT_BITAND) 834 if (shade == 100 && (bg_flags & BG_TINT_BITAND))
1075 { 835 {
1076 XGCValues gcv; 836 XGCValues gcv;
1077 GC gc; 837 GC gc;
1078 838
1079 /* In this case we can tint image server-side getting significant 839 /* In this case we can tint image server-side getting significant
1088 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height); 848 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1089 ret = true; 849 ret = true;
1090 XFreeGC (dpy, gc); 850 XFreeGC (dpy, gc);
1091 } 851 }
1092 } 852 }
1093 else
1094 {
1095# if XRENDER 853# if XRENDER
854 else if (bg_flags & BG_HAS_RENDER)
855 {
1096 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); 856 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1097 857
1098 if (bg_flags & BG_TINT_SET) 858 if (bg_flags & BG_TINT_SET)
1099 tint.get (c); 859 tint.get (c);
1100 860
1109 c.r = c.r * (200 - shade) / 100; 869 c.r = c.r * (200 - shade) / 100;
1110 c.g = c.g * (200 - shade) / 100; 870 c.g = c.g * (200 - shade) / 100;
1111 c.b = c.b * (200 - shade) / 100; 871 c.b = c.b * (200 - shade) / 100;
1112 } 872 }
1113 873
1114 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1115 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 874 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1116 XRenderPictureAttributes pa;
1117 875
1118 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 876 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, 0);
1119 877
1120 pa.repeat = True; 878 Picture overlay_pic = create_xrender_mask (dpy, pixmap, True, False);
1121 879
1122 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32); 880 Picture mask_pic = create_xrender_mask (dpy, pixmap, True, True);
1123 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1124 XFreePixmap (dpy, overlay_pmap);
1125
1126 pa.component_alpha = True;
1127 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1128 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat | CPComponentAlpha, &pa);
1129 XFreePixmap (dpy, mask_pmap);
1130 881
1131 XRenderColor mask_c; 882 XRenderColor mask_c;
1132 883
1133 mask_c.alpha = 0xffff; 884 mask_c.alpha = 0xffff;
1134 mask_c.red = 885 mask_c.red =
1139 mask_c.alpha = 0; 890 mask_c.alpha = 0;
1140 mask_c.red = 0xffff - c.r; 891 mask_c.red = 0xffff - c.r;
1141 mask_c.green = 0xffff - c.g; 892 mask_c.green = 0xffff - c.g;
1142 mask_c.blue = 0xffff - c.b; 893 mask_c.blue = 0xffff - c.b;
1143 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 894 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
895
1144 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height); 896 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1145 897
1146 if (shade > 100) 898 if (shade > 100)
1147 { 899 {
1148 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1149 mask_c.alpha = 0; 900 mask_c.alpha = 0;
901 mask_c.red =
902 mask_c.green =
903 mask_c.blue = 0xffff * (shade - 100) / 100;
1150 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 904 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1151 905
1152 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height); 906 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1153 } 907 }
1154 908
1155 ret = true; 909 ret = true;
1156 910
1157 XRenderFreePicture (dpy, mask_pic); 911 XRenderFreePicture (dpy, mask_pic);
1158 XRenderFreePicture (dpy, overlay_pic); 912 XRenderFreePicture (dpy, overlay_pic);
1159 XRenderFreePicture (dpy, back_pic); 913 XRenderFreePicture (dpy, back_pic);
914 }
1160# endif 915# endif
1161 }
1162 916
1163 return ret; 917 return ret;
1164} 918}
1165 919
1166/* 920/*
1167 * Builds a pixmap of the same size as the terminal window that contains 921 * Builds a pixmap of the same size as the terminal window that contains
1168 * the tiled portion of the root pixmap that is supposed to be covered by 922 * the tiled portion of the root pixmap that is supposed to be covered by
1169 * our window. 923 * our window.
1170 */ 924 */
1171unsigned long 925bool
1172rxvt_term::make_transparency_pixmap () 926rxvt_term::make_transparency_pixmap ()
1173{ 927{
1174 unsigned long result = 0; 928 bool ret = false;
1175 929
1176 /* root dimensions may change from call to call - but Display structure should 930 /* root dimensions may change from call to call - but Display structure should
1177 * be always up-to-date, so let's use it : 931 * be always up-to-date, so let's use it :
1178 */ 932 */
1179 int screen = display->screen; 933 int screen = display->screen;
1217#if XRENDER 971#if XRENDER
1218 if (bg_flags & BG_HAS_RENDER) 972 if (bg_flags & BG_HAS_RENDER)
1219 { 973 {
1220 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth); 974 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
1221 975
1222 XRenderPictureAttributes pa;
1223
1224 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen)); 976 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1225 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa); 977 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, 0);
1226 978
1227 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual); 979 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
1228 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa); 980 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, 0);
1229 981
1230 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height); 982 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1231 983
1232 XRenderFreePicture (dpy, src); 984 XRenderFreePicture (dpy, src);
1233 XRenderFreePicture (dpy, dst); 985 XRenderFreePicture (dpy, dst);
1250 bg_pmap_width = window_width; 1002 bg_pmap_width = window_width;
1251 bg_pmap_height = window_height; 1003 bg_pmap_height = window_height;
1252 } 1004 }
1253 1005
1254 /* straightforward pixmap copy */ 1006 /* straightforward pixmap copy */
1255 while (sx < 0) sx += root_width; 1007 while (sx < 0) sx += root_pmap_width;
1256 while (sy < 0) sy += root_height; 1008 while (sy < 0) sy += root_pmap_height;
1257 1009
1258 gcv.tile = recoded_root_pmap; 1010 gcv.tile = recoded_root_pmap;
1259 gcv.fill_style = FillTiled; 1011 gcv.fill_style = FillTiled;
1260 gcv.ts_x_origin = -sx; 1012 gcv.ts_x_origin = -sx;
1261 gcv.ts_y_origin = -sy; 1013 gcv.ts_y_origin = -sy;
1262 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1014 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1263 1015
1264 if (gc) 1016 if (gc)
1265 { 1017 {
1266 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height); 1018 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1267 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1019 ret = true;
1020 bool need_blur = h_blurRadius && v_blurRadius;
1021 bool need_tint = shade != 100 || (bg_flags & BG_TINT_SET);
1022
1023 if (!(bg_flags & BG_CLIENT_RENDER))
1024 {
1025 if (need_blur)
1026 {
1027 if (blur_pixmap (bg_pixmap, window_width, window_height))
1028 need_blur = false;
1029 }
1030 if (need_tint)
1031 {
1032 if (tint_pixmap (bg_pixmap, window_width, window_height))
1033 need_tint = false;
1034 }
1035 if (need_tint)
1036 {
1037 XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1038 if (ximage)
1039 {
1040 /* our own client-side tinting */
1041 tint_ximage (ximage);
1042
1043 XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height);
1044 XDestroyImage (ximage);
1045 }
1046 }
1047 } /* server side rendering completed */
1048
1268 XFreeGC (dpy, gc); 1049 XFreeGC (dpy, gc);
1269
1270 if (!(bg_flags & BG_CLIENT_RENDER))
1271 {
1272 if ((bg_flags & BG_NEEDS_BLUR)
1273 && (bg_flags & BG_HAS_RENDER_CONV))
1274 {
1275 if (blur_pixmap (bg_pixmap, visual, window_width, window_height))
1276 result &= ~BG_NEEDS_BLUR;
1277 }
1278 if ((bg_flags & BG_NEEDS_TINT)
1279 && (bg_flags & (BG_TINT_BITAND | BG_HAS_RENDER)))
1280 {
1281 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1282 result &= ~BG_NEEDS_TINT;
1283 }
1284 } /* server side rendering completed */
1285 } 1050 }
1286 1051
1287 if (recoded_root_pmap != root_pixmap) 1052 if (recoded_root_pmap != root_pixmap)
1288 XFreePixmap (dpy, recoded_root_pmap); 1053 XFreePixmap (dpy, recoded_root_pmap);
1289 1054
1290 return result; 1055 return ret;
1291} 1056}
1292 1057
1293void 1058void
1294rxvt_term::bg_set_root_pixmap () 1059rxvt_term::bg_set_root_pixmap ()
1295{ 1060{
1299 1064
1300 root_pixmap = new_root_pixmap; 1065 root_pixmap = new_root_pixmap;
1301} 1066}
1302# endif /* ENABLE_TRANSPARENCY */ 1067# endif /* ENABLE_TRANSPARENCY */
1303 1068
1304#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1305static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1306# endif
1307
1308bool 1069bool
1309rxvt_term::bg_render () 1070rxvt_term::bg_render ()
1310{ 1071{
1311 unsigned long tr_flags = 0;
1312
1313 bg_invalidate (); 1072 bg_invalidate ();
1314# ifdef ENABLE_TRANSPARENCY 1073# ifdef ENABLE_TRANSPARENCY
1315 if (bg_flags & BG_IS_TRANSPARENT) 1074 if (bg_flags & BG_IS_TRANSPARENT)
1316 { 1075 {
1317 /* we need to re-generate transparency pixmap in that case ! */ 1076 /* we need to re-generate transparency pixmap in that case ! */
1318 tr_flags = make_transparency_pixmap (); 1077 if (make_transparency_pixmap ())
1319 if (tr_flags == 0)
1320 return false;
1321 else if (!(tr_flags & BG_EFFECTS_FLAGS))
1322 bg_flags |= BG_IS_VALID; 1078 bg_flags |= BG_IS_VALID;
1323 } 1079 }
1324# endif 1080# endif
1325 1081
1326# ifdef BG_IMAGE_FROM_FILE 1082# ifdef BG_IMAGE_FROM_FILE
1327 if ((bg_flags & BG_IS_FROM_FILE) 1083 if (bg_image.flags & IM_IS_SET)
1328 || (tr_flags & BG_EFFECTS_FLAGS))
1329 { 1084 {
1330 if (render_image (tr_flags)) 1085 if (render_image (bg_image))
1331 bg_flags |= BG_IS_VALID; 1086 bg_flags |= BG_IS_VALID;
1332 }
1333# endif
1334
1335# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1336 XImage *result = NULL;
1337
1338 if (tr_flags && !(bg_flags & BG_IS_VALID))
1339 {
1340 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1341 }
1342
1343 if (result)
1344 {
1345 /* our own client-side tinting */
1346 if (tr_flags & BG_NEEDS_TINT)
1347 {
1348 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1349 if (bg_flags & BG_TINT_SET)
1350 tint.get (c);
1351 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c);
1352 }
1353
1354 GC gc = XCreateGC (dpy, vt, 0UL, NULL);
1355
1356 if (gc)
1357 {
1358 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1359
1360 XFreeGC (dpy, gc);
1361 bg_flags |= BG_IS_VALID;
1362 }
1363
1364 XDestroyImage (result);
1365 } 1087 }
1366# endif 1088# endif
1367 1089
1368 if (!(bg_flags & BG_IS_VALID)) 1090 if (!(bg_flags & BG_IS_VALID))
1369 { 1091 {
1406#endif 1128#endif
1407} 1129}
1408 1130
1409#endif /* HAVE_BG_PIXMAP */ 1131#endif /* HAVE_BG_PIXMAP */
1410 1132
1411#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1133#ifdef ENABLE_TRANSPARENCY
1412/* taken from aterm-0.4.2 */ 1134/* based on code from aterm-0.4.2 */
1413 1135
1414static void 1136static inline void
1415shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c) 1137fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1416{ 1138{
1139 for (int i = 0; i <= mask >> sh; i++)
1140 {
1141 uint32_t tmp;
1142 tmp = i * high;
1143 tmp += (mask >> sh) * low;
1144 lookup[i] = (tmp / 0xffff) << sh;
1145 }
1146}
1147
1148void
1149rxvt_term::tint_ximage (XImage *ximage)
1150{
1151 unsigned int size_r, size_g, size_b;
1417 int sh_r, sh_g, sh_b; 1152 int sh_r, sh_g, sh_b;
1418 uint32_t mask_r, mask_g, mask_b; 1153 uint32_t mask_r, mask_g, mask_b;
1419 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1154 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1420 rgba low; 1155 unsigned short low;
1421 rgba high;
1422 int i;
1423 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 1156 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1424 1157
1425 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; 1158 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1426 1159
1427 /* for convenience */ 1160 /* for convenience */
1428 mask_r = visual->red_mask; 1161 mask_r = visual->red_mask;
1429 mask_g = visual->green_mask; 1162 mask_g = visual->green_mask;
1430 mask_b = visual->blue_mask; 1163 mask_b = visual->blue_mask;
1431 1164
1432 /* boring lookup table pre-initialization */ 1165 /* boring lookup table pre-initialization */
1433 switch (ximage->depth) 1166 sh_r = ecb_ctz32 (mask_r);
1434 { 1167 sh_g = ecb_ctz32 (mask_g);
1435 case 15: 1168 sh_b = ecb_ctz32 (mask_b);
1436 if ((mask_r != 0x7c00) || 1169
1437 (mask_g != 0x03e0) || 1170 size_r = mask_r >> sh_r;
1438 (mask_b != 0x001f)) 1171 size_g = mask_g >> sh_g;
1172 size_b = mask_b >> sh_b;
1173
1174 if (size_r++ > 255 || size_g++ > 255 || size_b++ > 255)
1439 return; 1175 return;
1440 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32)); 1176
1177 lookup = (uint32_t *)malloc (sizeof (uint32_t) * (size_r + size_g + size_b));
1441 lookup_r = lookup; 1178 lookup_r = lookup;
1442 lookup_g = lookup+32; 1179 lookup_g = lookup + size_r;
1443 lookup_b = lookup+32+32; 1180 lookup_b = lookup + size_r + size_g;
1444 sh_r = 10; 1181
1445 sh_g = 5; 1182 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1446 sh_b = 0; 1183
1447 break; 1184 if (bg_flags & BG_TINT_SET)
1448 case 16: 1185 tint.get (c);
1449 if ((mask_r != 0xf800) ||
1450 (mask_g != 0x07e0) ||
1451 (mask_b != 0x001f))
1452 return;
1453 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1454 lookup_r = lookup;
1455 lookup_g = lookup+32;
1456 lookup_b = lookup+32+64;
1457 sh_r = 11;
1458 sh_g = 5;
1459 sh_b = 0;
1460 break;
1461 case 24:
1462 if ((mask_r != 0xff0000) ||
1463 (mask_g != 0x00ff00) ||
1464 (mask_b != 0x0000ff))
1465 return;
1466 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1467 lookup_r = lookup;
1468 lookup_g = lookup+256;
1469 lookup_b = lookup+256+256;
1470 sh_r = 16;
1471 sh_g = 8;
1472 sh_b = 0;
1473 break;
1474 case 32:
1475 if ((mask_r != 0xff0000) ||
1476 (mask_g != 0x00ff00) ||
1477 (mask_b != 0x0000ff))
1478 return;
1479 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1480 lookup_r = lookup;
1481 lookup_g = lookup+256;
1482 lookup_b = lookup+256+256;
1483 sh_r = 16;
1484 sh_g = 8;
1485 sh_b = 0;
1486 break;
1487 default:
1488 return; /* we do not support this color depth */
1489 }
1490 1186
1491 /* prepare limits for color transformation (each channel is handled separately) */ 1187 /* prepare limits for color transformation (each channel is handled separately) */
1492 if (shade > 100) 1188 if (shade > 100)
1493 { 1189 {
1494 shade = 200 - shade;
1495
1496 high.r = c.r * shade / 100;
1497 high.g = c.g * shade / 100;
1498 high.b = c.b * shade / 100;
1499
1500 low.r = 65535 * (100 - shade) / 100; 1190 c.r = c.r * (200 - shade) / 100;
1501 low.g = 65535 * (100 - shade) / 100; 1191 c.g = c.g * (200 - shade) / 100;
1502 low.b = 65535 * (100 - shade) / 100; 1192 c.b = c.b * (200 - shade) / 100;
1193
1194 low = 0xffff * (shade - 100) / 100;
1503 } 1195 }
1504 else 1196 else
1505 { 1197 {
1506 high.r = c.r * shade / 100; 1198 c.r = c.r * shade / 100;
1507 high.g = c.g * shade / 100; 1199 c.g = c.g * shade / 100;
1508 high.b = c.b * shade / 100; 1200 c.b = c.b * shade / 100;
1509 1201
1510 low.r = low.g = low.b = 0; 1202 low = 0;
1511 } 1203 }
1512 1204
1513 /* fill our lookup tables */ 1205 /* fill our lookup tables */
1514 for (i = 0; i <= mask_r>>sh_r; i++) 1206 fill_lut (lookup_r, mask_r, sh_r, low, c.r);
1515 { 1207 fill_lut (lookup_g, mask_g, sh_g, low, c.g);
1516 uint32_t tmp; 1208 fill_lut (lookup_b, mask_b, sh_b, low, c.b);
1517 tmp = i * high.r;
1518 tmp += (mask_r>>sh_r) * low.r;
1519 lookup_r[i] = (tmp/65535)<<sh_r;
1520 }
1521 for (i = 0; i <= mask_g>>sh_g; i++)
1522 {
1523 uint32_t tmp;
1524 tmp = i * high.g;
1525 tmp += (mask_g>>sh_g) * low.g;
1526 lookup_g[i] = (tmp/65535)<<sh_g;
1527 }
1528 for (i = 0; i <= mask_b>>sh_b; i++)
1529 {
1530 uint32_t tmp;
1531 tmp = i * high.b;
1532 tmp += (mask_b>>sh_b) * low.b;
1533 lookup_b[i] = (tmp/65535)<<sh_b;
1534 }
1535 1209
1536 /* apply table to input image (replacing colors by newly calculated ones) */ 1210 /* apply table to input image (replacing colors by newly calculated ones) */
1537 if (ximage->bits_per_pixel == 32 1211 if (ximage->bits_per_pixel == 32
1538 && (ximage->depth == 24 || ximage->depth == 32)
1539 && ximage->byte_order == host_byte_order) 1212 && ximage->byte_order == host_byte_order)
1540 { 1213 {
1541 uint32_t *p1, *pf, *p, *pl; 1214 char *line = ximage->data;
1542 p1 = (uint32_t *) ximage->data;
1543 pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line);
1544 1215
1545 while (p1 < pf) 1216 for (int y = 0; y < ximage->height; y++)
1546 {
1547 p = p1;
1548 pl = p1 + ximage->width;
1549 for (; p < pl; p++)
1550 { 1217 {
1551 *p = lookup_r[(*p & 0xff0000) >> 16] | 1218 uint32_t *p = (uint32_t *)line;
1552 lookup_g[(*p & 0x00ff00) >> 8] | 1219 for (int x = 0; x < ximage->width; x++)
1553 lookup_b[(*p & 0x0000ff)] |
1554 (*p & 0xff000000);
1555 } 1220 {
1556 p1 = (uint32_t *) ((char *) p1 + ximage->bytes_per_line); 1221 *p = lookup_r[(*p & mask_r) >> sh_r] |
1222 lookup_g[(*p & mask_g) >> sh_g] |
1223 lookup_b[(*p & mask_b) >> sh_b];
1224 p++;
1225 }
1226 line += ximage->bytes_per_line;
1557 } 1227 }
1558 } 1228 }
1559 else 1229 else
1560 { 1230 {
1561 for (int y = 0; y < ximage->height; y++) 1231 for (int y = 0; y < ximage->height; y++)
1569 } 1239 }
1570 } 1240 }
1571 1241
1572 free (lookup); 1242 free (lookup);
1573} 1243}
1574#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1244#endif /* ENABLE_TRANSPARENCY */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines