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.199 by sf-exg, Tue Jan 17 19:51:30 2012 UTC vs.
Revision 1.214 by sf-exg, Thu May 17 10:18:32 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>
58# endif 58# endif
59 59
60void 60void
61rxvt_term::bg_destroy () 61rxvt_term::bg_destroy ()
62{ 62{
63#ifdef HAVE_AFTERIMAGE
64 if (original_asim)
65 safe_asimage_destroy (original_asim);
66 if (asv)
67 destroy_asvisual (asv, 0);
68 if (asimman)
69 destroy_image_manager (asimman, 0);
70#endif
71
72#ifdef HAVE_PIXBUF
73 if (pixbuf)
74 g_object_unref (pixbuf);
75#endif
76
77 if (bg_pixmap) 63 if (bg_pixmap)
78 XFreePixmap (dpy, bg_pixmap); 64 XFreePixmap (dpy, bg_pixmap);
79} 65}
80 66
81bool 67bool
99 if (bg_flags & BG_IS_TRANSPARENT) 85 if (bg_flags & BG_IS_TRANSPARENT)
100 return true; 86 return true;
101# endif 87# endif
102 88
103# ifdef BG_IMAGE_FROM_FILE 89# ifdef BG_IMAGE_FROM_FILE
104 if (bg_flags & BG_IS_FROM_FILE) 90 if (bg_image.flags & IM_IS_SET)
105 { 91 {
106 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)
107 return true; 95 return true;
108 } 96 }
109# endif 97# endif
110 98
111 return false; 99 return false;
118 if (bg_flags & BG_IS_TRANSPARENT) 106 if (bg_flags & BG_IS_TRANSPARENT)
119 return true; 107 return true;
120# endif 108# endif
121 109
122# ifdef BG_IMAGE_FROM_FILE 110# ifdef BG_IMAGE_FROM_FILE
123 if (bg_flags & BG_IS_FROM_FILE) 111 if (bg_image.flags & IM_IS_SET)
124 { 112 {
125 if (bg_flags & BG_ROOT_ALIGN) 113 if (bg_image.flags & IM_ROOT_ALIGN)
126 return true; 114 return true;
127 } 115 }
128# endif 116# endif
129 117
130 return false; 118 return false;
132 120
133# ifdef BG_IMAGE_FROM_FILE 121# ifdef BG_IMAGE_FROM_FILE
134static inline int 122static inline int
135make_align_position (int align, int window_size, int image_size) 123make_align_position (int align, int window_size, int image_size)
136{ 124{
137 int diff = window_size - image_size;
138 int smaller = min (image_size, window_size);
139
140 if (align >= 0 && align <= 100) 125 if (align >= 0 && align <= 100)
141 return diff * align / 100; 126 return lerp (0, window_size - image_size, align);
142 else if (align > 100 && align <= 200) 127 else if (align > 100)
143 return (align - 100) * smaller / 100 + window_size - smaller; 128 return lerp (window_size - image_size, window_size, align - 100);
144 else if (align >= -100 && align < 0) 129 else
145 return (align + 100) * smaller / 100 - image_size; 130 return lerp (-image_size, 0, align + 100);
146 return 0;
147} 131}
148 132
149static inline int 133static inline int
150make_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)
151{ 135{
162 min_it (dst_size, target_size - dst_pos); 146 min_it (dst_size, target_size - dst_pos);
163 return src_pos; 147 return src_pos;
164} 148}
165 149
166bool 150bool
167rxvt_term::bg_set_geometry (const char *geom, bool update) 151rxvt_image::set_geometry (const char *geom, bool update)
168{ 152{
169 bool changed = false; 153 bool changed = false;
170 int geom_flags = 0; 154 int geom_flags = 0;
171 int x = h_align; 155 int x = h_align;
172 int y = v_align; 156 int y = v_align;
183 167
184 for (int i = 0; arr[i]; i++) 168 for (int i = 0; arr[i]; i++)
185 { 169 {
186 if (!strcasecmp (arr[i], "style=tiled")) 170 if (!strcasecmp (arr[i], "style=tiled"))
187 { 171 {
188 new_flags = BG_TILE; 172 new_flags = IM_TILE;
189 w = h = noScale; 173 w = h = noScale;
190 x = y = 0; 174 x = y = 0;
191 geom_flags = WidthValue|HeightValue|XValue|YValue; 175 geom_flags = WidthValue|HeightValue|XValue|YValue;
192 } 176 }
193 else if (!strcasecmp (arr[i], "style=aspect-stretched")) 177 else if (!strcasecmp (arr[i], "style=aspect-stretched"))
194 { 178 {
195 new_flags = BG_KEEP_ASPECT; 179 new_flags = IM_KEEP_ASPECT;
196 w = h = windowScale; 180 w = h = windowScale;
197 x = y = centerAlign; 181 x = y = centerAlign;
198 geom_flags = WidthValue|HeightValue|XValue|YValue; 182 geom_flags = WidthValue|HeightValue|XValue|YValue;
199 } 183 }
200 else if (!strcasecmp (arr[i], "style=stretched")) 184 else if (!strcasecmp (arr[i], "style=stretched"))
210 x = y = centerAlign; 194 x = y = centerAlign;
211 geom_flags = WidthValue|HeightValue|XValue|YValue; 195 geom_flags = WidthValue|HeightValue|XValue|YValue;
212 } 196 }
213 else if (!strcasecmp (arr[i], "style=root-tiled")) 197 else if (!strcasecmp (arr[i], "style=root-tiled"))
214 { 198 {
215 new_flags = BG_TILE|BG_ROOT_ALIGN; 199 new_flags = IM_TILE|IM_ROOT_ALIGN;
216 w = h = noScale; 200 w = h = noScale;
217 geom_flags = WidthValue|HeightValue; 201 geom_flags = WidthValue|HeightValue;
218 } 202 }
219 else if (!strcasecmp (arr[i], "op=tile")) 203 else if (!strcasecmp (arr[i], "op=tile"))
220 new_flags |= BG_TILE; 204 new_flags |= IM_TILE;
221 else if (!strcasecmp (arr[i], "op=keep-aspect")) 205 else if (!strcasecmp (arr[i], "op=keep-aspect"))
222 new_flags |= BG_KEEP_ASPECT; 206 new_flags |= IM_KEEP_ASPECT;
223 else if (!strcasecmp (arr[i], "op=root-align")) 207 else if (!strcasecmp (arr[i], "op=root-align"))
224 new_flags |= BG_ROOT_ALIGN; 208 new_flags |= IM_ROOT_ALIGN;
225 209
226 // deprecated 210 // deprecated
227 else if (!strcasecmp (arr[i], "tile")) 211 else if (!strcasecmp (arr[i], "tile"))
228 { 212 {
229 new_flags |= BG_TILE; 213 new_flags |= IM_TILE;
230 w = h = noScale; 214 w = h = noScale;
231 geom_flags |= WidthValue|HeightValue; 215 geom_flags |= WidthValue|HeightValue;
232 } 216 }
233 else if (!strcasecmp (arr[i], "propscale")) 217 else if (!strcasecmp (arr[i], "propscale"))
234 { 218 {
235 new_flags |= BG_KEEP_ASPECT; 219 new_flags |= IM_KEEP_ASPECT;
236 w = h = windowScale; 220 w = h = windowScale;
237 geom_flags |= WidthValue|HeightValue; 221 geom_flags |= WidthValue|HeightValue;
238 } 222 }
239 else if (!strcasecmp (arr[i], "hscale")) 223 else if (!strcasecmp (arr[i], "hscale"))
240 { 224 {
241 new_flags |= BG_TILE; 225 new_flags |= IM_TILE;
242 w = windowScale; 226 w = windowScale;
243 h = noScale; 227 h = noScale;
244 geom_flags |= WidthValue|HeightValue; 228 geom_flags |= WidthValue|HeightValue;
245 } 229 }
246 else if (!strcasecmp (arr[i], "vscale")) 230 else if (!strcasecmp (arr[i], "vscale"))
247 { 231 {
248 new_flags |= BG_TILE; 232 new_flags |= IM_TILE;
249 h = windowScale; 233 h = windowScale;
250 w = noScale; 234 w = noScale;
251 geom_flags |= WidthValue|HeightValue; 235 geom_flags |= WidthValue|HeightValue;
252 } 236 }
253 else if (!strcasecmp (arr[i], "scale")) 237 else if (!strcasecmp (arr[i], "scale"))
261 x = y = centerAlign; 245 x = y = centerAlign;
262 geom_flags |= WidthValue|HeightValue|XValue|YValue; 246 geom_flags |= WidthValue|HeightValue|XValue|YValue;
263 } 247 }
264 else if (!strcasecmp (arr[i], "root")) 248 else if (!strcasecmp (arr[i], "root"))
265 { 249 {
266 new_flags |= BG_TILE|BG_ROOT_ALIGN; 250 new_flags |= IM_TILE|IM_ROOT_ALIGN;
267 w = h = noScale; 251 w = h = noScale;
268 geom_flags |= WidthValue|HeightValue; 252 geom_flags |= WidthValue|HeightValue;
269 } 253 }
270 254
271 else 255 else
273 } /* done parsing ops */ 257 } /* done parsing ops */
274 258
275 rxvt_free_strsplit (arr); 259 rxvt_free_strsplit (arr);
276 } 260 }
277 261
278 new_flags |= bg_flags & ~BG_GEOMETRY_FLAGS; 262 new_flags |= flags & ~IM_GEOMETRY_FLAGS;
279 263
280 if (!update) 264 if (!update)
281 { 265 {
282 if (!(geom_flags & XValue)) 266 if (!(geom_flags & XValue))
283 x = y = defaultAlign; 267 x = y = defaultAlign;
295 min_it (w, 1000); 279 min_it (w, 1000);
296 min_it (h, 1000); 280 min_it (h, 1000);
297 clamp_it (x, -100, 200); 281 clamp_it (x, -100, 200);
298 clamp_it (y, -100, 200); 282 clamp_it (y, -100, 200);
299 283
300 if (bg_flags != new_flags 284 if (flags != new_flags
301 || h_scale != w 285 || h_scale != w
302 || v_scale != h 286 || v_scale != h
303 || h_align != x 287 || h_align != x
304 || v_align != y) 288 || v_align != y)
305 { 289 {
306 bg_flags = new_flags; 290 flags = new_flags;
307 h_scale = w; 291 h_scale = w;
308 v_scale = h; 292 v_scale = h;
309 h_align = x; 293 h_align = x;
310 v_align = y; 294 v_align = y;
311 changed = true; 295 changed = true;
312 } 296 }
313 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
314 return changed; 305 return changed;
315} 306}
316 307
317void 308void
318rxvt_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)
319{ 310{
311 int image_width = image.width ();
312 int image_height = image.height ();
320 int target_width = szHint.width; 313 int target_width = szHint.width;
321 int target_height = szHint.height; 314 int target_height = szHint.height;
322 315
323 w = h_scale * target_width / 100; 316 w = image.h_scale * target_width / 100;
324 h = v_scale * target_height / 100; 317 h = image.v_scale * target_height / 100;
325 318
326 if (bg_flags & BG_KEEP_ASPECT) 319 if (image.flags & IM_KEEP_ASPECT)
327 { 320 {
328 float scale = (float)w / image_width; 321 float scale = (float)w / image_width;
329 min_it (scale, (float)h / image_height); 322 min_it (scale, (float)h / image_height);
330 w = image_width * scale + 0.5; 323 w = image_width * scale + 0.5;
331 h = image_height * scale + 0.5; 324 h = image_height * scale + 0.5;
332 } 325 }
333 326
334 if (!w) w = image_width; 327 if (!w) w = image_width;
335 if (!h) h = image_height; 328 if (!h) h = image_height;
336 329
337 if (bg_flags & BG_ROOT_ALIGN) 330 if (image.flags & IM_ROOT_ALIGN)
338 { 331 {
339 x = -target_x; 332 x = -target_x;
340 y = -target_y; 333 y = -target_y;
341 } 334 }
342 else 335 else
343 { 336 {
344 x = make_align_position (h_align, target_width, w); 337 x = make_align_position (image.h_align, target_width, w);
345 y = make_align_position (v_align, target_height, h); 338 y = make_align_position (image.v_align, target_height, h);
346 }
347
348 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
349 if (!(bg_flags & BG_TILE)
350 || h_scale || v_scale
351 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
352 || w > target_width || h > target_height)
353 bg_flags |= BG_IS_SIZE_SENSITIVE;
354}
355
356# ifdef HAVE_AFTERIMAGE
357bool
358rxvt_term::render_image (unsigned long tr_flags)
359{
360 init_asv ();
361
362 ASImage *background = NULL;
363 ARGB32 background_tint = TINT_LEAVE_SAME;
364
365# ifdef ENABLE_TRANSPARENCY
366 if (tr_flags)
367 background = pixmap2ximage (asv, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, 100);
368
369 if (tr_flags & BG_NEEDS_TINT)
370 { 339 }
371 ShadingInfo as_shade; 340}
372 as_shade.shading = shade;
373 341
374 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 342# ifdef HAVE_PIXBUF
375 if (bg_flags & BG_TINT_SET) 343bool
376 tint.get (c); 344rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
377 as_shade.tintColor.red = c.r; 345 int src_x, int src_y, int dst_x, int dst_y,
378 as_shade.tintColor.green = c.g; 346 unsigned int width, unsigned int height)
379 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;
380 356
381 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)))
382 } 391 {
383 392 XDestroyImage (ximage);
384 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) 393 return false;
385 { 394 }
386 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 395
387 ASA_XImage, 396 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
388 100, ASIMAGE_QUALITY_DEFAULT); 397
389 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)
390 { 422 {
391 destroy_asimage (&background); 423 a = pixel[3];
392 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);
393 } 445 }
394 }
395# endif
396 446
397 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, bool transparent)
458{
459 GdkPixbuf *pixbuf = image.pixbuf;
460 if (!pixbuf)
461 return false;
462
463 if (transparent
464 && !(bg_flags & BG_HAS_RENDER))
465 return false;
466
467 GdkPixbuf *result;
468
469 int image_width = gdk_pixbuf_get_width (pixbuf);
470 int image_height = gdk_pixbuf_get_height (pixbuf);
398 471
399 int target_width = szHint.width; 472 int target_width = szHint.width;
400 int target_height = szHint.height; 473 int target_height = szHint.height;
401 int new_pmap_width = target_width; 474 int new_pmap_width = target_width;
402 int new_pmap_height = target_height; 475 int new_pmap_height = target_height;
404 int x = 0; 477 int x = 0;
405 int y = 0; 478 int y = 0;
406 int w = 0; 479 int w = 0;
407 int h = 0; 480 int h = 0;
408 481
409 if (original_asim) 482 get_image_geometry (image, w, h, x, y);
410 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
411 483
412 if (!original_asim
413 || (!(bg_flags & BG_ROOT_ALIGN)
414 && (x >= target_width
415 || y >= target_height
416 || x + w <= 0
417 || y + h <= 0)))
418 {
419 if (background)
420 {
421 new_pmap_width = background->width;
422 new_pmap_height = background->height;
423 result = background;
424
425 if (background_tint != TINT_LEAVE_SAME)
426 {
427 ASImage *tmp = tile_asimage (asv, background, 0, 0,
428 target_width, target_height, background_tint,
429 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
430 if (tmp)
431 result = tmp;
432 }
433 }
434 else
435 new_pmap_width = new_pmap_height = 0;
436 }
437 else
438 {
439 result = original_asim;
440
441 if (w != original_asim->width
442 || h != original_asim->height)
443 {
444 result = scale_asimage (asv, original_asim,
445 w, h,
446 ASA_XImage,
447 100, ASIMAGE_QUALITY_DEFAULT);
448 }
449
450 if (background == NULL)
451 {
452 if (bg_flags & BG_TILE)
453 {
454 /* if tiling - pixmap has to be sized exactly as the image,
455 but there is no need to make it bigger than the window! */
456 new_pmap_width = min (result->width, target_width);
457 new_pmap_height = min (result->height, target_height);
458
459 /* we also need to tile our image in both directions */
460 ASImage *tmp = tile_asimage (asv, result,
461 (int)result->width - x,
462 (int)result->height - y,
463 new_pmap_width,
464 new_pmap_height,
465 TINT_LEAVE_SAME, ASA_XImage,
466 100, ASIMAGE_QUALITY_DEFAULT);
467 if (tmp)
468 {
469 if (result != original_asim)
470 destroy_asimage (&result);
471
472 result = tmp;
473 }
474 }
475 }
476 else
477 {
478 /* if blending background and image - pixmap has to be sized same as target window */
479 ASImageLayer *layers = create_image_layers (2);
480
481 layers[0].im = background;
482 layers[0].clip_width = target_width;
483 layers[0].clip_height = target_height;
484 layers[0].tint = background_tint;
485 layers[1].im = result;
486
487 if (bg_flags & BG_TILE)
488 {
489 /* tile horizontally */
490 while (x > 0) x -= (int)result->width;
491 layers[1].dst_x = x;
492 layers[1].clip_width = result->width+target_width;
493 }
494 else
495 {
496 /* clip horizontally */
497 layers[1].dst_x = x;
498 layers[1].clip_width = result->width;
499 }
500
501 if (bg_flags & BG_TILE)
502 {
503 while (y > 0) y -= (int)result->height;
504 layers[1].dst_y = y;
505 layers[1].clip_height = result->height + target_height;
506 }
507 else
508 {
509 layers[1].dst_y = y;
510 layers[1].clip_height = result->height;
511 }
512
513 if (rs[Rs_blendtype])
514 {
515 layers[1].merge_scanlines = blend_scanlines_name2func (rs[Rs_blendtype]);
516 if (layers[1].merge_scanlines == NULL)
517 layers[1].merge_scanlines = alphablend_scanlines;
518 }
519
520 ASImage *tmp = merge_layers (asv, layers, 2, target_width, target_height,
521 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
522
523 if (tmp)
524 {
525 if (result != original_asim)
526 destroy_asimage (&result);
527
528 result = tmp;
529 }
530
531 free (layers);
532 }
533 }
534
535 bool ret = false;
536
537 if (result)
538 {
539 XGCValues gcv;
540 GC gc;
541
542 /* create Pixmap */
543 if (bg_pixmap == None
544 || bg_pmap_width != new_pmap_width
545 || bg_pmap_height != new_pmap_height)
546 {
547 if (bg_pixmap)
548 XFreePixmap (dpy, bg_pixmap);
549 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
550 bg_pmap_width = new_pmap_width;
551 bg_pmap_height = new_pmap_height;
552 }
553 /* fill with background color (if result's not completely overlapping it) */
554 gcv.foreground = pix_colors[Color_bg];
555 gc = XCreateGC (dpy, vt, GCForeground, &gcv);
556
557 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
558 int dst_width = result->width, dst_height = result->height;
559 if (background == NULL)
560 {
561 if (!(bg_flags & BG_TILE))
562 {
563 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
564 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
565 }
566
567 if (dst_x > 0 || dst_y > 0
568 || dst_x + dst_width < new_pmap_width
569 || dst_y + dst_height < new_pmap_height)
570 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
571 }
572
573 /* put result on pixmap */
574 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
575 asimage2drawable (asv, bg_pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
576
577 if (result != background && result != original_asim)
578 destroy_asimage (&result);
579
580 XFreeGC (dpy, gc);
581
582 ret = true;
583 }
584
585 if (background)
586 destroy_asimage (&background);
587
588 return ret;
589}
590# endif /* HAVE_AFTERIMAGE */
591
592# ifdef HAVE_PIXBUF
593bool
594rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
595 int src_x, int src_y, int dst_x, int dst_y,
596 unsigned int width, unsigned int height)
597{
598 XImage *ximage;
599 char *data, *line;
600 int bytes_per_pixel;
601 int width_r, width_g, width_b;
602 int sh_r, sh_g, sh_b;
603 int rowstride;
604 int channels;
605 unsigned char *row;
606
607 if (visual->c_class != TrueColor)
608 return false;
609
610 if (depth == 24 || depth == 32)
611 bytes_per_pixel = 4;
612 else if (depth == 15 || depth == 16)
613 bytes_per_pixel = 2;
614 else
615 return false;
616
617 width_r = ecb_popcount32 (visual->red_mask);
618 width_g = ecb_popcount32 (visual->green_mask);
619 width_b = ecb_popcount32 (visual->blue_mask);
620
621 if (width_r > 8 || width_g > 8 || width_b > 8)
622 return false;
623
624 sh_r = ecb_ctz32 (visual->red_mask);
625 sh_g = ecb_ctz32 (visual->green_mask);
626 sh_b = ecb_ctz32 (visual->blue_mask);
627
628 if (width > INT_MAX / height / bytes_per_pixel)
629 return false;
630
631 data = (char *)malloc (width * height * bytes_per_pixel);
632 if (!data)
633 return false;
634
635 ximage = XCreateImage (dpy, visual, depth, ZPixmap, 0, data,
636 width, height, bytes_per_pixel * 8, 0);
637 if (!ximage)
638 {
639 free (data);
640 return false;
641 }
642
643 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
644
645 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
646 channels = gdk_pixbuf_get_n_channels (pixbuf);
647 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
648 line = data;
649
650 for (int y = 0; y < height; y++)
651 {
652 for (int x = 0; x < width; x++)
653 {
654 unsigned char *pixel = row + x * channels;
655 uint32_t value;
656
657 value = ((pixel[0] >> (8 - width_r)) << sh_r)
658 | ((pixel[1] >> (8 - width_g)) << sh_g)
659 | ((pixel[2] >> (8 - width_b)) << sh_b);
660
661 if (bytes_per_pixel == 4)
662 ((uint32_t *)line)[x] = value;
663 else
664 ((uint16_t *)line)[x] = value;
665 }
666
667 row += rowstride;
668 line += ximage->bytes_per_line;
669 }
670
671 XPutImage (dpy, pixmap, gc, ximage, 0, 0, dst_x, dst_y, width, height);
672 XDestroyImage (ximage);
673 return true;
674}
675
676bool
677rxvt_term::render_image (unsigned long tr_flags)
678{
679 if (!pixbuf)
680 return false;
681
682 if (tr_flags
683 && !(bg_flags & BG_HAS_RENDER))
684 return false;
685
686 GdkPixbuf *result;
687
688 int image_width = gdk_pixbuf_get_width (pixbuf);
689 int image_height = gdk_pixbuf_get_height (pixbuf);
690
691 int target_width = szHint.width;
692 int target_height = szHint.height;
693 int new_pmap_width = target_width;
694 int new_pmap_height = target_height;
695
696 int x = 0;
697 int y = 0;
698 int w = 0;
699 int h = 0;
700
701 get_image_geometry (image_width, image_height, w, h, x, y);
702
703 if (!(bg_flags & BG_ROOT_ALIGN) 484 if (!(image.flags & IM_ROOT_ALIGN)
704 && (x >= target_width 485 && (x >= target_width
705 || y >= target_height 486 || y >= target_height
706 || x + w <= 0 487 || x + w <= 0
707 || y + h <= 0)) 488 || y + h <= 0))
708 return false; 489 return false;
727 Pixmap root_pmap; 508 Pixmap root_pmap;
728 509
729 image_width = gdk_pixbuf_get_width (result); 510 image_width = gdk_pixbuf_get_width (result);
730 image_height = gdk_pixbuf_get_height (result); 511 image_height = gdk_pixbuf_get_height (result);
731 512
732 if (tr_flags) 513 if (transparent)
733 { 514 {
734 root_pmap = bg_pixmap; 515 root_pmap = bg_pixmap;
735 bg_pixmap = None; 516 bg_pixmap = None;
736 } 517 }
737 else 518 else
738 { 519 {
739 if (bg_flags & BG_TILE) 520 if (image.flags & IM_TILE)
740 { 521 {
741 new_pmap_width = min (image_width, target_width); 522 new_pmap_width = min (image_width, target_width);
742 new_pmap_height = min (image_height, target_height); 523 new_pmap_height = min (image_height, target_height);
743 } 524 }
744 } 525 }
757 gcv.foreground = pix_colors[Color_bg]; 538 gcv.foreground = pix_colors[Color_bg];
758 gc = XCreateGC (dpy, vt, GCForeground, &gcv); 539 gc = XCreateGC (dpy, vt, GCForeground, &gcv);
759 540
760 if (gc) 541 if (gc)
761 { 542 {
762 if (bg_flags & BG_TILE) 543 if (image.flags & IM_TILE)
763 { 544 {
764 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth); 545 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth);
765 pixbuf_to_pixmap (result, tile, gc, 546 pixbuf_to_pixmap (result, tile, gc,
766 0, 0, 547 0, 0,
767 0, 0, 548 0, 0,
795 dst_x, dst_y, 576 dst_x, dst_y,
796 dst_width, dst_height); 577 dst_width, dst_height);
797 } 578 }
798 579
799#if XRENDER 580#if XRENDER
800 if (tr_flags) 581 if (transparent)
801 { 582 {
802 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 583 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
803 584
804 Picture src = XRenderCreatePicture (dpy, root_pmap, format, 0, 0); 585 Picture src = XRenderCreatePicture (dpy, root_pmap, format, 0, 0);
805 586
829 } 610 }
830 611
831 if (result != pixbuf) 612 if (result != pixbuf)
832 g_object_unref (result); 613 g_object_unref (result);
833 614
834 if (tr_flags) 615 if (transparent)
835 XFreePixmap (dpy, root_pmap); 616 XFreePixmap (dpy, root_pmap);
836 617
837 return ret; 618 return ret;
838} 619}
839# endif /* HAVE_PIXBUF */ 620# endif /* HAVE_PIXBUF */
840 621
841bool 622bool
842rxvt_term::bg_set_file (const char *file) 623rxvt_image::set_file (const char *file)
843{ 624{
844 if (!file || !*file) 625 if (!file || !*file)
845 return false; 626 return false;
846 627
847 bool ret = false; 628 bool ret = false;
854 memcpy (f, file, len); 635 memcpy (f, file, len);
855 f[len] = '\0'; 636 f[len] = '\0';
856 file = f; 637 file = f;
857 } 638 }
858 639
859# ifdef HAVE_AFTERIMAGE
860 if (!asimman)
861 asimman = create_generic_imageman (rs[Rs_path]);
862 ASImage *image = get_asimage (asimman, file, 0xFFFFFFFF, 100);
863 if (image)
864 {
865 if (original_asim)
866 safe_asimage_destroy (original_asim);
867 original_asim = image;
868 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
869 ret = true;
870 }
871# endif
872
873# ifdef HAVE_PIXBUF 640# ifdef HAVE_PIXBUF
874 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 641 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
875 if (image) 642 if (image)
876 { 643 {
877 if (pixbuf) 644 if (pixbuf)
878 g_object_unref (pixbuf); 645 g_object_unref (pixbuf);
879 pixbuf = image; 646 pixbuf = image;
880 bg_flags |= BG_IS_FROM_FILE; 647 flags |= IM_IS_SET;
881 ret = true; 648 ret = true;
882 } 649 }
883# endif 650# endif
884 651
885 if (ret) 652 if (ret)
886 { 653 {
887 if (p) 654 if (p)
888 bg_set_geometry (p + 1); 655 set_geometry (p + 1);
889 else 656 else
890 bg_set_default_geometry (); 657 set_default_geometry ();
891 } 658 }
892 659
893 return ret; 660 return ret;
894} 661}
895 662
896# endif /* BG_IMAGE_FROM_FILE */ 663# endif /* BG_IMAGE_FROM_FILE */
897 664
898# ifdef ENABLE_TRANSPARENCY 665# ifdef ENABLE_TRANSPARENCY
899bool
900rxvt_term::bg_set_transparent ()
901{
902 if (!(bg_flags & BG_IS_TRANSPARENT))
903 {
904 bg_flags |= BG_IS_TRANSPARENT;
905 return true;
906 }
907
908 return false;
909}
910
911bool 666bool
912rxvt_term::bg_set_blur (const char *geom) 667rxvt_term::bg_set_blur (const char *geom)
913{ 668{
914 bool changed = false; 669 bool changed = false;
915 unsigned int hr, vr; 670 unsigned int hr, vr;
934 { 689 {
935 changed = true; 690 changed = true;
936 v_blurRadius = vr; 691 v_blurRadius = vr;
937 } 692 }
938 693
939 if (h_blurRadius == 0 || v_blurRadius == 0)
940 bg_flags &= ~BG_NEEDS_BLUR;
941 else
942 bg_flags |= BG_NEEDS_BLUR;
943
944 return changed; 694 return changed;
945} 695}
946 696
947void 697bool
948rxvt_term::set_tint_shade_flags () 698rxvt_term::bg_set_tint (rxvt_color &new_tint)
949{ 699{
700 if (!(bg_flags & BG_TINT_SET) || tint != new_tint)
701 {
702 tint = new_tint;
703 bg_flags |= BG_TINT_SET;
704
950 rgba c; 705 rgba c;
951 bool has_shade = shade != 100;
952
953 bg_flags &= ~BG_TINT_FLAGS;
954
955 if (bg_flags & BG_TINT_SET)
956 {
957 tint.get (c); 706 tint.get (c);
958 if (!has_shade
959 && (c.r <= 0x00ff || c.r >= 0xff00) 707 if ((c.r <= 0x00ff || c.r >= 0xff00)
960 && (c.g <= 0x00ff || c.g >= 0xff00) 708 && (c.g <= 0x00ff || c.g >= 0xff00)
961 && (c.b <= 0x00ff || c.b >= 0xff00)) 709 && (c.b <= 0x00ff || c.b >= 0xff00))
962 bg_flags |= BG_TINT_BITAND; 710 bg_flags |= BG_TINT_BITAND;
963 } 711 else
964
965 if (has_shade || (bg_flags & BG_TINT_SET))
966 bg_flags |= BG_NEEDS_TINT;
967}
968
969bool
970rxvt_term::bg_set_tint (rxvt_color &new_tint)
971{
972 if (!(bg_flags & BG_TINT_SET) || tint != new_tint)
973 {
974 tint = new_tint;
975 bg_flags |= BG_TINT_SET; 712 bg_flags &= ~BG_TINT_BITAND;
976 set_tint_shade_flags (); 713
977 return true; 714 return true;
978 } 715 }
979 716
980 return false; 717 return false;
981} 718}
990 new_shade = 200 - (100 + new_shade); 727 new_shade = 200 - (100 + new_shade);
991 728
992 if (new_shade != shade) 729 if (new_shade != shade)
993 { 730 {
994 shade = new_shade; 731 shade = new_shade;
995 set_tint_shade_flags ();
996 return true; 732 return true;
997 } 733 }
998 734
999 return false; 735 return false;
1000} 736}
1021 params[i+2] = XDoubleToFixed (kernel[i] / sum); 757 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1022} 758}
1023#endif 759#endif
1024 760
1025bool 761bool
1026rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height, int depth) 762rxvt_term::blur_pixmap (Pixmap pixmap, int width, int height)
1027{ 763{
1028 bool ret = false; 764 bool ret = false;
1029#if XRENDER 765#if XRENDER
1030 if (!(bg_flags & BG_HAS_RENDER_CONV)) 766 if (!(bg_flags & BG_HAS_RENDER_CONV))
1031 return false; 767 return false;
1086#endif 822#endif
1087 return ret; 823 return ret;
1088} 824}
1089 825
1090bool 826bool
1091rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 827rxvt_term::tint_pixmap (Pixmap pixmap, int width, int height)
1092{ 828{
1093 bool ret = false; 829 bool ret = false;
1094 830
1095 if (bg_flags & BG_TINT_BITAND) 831 if (shade == 100 && (bg_flags & BG_TINT_BITAND))
1096 { 832 {
1097 XGCValues gcv; 833 XGCValues gcv;
1098 GC gc; 834 GC gc;
1099 835
1100 /* In this case we can tint image server-side getting significant 836 /* In this case we can tint image server-side getting significant
1181/* 917/*
1182 * Builds a pixmap of the same size as the terminal window that contains 918 * Builds a pixmap of the same size as the terminal window that contains
1183 * the tiled portion of the root pixmap that is supposed to be covered by 919 * the tiled portion of the root pixmap that is supposed to be covered by
1184 * our window. 920 * our window.
1185 */ 921 */
1186unsigned long 922bool
1187rxvt_term::make_transparency_pixmap () 923rxvt_term::make_transparency_pixmap ()
1188{ 924{
1189 unsigned long result = 0; 925 bool ret = false;
1190 926
1191 /* root dimensions may change from call to call - but Display structure should 927 /* root dimensions may change from call to call - but Display structure should
1192 * be always up-to-date, so let's use it : 928 * be always up-to-date, so let's use it :
1193 */ 929 */
1194 int screen = display->screen; 930 int screen = display->screen;
1275 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1011 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1276 1012
1277 if (gc) 1013 if (gc)
1278 { 1014 {
1279 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height); 1015 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1280 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1016 ret = true;
1017 bool need_blur = h_blurRadius && v_blurRadius;
1018 bool need_tint = shade != 100 || (bg_flags & BG_TINT_SET);
1281 1019
1282 if (!(bg_flags & BG_CLIENT_RENDER)) 1020 if (!(bg_flags & BG_CLIENT_RENDER))
1283 { 1021 {
1284 if (bg_flags & BG_NEEDS_BLUR) 1022 if (need_blur)
1285 {
1286 if (blur_pixmap (bg_pixmap, visual, window_width, window_height, depth))
1287 result &= ~BG_NEEDS_BLUR;
1288 } 1023 {
1289 if (bg_flags & BG_NEEDS_TINT) 1024 if (blur_pixmap (bg_pixmap, window_width, window_height))
1025 need_blur = false;
1290 { 1026 }
1027 if (need_tint)
1028 {
1291 if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) 1029 if (tint_pixmap (bg_pixmap, window_width, window_height))
1292 result &= ~BG_NEEDS_TINT; 1030 need_tint = false;
1293 } 1031 }
1294# ifndef HAVE_AFTERIMAGE 1032 if (need_tint)
1295 if (result & BG_NEEDS_TINT)
1296 { 1033 {
1297 XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap); 1034 XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1298 if (ximage) 1035 if (ximage)
1299 { 1036 {
1300 /* our own client-side tinting */ 1037 /* our own client-side tinting */
1301 tint_ximage (DefaultVisual (dpy, display->screen), ximage); 1038 tint_ximage (ximage);
1302 1039
1303 XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height); 1040 XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height);
1304 XDestroyImage (ximage); 1041 XDestroyImage (ximage);
1305 } 1042 }
1306 } 1043 }
1307# endif
1308 } /* server side rendering completed */ 1044 } /* server side rendering completed */
1309 1045
1310 XFreeGC (dpy, gc); 1046 XFreeGC (dpy, gc);
1311 } 1047 }
1312 1048
1313 if (recoded_root_pmap != root_pixmap) 1049 if (recoded_root_pmap != root_pixmap)
1314 XFreePixmap (dpy, recoded_root_pmap); 1050 XFreePixmap (dpy, recoded_root_pmap);
1315 1051
1316 return result; 1052 return ret;
1317} 1053}
1318 1054
1319void 1055void
1320rxvt_term::bg_set_root_pixmap () 1056rxvt_term::bg_set_root_pixmap ()
1321{ 1057{
1328# endif /* ENABLE_TRANSPARENCY */ 1064# endif /* ENABLE_TRANSPARENCY */
1329 1065
1330bool 1066bool
1331rxvt_term::bg_render () 1067rxvt_term::bg_render ()
1332{ 1068{
1333 unsigned long tr_flags = 0; 1069 bool transparent = false;
1334 1070
1335 bg_invalidate (); 1071 bg_invalidate ();
1336# ifdef ENABLE_TRANSPARENCY 1072# ifdef ENABLE_TRANSPARENCY
1337 if (bg_flags & BG_IS_TRANSPARENT) 1073 if (bg_flags & BG_IS_TRANSPARENT)
1338 { 1074 {
1339 /* we need to re-generate transparency pixmap in that case ! */ 1075 /* we need to re-generate transparency pixmap in that case ! */
1340 tr_flags = make_transparency_pixmap (); 1076 transparent = make_transparency_pixmap ();
1341 if (tr_flags) 1077 if (transparent)
1342 bg_flags |= BG_IS_VALID; 1078 bg_flags |= BG_IS_VALID;
1343 } 1079 }
1344# endif 1080# endif
1345 1081
1346# ifdef BG_IMAGE_FROM_FILE 1082# ifdef BG_IMAGE_FROM_FILE
1347 if ((bg_flags & BG_IS_FROM_FILE) 1083 if (bg_image.flags & IM_IS_SET)
1348 || (tr_flags & BG_EFFECTS_FLAGS))
1349 { 1084 {
1350 if (render_image (tr_flags)) 1085 if (render_image (bg_image, transparent))
1351 bg_flags |= BG_IS_VALID; 1086 bg_flags |= BG_IS_VALID;
1352 } 1087 }
1353# endif 1088# endif
1354 1089
1355 if (!(bg_flags & BG_IS_VALID)) 1090 if (!(bg_flags & BG_IS_VALID))
1393#endif 1128#endif
1394} 1129}
1395 1130
1396#endif /* HAVE_BG_PIXMAP */ 1131#endif /* HAVE_BG_PIXMAP */
1397 1132
1398#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1133#ifdef ENABLE_TRANSPARENCY
1399/* based on code from aterm-0.4.2 */ 1134/* based on code from aterm-0.4.2 */
1400 1135
1401static inline void 1136static inline void
1402fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high) 1137fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1403{ 1138{
1409 lookup[i] = (tmp / 0xffff) << sh; 1144 lookup[i] = (tmp / 0xffff) << sh;
1410 } 1145 }
1411} 1146}
1412 1147
1413void 1148void
1414rxvt_term::tint_ximage (Visual *visual, XImage *ximage) 1149rxvt_term::tint_ximage (XImage *ximage)
1415{ 1150{
1151 unsigned int size_r, size_g, size_b;
1416 int sh_r, sh_g, sh_b; 1152 int sh_r, sh_g, sh_b;
1417 uint32_t mask_r, mask_g, mask_b; 1153 uint32_t mask_r, mask_g, mask_b;
1418 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1154 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1419 unsigned short low; 1155 unsigned short low;
1420 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 1156 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1425 mask_r = visual->red_mask; 1161 mask_r = visual->red_mask;
1426 mask_g = visual->green_mask; 1162 mask_g = visual->green_mask;
1427 mask_b = visual->blue_mask; 1163 mask_b = visual->blue_mask;
1428 1164
1429 /* boring lookup table pre-initialization */ 1165 /* boring lookup table pre-initialization */
1430 switch (ximage->depth) 1166 sh_r = ecb_ctz32 (mask_r);
1431 { 1167 sh_g = ecb_ctz32 (mask_g);
1432 case 15: 1168 sh_b = ecb_ctz32 (mask_b);
1433 if ((mask_r != 0x7c00) || 1169
1434 (mask_g != 0x03e0) || 1170 size_r = mask_r >> sh_r;
1435 (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)
1436 return; 1175 return;
1437 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));
1438 lookup_r = lookup; 1178 lookup_r = lookup;
1439 lookup_g = lookup+32; 1179 lookup_g = lookup + size_r;
1440 lookup_b = lookup+32+32; 1180 lookup_b = lookup + size_r + size_g;
1441 sh_r = 10;
1442 sh_g = 5;
1443 sh_b = 0;
1444 break;
1445 case 16:
1446 if ((mask_r != 0xf800) ||
1447 (mask_g != 0x07e0) ||
1448 (mask_b != 0x001f))
1449 return;
1450 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1451 lookup_r = lookup;
1452 lookup_g = lookup+32;
1453 lookup_b = lookup+32+64;
1454 sh_r = 11;
1455 sh_g = 5;
1456 sh_b = 0;
1457 break;
1458 case 24:
1459 if ((mask_r != 0xff0000) ||
1460 (mask_g != 0x00ff00) ||
1461 (mask_b != 0x0000ff))
1462 return;
1463 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1464 lookup_r = lookup;
1465 lookup_g = lookup+256;
1466 lookup_b = lookup+256+256;
1467 sh_r = 16;
1468 sh_g = 8;
1469 sh_b = 0;
1470 break;
1471 case 32:
1472 if ((mask_r != 0xff0000) ||
1473 (mask_g != 0x00ff00) ||
1474 (mask_b != 0x0000ff))
1475 return;
1476 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1477 lookup_r = lookup;
1478 lookup_g = lookup+256;
1479 lookup_b = lookup+256+256;
1480 sh_r = 16;
1481 sh_g = 8;
1482 sh_b = 0;
1483 break;
1484 default:
1485 return; /* we do not support this color depth */
1486 }
1487 1181
1488 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); 1182 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1489 1183
1490 if (bg_flags & BG_TINT_SET) 1184 if (bg_flags & BG_TINT_SET)
1491 tint.get (c); 1185 tint.get (c);
1513 fill_lut (lookup_g, mask_g, sh_g, low, c.g); 1207 fill_lut (lookup_g, mask_g, sh_g, low, c.g);
1514 fill_lut (lookup_b, mask_b, sh_b, low, c.b); 1208 fill_lut (lookup_b, mask_b, sh_b, low, c.b);
1515 1209
1516 /* apply table to input image (replacing colors by newly calculated ones) */ 1210 /* apply table to input image (replacing colors by newly calculated ones) */
1517 if (ximage->bits_per_pixel == 32 1211 if (ximage->bits_per_pixel == 32
1518 && (ximage->depth == 24 || ximage->depth == 32)
1519 && ximage->byte_order == host_byte_order) 1212 && ximage->byte_order == host_byte_order)
1520 { 1213 {
1521 uint32_t *p1, *pf, *p, *pl; 1214 char *line = ximage->data;
1522 p1 = (uint32_t *) ximage->data;
1523 pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line);
1524 1215
1525 while (p1 < pf) 1216 for (int y = 0; y < ximage->height; y++)
1526 {
1527 p = p1;
1528 pl = p1 + ximage->width;
1529 for (; p < pl; p++)
1530 { 1217 {
1531 *p = lookup_r[(*p & 0xff0000) >> 16] | 1218 uint32_t *p = (uint32_t *)line;
1532 lookup_g[(*p & 0x00ff00) >> 8] | 1219 for (int x = 0; x < ximage->width; x++)
1533 lookup_b[(*p & 0x0000ff)] |
1534 (*p & 0xff000000);
1535 } 1220 {
1536 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;
1537 } 1227 }
1538 } 1228 }
1539 else 1229 else
1540 { 1230 {
1541 for (int y = 0; y < ximage->height; y++) 1231 for (int y = 0; y < ximage->height; y++)
1549 } 1239 }
1550 } 1240 }
1551 1241
1552 free (lookup); 1242 free (lookup);
1553} 1243}
1554#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1244#endif /* ENABLE_TRANSPARENCY */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines