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.189 by sf-exg, Thu Dec 29 16:45:22 2011 UTC vs.
Revision 1.210 by sf-exg, Sat May 12 09:43:06 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>
31#endif 31#endif
32 32
33#ifndef FilterConvolution 33#ifndef FilterConvolution
34#define FilterConvolution "convolution" 34#define FilterConvolution "convolution"
35#endif
36
37#ifndef RepeatPad
38#define RepeatPad True
35#endif 39#endif
36 40
37#ifdef HAVE_BG_PIXMAP 41#ifdef HAVE_BG_PIXMAP
38# if XRENDER 42# if XRENDER
39static Picture 43static Picture
54# endif 58# endif
55 59
56void 60void
57rxvt_term::bg_destroy () 61rxvt_term::bg_destroy ()
58{ 62{
59#ifdef HAVE_AFTERIMAGE
60 if (original_asim)
61 safe_asimage_destroy (original_asim);
62 if (asv)
63 destroy_asvisual (asv, 0);
64 if (asimman)
65 destroy_image_manager (asimman, 0);
66#endif
67
68#ifdef HAVE_PIXBUF 63#ifdef HAVE_PIXBUF
69 if (pixbuf) 64 if (pixbuf)
70 g_object_unref (pixbuf); 65 g_object_unref (pixbuf);
71#endif 66#endif
72 67
125 120
126 return false; 121 return false;
127} 122}
128 123
129# ifdef BG_IMAGE_FROM_FILE 124# ifdef BG_IMAGE_FROM_FILE
130static inline bool
131check_set_scale_value (int geom_flags, int flag, unsigned int &scale, unsigned int new_value)
132{
133 if (geom_flags & flag)
134 {
135 if (new_value > 1000)
136 new_value = 1000;
137 if (new_value != scale)
138 {
139 scale = new_value;
140 return true;
141 }
142 }
143 return false;
144}
145
146static inline bool
147check_set_align_value (int geom_flags, int flag, int &align, int new_value)
148{
149 if (geom_flags & flag)
150 {
151 if (new_value < -100)
152 new_value = -100;
153 else if (new_value > 200)
154 new_value = 200;
155 if (new_value != align)
156 {
157 align = new_value;
158 return true;
159 }
160 }
161 return false;
162}
163
164static inline int 125static inline int
165make_align_position (int align, int window_size, int image_size) 126make_align_position (int align, int window_size, int image_size)
166{ 127{
167 int diff = window_size - image_size;
168 int smaller = min (image_size, window_size);
169
170 if (align >= 0 && align <= 100) 128 if (align >= 0 && align <= 100)
171 return diff * align / 100; 129 return lerp (0, window_size - image_size, align);
172 else if (align > 100 && align <= 200) 130 else if (align > 100)
173 return (align - 100) * smaller / 100 + window_size - smaller; 131 return lerp (window_size - image_size, window_size, align - 100);
174 else if (align >= -100 && align < 0) 132 else
175 return (align + 100) * smaller / 100 - image_size; 133 return lerp (-image_size, 0, align + 100);
176 return 0;
177} 134}
178 135
179static inline int 136static inline int
180make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 137make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
181{ 138{
187 src_pos = -pos; 144 src_pos = -pos;
188 dst_pos = 0; 145 dst_pos = 0;
189 dst_size += pos; 146 dst_size += pos;
190 } 147 }
191 148
192 if (dst_pos + dst_size > target_size)
193 dst_size = target_size - dst_pos; 149 min_it (dst_size, target_size - dst_pos);
194 return src_pos; 150 return src_pos;
195} 151}
196 152
197bool 153bool
198rxvt_term::bg_set_geometry (const char *geom, bool update) 154rxvt_term::bg_set_geometry (const char *geom, bool update)
199{ 155{
200 bool changed = false; 156 bool changed = false;
201 int geom_flags = 0; 157 int geom_flags = 0;
202 int x = 0, y = 0; 158 int x = h_align;
159 int y = v_align;
203 unsigned int w = 0, h = 0; 160 unsigned int w = h_scale;
161 unsigned int h = v_scale;
204 unsigned long new_flags = 0; 162 unsigned long new_flags = 0;
205 163
206 if (geom == NULL) 164 if (geom == NULL)
207 return false; 165 return false;
208 166
317 w = h = defaultScale; 275 w = h = defaultScale;
318 else if (!(geom_flags & HeightValue)) 276 else if (!(geom_flags & HeightValue))
319 h = w; 277 h = w;
320 else if (!(geom_flags & WidthValue)) 278 else if (!(geom_flags & WidthValue))
321 w = h; 279 w = h;
322
323 geom_flags |= WidthValue|HeightValue|XValue|YValue;
324 } 280 }
325 281
326 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true; 282 min_it (w, 1000);
327 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true; 283 min_it (h, 1000);
328 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true; 284 clamp_it (x, -100, 200);
329 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true; 285 clamp_it (y, -100, 200);
330 286
331 if (new_flags != bg_flags) 287 if (bg_flags != new_flags
288 || h_scale != w
289 || v_scale != h
290 || h_align != x
291 || v_align != y)
332 { 292 {
333 bg_flags = new_flags; 293 bg_flags = new_flags;
294 h_scale = w;
295 v_scale = h;
296 h_align = x;
297 v_align = y;
334 changed = true; 298 changed = true;
335 } 299 }
336 300
337 return changed; 301 return changed;
338} 302}
366 { 330 {
367 x = make_align_position (h_align, target_width, w); 331 x = make_align_position (h_align, target_width, w);
368 y = make_align_position (v_align, target_height, h); 332 y = make_align_position (v_align, target_height, h);
369 } 333 }
370 334
371 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
372 if (!(bg_flags & BG_TILE) 335 if (!(bg_flags & BG_TILE)
373 || h_scale || v_scale 336 || h_scale || v_scale
374 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align)) 337 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
375 || w > target_width || h > target_height) 338 || image_width > target_width || image_height > target_height)
376 bg_flags |= BG_IS_SIZE_SENSITIVE; 339 bg_flags |= BG_IS_SIZE_SENSITIVE;
377}
378
379# ifdef HAVE_AFTERIMAGE
380bool
381rxvt_term::render_image (unsigned long tr_flags)
382{
383 init_asv ();
384
385 ASImage *background = NULL;
386 ARGB32 background_tint = TINT_LEAVE_SAME;
387
388# ifdef ENABLE_TRANSPARENCY
389 if (tr_flags)
390 background = pixmap2ximage (asv, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, 100);
391
392 if (tr_flags & BG_NEEDS_TINT)
393 {
394 ShadingInfo as_shade;
395 as_shade.shading = shade;
396
397 rgba c;
398 tint.get (c);
399 as_shade.tintColor.red = c.r;
400 as_shade.tintColor.green = c.g;
401 as_shade.tintColor.blue = c.b;
402
403 background_tint = shading2tint32 (&as_shade);
404 }
405
406 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
407 {
408 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
409 ASA_XImage,
410 100, ASIMAGE_QUALITY_DEFAULT);
411 if (tmp)
412 {
413 destroy_asimage (&background);
414 background = tmp;
415 }
416 }
417# endif
418
419 ASImage *result = 0;
420
421 int target_width = szHint.width;
422 int target_height = szHint.height;
423 int new_pmap_width = target_width;
424 int new_pmap_height = target_height;
425
426 int x = 0;
427 int y = 0;
428 int w = 0;
429 int h = 0;
430
431 if (original_asim)
432 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
433
434 if (!original_asim
435 || (!(bg_flags & BG_ROOT_ALIGN)
436 && (x >= target_width
437 || y >= target_height
438 || x + w <= 0
439 || y + h <= 0)))
440 {
441 if (background)
442 {
443 new_pmap_width = background->width;
444 new_pmap_height = background->height;
445 result = background;
446
447 if (background_tint != TINT_LEAVE_SAME)
448 {
449 ASImage *tmp = tile_asimage (asv, background, 0, 0,
450 target_width, target_height, background_tint,
451 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
452 if (tmp)
453 result = tmp;
454 }
455 }
456 else
457 new_pmap_width = new_pmap_height = 0;
458 }
459 else 340 else
460 { 341 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
461 result = original_asim;
462
463 if (w != original_asim->width
464 || h != original_asim->height)
465 {
466 result = scale_asimage (asv, original_asim,
467 w, h,
468 ASA_XImage,
469 100, ASIMAGE_QUALITY_DEFAULT);
470 }
471
472 if (background == NULL)
473 {
474 if (bg_flags & BG_TILE)
475 {
476 /* if tiling - pixmap has to be sized exactly as the image,
477 but there is no need to make it bigger than the window! */
478 new_pmap_width = min (result->width, target_width);
479 new_pmap_height = min (result->height, target_height);
480
481 /* we also need to tile our image in both directions */
482 ASImage *tmp = tile_asimage (asv, result,
483 (int)result->width - x,
484 (int)result->height - y,
485 new_pmap_width,
486 new_pmap_height,
487 TINT_LEAVE_SAME, ASA_XImage,
488 100, ASIMAGE_QUALITY_DEFAULT);
489 if (tmp)
490 {
491 if (result != original_asim)
492 destroy_asimage (&result);
493
494 result = tmp;
495 }
496 }
497 }
498 else
499 {
500 /* if blending background and image - pixmap has to be sized same as target window */
501 ASImageLayer *layers = create_image_layers (2);
502
503 layers[0].im = background;
504 layers[0].clip_width = target_width;
505 layers[0].clip_height = target_height;
506 layers[0].tint = background_tint;
507 layers[1].im = result;
508
509 if (bg_flags & BG_TILE)
510 {
511 /* tile horizontally */
512 while (x > 0) x -= (int)result->width;
513 layers[1].dst_x = x;
514 layers[1].clip_width = result->width+target_width;
515 }
516 else
517 {
518 /* clip horizontally */
519 layers[1].dst_x = x;
520 layers[1].clip_width = result->width;
521 }
522
523 if (bg_flags & BG_TILE)
524 {
525 while (y > 0) y -= (int)result->height;
526 layers[1].dst_y = y;
527 layers[1].clip_height = result->height + target_height;
528 }
529 else
530 {
531 layers[1].dst_y = y;
532 layers[1].clip_height = result->height;
533 }
534
535 if (rs[Rs_blendtype])
536 {
537 layers[1].merge_scanlines = blend_scanlines_name2func (rs[Rs_blendtype]);
538 if (layers[1].merge_scanlines == NULL)
539 layers[1].merge_scanlines = alphablend_scanlines;
540 }
541
542 ASImage *tmp = merge_layers (asv, layers, 2, target_width, target_height,
543 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
544
545 if (tmp)
546 {
547 if (result != original_asim)
548 destroy_asimage (&result);
549
550 result = tmp;
551 }
552
553 free (layers);
554 }
555 }
556
557 bool ret = false;
558
559 if (result)
560 {
561 XGCValues gcv;
562 GC gc;
563
564 /* create Pixmap */
565 if (bg_pixmap == None
566 || bg_pmap_width != new_pmap_width
567 || bg_pmap_height != new_pmap_height)
568 {
569 if (bg_pixmap)
570 XFreePixmap (dpy, bg_pixmap);
571 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
572 bg_pmap_width = new_pmap_width;
573 bg_pmap_height = new_pmap_height;
574 }
575 /* fill with background color (if result's not completely overlapping it) */
576 gcv.foreground = pix_colors[Color_bg];
577 gc = XCreateGC (dpy, vt, GCForeground, &gcv);
578
579 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
580 int dst_width = result->width, dst_height = result->height;
581 if (background == NULL)
582 {
583 if (!(bg_flags & BG_TILE))
584 {
585 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
586 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
587 }
588
589 if (dst_x > 0 || dst_y > 0
590 || dst_x + dst_width < new_pmap_width
591 || dst_y + dst_height < new_pmap_height)
592 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
593 }
594
595 /* put result on pixmap */
596 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
597 asimage2drawable (asv, bg_pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
598
599 if (result != background && result != original_asim)
600 destroy_asimage (&result);
601
602 XFreeGC (dpy, gc);
603
604 ret = true;
605 }
606
607 if (background)
608 destroy_asimage (&background);
609
610 return ret;
611} 342}
612# endif /* HAVE_AFTERIMAGE */
613 343
614# ifdef HAVE_PIXBUF 344# ifdef HAVE_PIXBUF
615bool 345bool
616rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc, 346rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
617 int src_x, int src_y, int dst_x, int dst_y, 347 int src_x, int src_y, int dst_x, int dst_y,
618 unsigned int width, unsigned int height) 348 unsigned int width, unsigned int height)
619{ 349{
620 XImage *ximage; 350 XImage *ximage;
621 char *data, *line; 351 char *line;
622 int bytes_per_pixel;
623 int width_r, width_g, width_b; 352 int width_r, width_g, width_b, width_a;
624 int sh_r, sh_g, sh_b; 353 int sh_r, sh_g, sh_b, sh_a;
354 uint32_t alpha_mask;
625 int rowstride; 355 int rowstride;
626 int channels; 356 int channels;
627 unsigned char *row; 357 unsigned char *row;
628 358
629 if (visual->c_class != TrueColor) 359 if (visual->c_class != TrueColor)
630 return false; 360 return false;
631 361
632 if (depth == 24 || depth == 32) 362#if XRENDER
633 bytes_per_pixel = 4; 363 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
634 else if (depth == 15 || depth == 16) 364 if (format)
635 bytes_per_pixel = 2; 365 alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha;
636 else 366 else
637 return false; 367#endif
368 alpha_mask = 0;
638 369
639 width_r = ecb_popcount32 (visual->red_mask); 370 width_r = ecb_popcount32 (visual->red_mask);
640 width_g = ecb_popcount32 (visual->green_mask); 371 width_g = ecb_popcount32 (visual->green_mask);
641 width_b = ecb_popcount32 (visual->blue_mask); 372 width_b = ecb_popcount32 (visual->blue_mask);
373 width_a = ecb_popcount32 (alpha_mask);
642 374
643 if (width_r > 8 || width_g > 8 || width_b > 8) 375 if (width_r > 8 || width_g > 8 || width_b > 8 || width_a > 8)
644 return false; 376 return false;
645 377
646 sh_r = ecb_ctz32 (visual->red_mask); 378 sh_r = ecb_ctz32 (visual->red_mask);
647 sh_g = ecb_ctz32 (visual->green_mask); 379 sh_g = ecb_ctz32 (visual->green_mask);
648 sh_b = ecb_ctz32 (visual->blue_mask); 380 sh_b = ecb_ctz32 (visual->blue_mask);
381 sh_a = ecb_ctz32 (alpha_mask);
649 382
650 if (width > INT_MAX / height / bytes_per_pixel) 383 if (width > 32767 || height > 32767)
651 return false; 384 return false;
652 385
653 data = (char *)malloc (width * height * bytes_per_pixel); 386 ximage = XCreateImage (dpy, visual, depth, ZPixmap, 0, 0,
654 if (!data) 387 width, height, 32, 0);
388 if (!ximage)
655 return false; 389 return false;
656 390
657 ximage = XCreateImage (dpy, visual, depth, ZPixmap, 0, data, 391 if (height > INT_MAX / ximage->bytes_per_line
658 width, height, bytes_per_pixel * 8, 0); 392 || !(ximage->data = (char *)malloc (height * ximage->bytes_per_line)))
659 if (!ximage)
660 { 393 {
661 free (data); 394 XDestroyImage (ximage);
662 return false; 395 return false;
663 } 396 }
664 397
665 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 398 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
666 399
667 rowstride = gdk_pixbuf_get_rowstride (pixbuf); 400 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
668 channels = gdk_pixbuf_get_n_channels (pixbuf); 401 channels = gdk_pixbuf_get_n_channels (pixbuf);
669 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels; 402 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
670 line = data; 403 line = ximage->data;
404
405 rgba c (0, 0, 0);
406
407 if (channels == 4 && alpha_mask == 0)
408 {
409 pix_colors[Color_bg].get (c);
410 c.r >>= 8;
411 c.g >>= 8;
412 c.b >>= 8;
413 }
671 414
672 for (int y = 0; y < height; y++) 415 for (int y = 0; y < height; y++)
673 { 416 {
674 for (int x = 0; x < width; x++) 417 for (int x = 0; x < width; x++)
675 { 418 {
676 unsigned char *pixel = row + x * channels; 419 unsigned char *pixel = row + x * channels;
677 uint32_t value; 420 uint32_t value;
421 unsigned char r, g, b, a;
678 422
423 if (channels == 4)
424 {
425 a = pixel[3];
426 r = (pixel[0] * a + c.r * (0xff - a)) / 0xff;
427 g = (pixel[1] * a + c.g * (0xff - a)) / 0xff;
428 b = (pixel[2] * a + c.b * (0xff - a)) / 0xff;
429 }
430 else
431 {
432 a = 0xff;
433 r = pixel[0];
434 g = pixel[1];
435 b = pixel[2];
436 }
437
679 value = ((pixel[0] >> (8 - width_r)) << sh_r) 438 value = ((r >> (8 - width_r)) << sh_r)
680 | ((pixel[1] >> (8 - width_g)) << sh_g) 439 | ((g >> (8 - width_g)) << sh_g)
681 | ((pixel[2] >> (8 - width_b)) << sh_b); 440 | ((b >> (8 - width_b)) << sh_b)
441 | ((a >> (8 - width_a)) << sh_a);
682 442
683 if (bytes_per_pixel == 4) 443 if (ximage->bits_per_pixel == 32)
684 ((uint32_t *)line)[x] = value; 444 ((uint32_t *)line)[x] = value;
685 else 445 else
686 ((uint16_t *)line)[x] = value; 446 XPutPixel (ximage, x, y, value);
687 } 447 }
688 448
689 row += rowstride; 449 row += rowstride;
690 line += ximage->bytes_per_line; 450 line += ximage->bytes_per_line;
691 } 451 }
694 XDestroyImage (ximage); 454 XDestroyImage (ximage);
695 return true; 455 return true;
696} 456}
697 457
698bool 458bool
699rxvt_term::render_image (unsigned long tr_flags) 459rxvt_term::render_image (bool transparent)
700{ 460{
701 if (!pixbuf) 461 if (!pixbuf)
702 return false; 462 return false;
703 463
704 if (tr_flags 464 if (transparent
705 && !(bg_flags & BG_HAS_RENDER)) 465 && !(bg_flags & BG_HAS_RENDER))
706 return false; 466 return false;
707 467
708 GdkPixbuf *result; 468 GdkPixbuf *result;
709 469
749 Pixmap root_pmap; 509 Pixmap root_pmap;
750 510
751 image_width = gdk_pixbuf_get_width (result); 511 image_width = gdk_pixbuf_get_width (result);
752 image_height = gdk_pixbuf_get_height (result); 512 image_height = gdk_pixbuf_get_height (result);
753 513
754 if (tr_flags) 514 if (transparent)
755 { 515 {
756 root_pmap = bg_pixmap; 516 root_pmap = bg_pixmap;
757 bg_pixmap = None; 517 bg_pixmap = None;
758 } 518 }
759 else 519 else
817 dst_x, dst_y, 577 dst_x, dst_y,
818 dst_width, dst_height); 578 dst_width, dst_height);
819 } 579 }
820 580
821#if XRENDER 581#if XRENDER
822 if (tr_flags) 582 if (transparent)
823 { 583 {
824 XRenderPictureAttributes pa;
825
826 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, visual); 584 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
585
827 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 586 Picture src = XRenderCreatePicture (dpy, root_pmap, format, 0, 0);
828 587
829 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
830 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, dst_format, 0, &pa); 588 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, format, 0, 0);
831 589
832 Picture mask = create_xrender_mask (dpy, vt, False, False); 590 Picture mask = create_xrender_mask (dpy, vt, False, False);
833 591
834 XRenderColor mask_c; 592 XRenderColor mask_c;
835 593
836 mask_c.alpha = 0x8000; 594 mask_c.alpha = 0x8000;
837 mask_c.red = 0; 595 mask_c.red =
838 mask_c.green = 0; 596 mask_c.green =
839 mask_c.blue = 0; 597 mask_c.blue = 0;
840 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1); 598 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
599
841 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height); 600 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
842 601
843 XRenderFreePicture (dpy, src); 602 XRenderFreePicture (dpy, src);
844 XRenderFreePicture (dpy, dst); 603 XRenderFreePicture (dpy, dst);
845 XRenderFreePicture (dpy, mask); 604 XRenderFreePicture (dpy, mask);
852 } 611 }
853 612
854 if (result != pixbuf) 613 if (result != pixbuf)
855 g_object_unref (result); 614 g_object_unref (result);
856 615
857 if (tr_flags) 616 if (transparent)
858 XFreePixmap (dpy, root_pmap); 617 XFreePixmap (dpy, root_pmap);
859 618
860 return ret; 619 return ret;
861} 620}
862# endif /* HAVE_PIXBUF */ 621# endif /* HAVE_PIXBUF */
877 memcpy (f, file, len); 636 memcpy (f, file, len);
878 f[len] = '\0'; 637 f[len] = '\0';
879 file = f; 638 file = f;
880 } 639 }
881 640
882# ifdef HAVE_AFTERIMAGE
883 if (!asimman)
884 asimman = create_generic_imageman (rs[Rs_path]);
885 ASImage *image = get_asimage (asimman, file, 0xFFFFFFFF, 100);
886 if (image)
887 {
888 if (original_asim)
889 safe_asimage_destroy (original_asim);
890 original_asim = image;
891 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
892 ret = true;
893 }
894# endif
895
896# ifdef HAVE_PIXBUF 641# ifdef HAVE_PIXBUF
897 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 642 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
898 if (image) 643 if (image)
899 { 644 {
900 if (pixbuf) 645 if (pixbuf)
957 { 702 {
958 changed = true; 703 changed = true;
959 v_blurRadius = vr; 704 v_blurRadius = vr;
960 } 705 }
961 706
962 if (v_blurRadius == 0 && h_blurRadius == 0) 707 if (h_blurRadius && v_blurRadius)
708 bg_flags |= BG_NEEDS_BLUR;
709 else
963 bg_flags &= ~BG_NEEDS_BLUR; 710 bg_flags &= ~BG_NEEDS_BLUR;
964 else
965 bg_flags |= BG_NEEDS_BLUR;
966 711
967 return changed; 712 return changed;
968} 713}
969 714
970void 715void
971rxvt_term::set_tint_shade_flags () 716rxvt_term::set_tint_shade_flags ()
972{ 717{
973 rgba c; 718 if (shade != 100 || (bg_flags & BG_TINT_SET))
974 bool has_shade = shade != 100;
975
976 bg_flags &= ~BG_TINT_FLAGS;
977
978 tint.get (c);
979
980 if (!has_shade
981 && (c.r <= 0x00ff || c.r >= 0xff00)
982 && (c.g <= 0x00ff || c.g >= 0xff00)
983 && (c.b <= 0x00ff || c.b >= 0xff00))
984 bg_flags |= BG_TINT_BITAND;
985
986 if (has_shade
987 || c.r < 0xff00
988 || c.g < 0xff00
989 || c.b < 0xff00)
990 bg_flags |= BG_NEEDS_TINT; 719 bg_flags |= BG_NEEDS_TINT;
720 else
721 bg_flags &= ~BG_NEEDS_TINT;
991} 722}
992 723
993bool 724bool
994rxvt_term::bg_set_tint (rxvt_color &new_tint) 725rxvt_term::bg_set_tint (rxvt_color &new_tint)
995{ 726{
996 if (tint != new_tint) 727 if (!(bg_flags & BG_TINT_SET) || tint != new_tint)
997 { 728 {
998 tint = new_tint; 729 tint = new_tint;
730 bg_flags |= BG_TINT_SET;
731
732 rgba c;
733 tint.get (c);
734 if ((c.r <= 0x00ff || c.r >= 0xff00)
735 && (c.g <= 0x00ff || c.g >= 0xff00)
736 && (c.b <= 0x00ff || c.b >= 0xff00))
737 bg_flags |= BG_TINT_BITAND;
738 else
739 bg_flags &= ~BG_TINT_BITAND;
740
999 set_tint_shade_flags (); 741 set_tint_shade_flags ();
1000 return true; 742 return true;
1001 } 743 }
1002 744
1003 return false; 745 return false;
1044 params[i+2] = XDoubleToFixed (kernel[i] / sum); 786 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1045} 787}
1046#endif 788#endif
1047 789
1048bool 790bool
1049rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 791rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height, int depth)
1050{ 792{
1051 bool ret = false; 793 bool ret = false;
1052#if XRENDER 794#if XRENDER
1053 if (!(bg_flags & BG_HAS_RENDER_CONV)) 795 if (!(bg_flags & BG_HAS_RENDER_CONV))
1054 return false; 796 return false;
1058 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 800 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1059 801
1060 XRenderPictureAttributes pa; 802 XRenderPictureAttributes pa;
1061 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 803 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1062 804
805 pa.repeat = RepeatPad;
1063 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 806 Picture src = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
807 Pixmap tmp = XCreatePixmap (dpy, pixmap, width, height, depth);
1064 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 808 Picture dst = XRenderCreatePicture (dpy, tmp, format, CPRepeat, &pa);
809 XFreePixmap (dpy, tmp);
1065 810
1066 if (kernel && params) 811 if (kernel && params)
1067 { 812 {
1068 if (h_blurRadius)
1069 {
1070 size = h_blurRadius * 2 + 1; 813 size = h_blurRadius * 2 + 1;
1071 get_gaussian_kernel (h_blurRadius, size, kernel, params); 814 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1072 815
1073 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 816 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1074 XRenderComposite (dpy, 817 XRenderComposite (dpy,
1075 PictOpSrc, 818 PictOpSrc,
1076 src, 819 src,
1077 None, 820 None,
1078 dst, 821 dst,
1079 0, 0, 822 0, 0,
1080 0, 0, 823 0, 0,
1081 0, 0, 824 0, 0,
1082 width, height); 825 width, height);
1083 }
1084 826
1085 if (v_blurRadius) 827 ::swap (src, dst);
1086 { 828
1087 size = v_blurRadius * 2 + 1; 829 size = v_blurRadius * 2 + 1;
1088 get_gaussian_kernel (v_blurRadius, size, kernel, params); 830 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1089 ::swap (params[0], params[1]); 831 ::swap (params[0], params[1]);
1090 832
1091 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 833 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1092 XRenderComposite (dpy, 834 XRenderComposite (dpy,
1093 PictOpSrc, 835 PictOpSrc,
1094 src, 836 src,
1095 None, 837 None,
1096 dst, 838 dst,
1097 0, 0, 839 0, 0,
1098 0, 0, 840 0, 0,
1099 0, 0, 841 0, 0,
1100 width, height); 842 width, height);
1101 }
1102 843
1103 ret = true; 844 ret = true;
1104 } 845 }
1105 846
1106 free (kernel); 847 free (kernel);
1114bool 855bool
1115rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 856rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1116{ 857{
1117 bool ret = false; 858 bool ret = false;
1118 859
1119 if (bg_flags & BG_TINT_BITAND) 860 if (shade == 100 && (bg_flags & BG_TINT_BITAND))
1120 { 861 {
1121 XGCValues gcv; 862 XGCValues gcv;
1122 GC gc; 863 GC gc;
1123 864
1124 /* In this case we can tint image server-side getting significant 865 /* In this case we can tint image server-side getting significant
1136 } 877 }
1137 } 878 }
1138# if XRENDER 879# if XRENDER
1139 else if (bg_flags & BG_HAS_RENDER) 880 else if (bg_flags & BG_HAS_RENDER)
1140 { 881 {
1141 rgba c; 882 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1142 883
884 if (bg_flags & BG_TINT_SET)
1143 tint.get (c); 885 tint.get (c);
1144 886
1145 if (shade <= 100) 887 if (shade <= 100)
1146 { 888 {
1147 c.r = c.r * shade / 100; 889 c.r = c.r * shade / 100;
1148 c.g = c.g * shade / 100; 890 c.g = c.g * shade / 100;
1154 c.g = c.g * (200 - shade) / 100; 896 c.g = c.g * (200 - shade) / 100;
1155 c.b = c.b * (200 - shade) / 100; 897 c.b = c.b * (200 - shade) / 100;
1156 } 898 }
1157 899
1158 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 900 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1159 XRenderPictureAttributes pa;
1160 901
1161 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 902 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, 0);
1162 903
1163 Picture overlay_pic = create_xrender_mask (dpy, pixmap, True, False); 904 Picture overlay_pic = create_xrender_mask (dpy, pixmap, True, False);
1164 905
1165 Picture mask_pic = create_xrender_mask (dpy, pixmap, True, True); 906 Picture mask_pic = create_xrender_mask (dpy, pixmap, True, True);
1166 907
1175 mask_c.alpha = 0; 916 mask_c.alpha = 0;
1176 mask_c.red = 0xffff - c.r; 917 mask_c.red = 0xffff - c.r;
1177 mask_c.green = 0xffff - c.g; 918 mask_c.green = 0xffff - c.g;
1178 mask_c.blue = 0xffff - c.b; 919 mask_c.blue = 0xffff - c.b;
1179 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 920 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
921
1180 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height); 922 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1181 923
1182 if (shade > 100) 924 if (shade > 100)
1183 { 925 {
1184 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1185 mask_c.alpha = 0; 926 mask_c.alpha = 0;
927 mask_c.red =
928 mask_c.green =
929 mask_c.blue = 0xffff * (shade - 100) / 100;
1186 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 930 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1187 931
1188 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height); 932 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1189 } 933 }
1190 934
1202/* 946/*
1203 * Builds a pixmap of the same size as the terminal window that contains 947 * Builds a pixmap of the same size as the terminal window that contains
1204 * the tiled portion of the root pixmap that is supposed to be covered by 948 * the tiled portion of the root pixmap that is supposed to be covered by
1205 * our window. 949 * our window.
1206 */ 950 */
1207unsigned long 951bool
1208rxvt_term::make_transparency_pixmap () 952rxvt_term::make_transparency_pixmap ()
1209{ 953{
1210 unsigned long result = 0; 954 bool ret = false;
1211 955
1212 /* root dimensions may change from call to call - but Display structure should 956 /* root dimensions may change from call to call - but Display structure should
1213 * be always up-to-date, so let's use it : 957 * be always up-to-date, so let's use it :
1214 */ 958 */
1215 int screen = display->screen; 959 int screen = display->screen;
1253#if XRENDER 997#if XRENDER
1254 if (bg_flags & BG_HAS_RENDER) 998 if (bg_flags & BG_HAS_RENDER)
1255 { 999 {
1256 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth); 1000 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
1257 1001
1258 XRenderPictureAttributes pa;
1259
1260 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen)); 1002 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1261 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa); 1003 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, 0);
1262 1004
1263 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual); 1005 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
1264 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa); 1006 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, 0);
1265 1007
1266 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height); 1008 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1267 1009
1268 XRenderFreePicture (dpy, src); 1010 XRenderFreePicture (dpy, src);
1269 XRenderFreePicture (dpy, dst); 1011 XRenderFreePicture (dpy, dst);
1298 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1040 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1299 1041
1300 if (gc) 1042 if (gc)
1301 { 1043 {
1302 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height); 1044 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1303 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1045 ret = true;
1046 unsigned long tr_flags = bg_flags & BG_EFFECTS_FLAGS;
1304 1047
1305 if (!(bg_flags & BG_CLIENT_RENDER)) 1048 if (!(bg_flags & BG_CLIENT_RENDER))
1306 { 1049 {
1307 if (bg_flags & BG_NEEDS_BLUR) 1050 if (bg_flags & BG_NEEDS_BLUR)
1308 { 1051 {
1309 if (blur_pixmap (bg_pixmap, visual, window_width, window_height)) 1052 if (blur_pixmap (bg_pixmap, visual, window_width, window_height, depth))
1310 result &= ~BG_NEEDS_BLUR; 1053 tr_flags &= ~BG_NEEDS_BLUR;
1311 } 1054 }
1312 if (bg_flags & BG_NEEDS_TINT) 1055 if (bg_flags & BG_NEEDS_TINT)
1313 { 1056 {
1314 if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) 1057 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1315 result &= ~BG_NEEDS_TINT; 1058 tr_flags &= ~BG_NEEDS_TINT;
1316 } 1059 }
1317# ifndef HAVE_AFTERIMAGE
1318 if (result & BG_NEEDS_TINT) 1060 if (tr_flags & BG_NEEDS_TINT)
1319 { 1061 {
1320 XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap); 1062 XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1321 if (ximage) 1063 if (ximage)
1322 { 1064 {
1323 /* our own client-side tinting */ 1065 /* our own client-side tinting */
1325 1067
1326 XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height); 1068 XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height);
1327 XDestroyImage (ximage); 1069 XDestroyImage (ximage);
1328 } 1070 }
1329 } 1071 }
1330# endif
1331 } /* server side rendering completed */ 1072 } /* server side rendering completed */
1332 1073
1333 XFreeGC (dpy, gc); 1074 XFreeGC (dpy, gc);
1334 } 1075 }
1335 1076
1336 if (recoded_root_pmap != root_pixmap) 1077 if (recoded_root_pmap != root_pixmap)
1337 XFreePixmap (dpy, recoded_root_pmap); 1078 XFreePixmap (dpy, recoded_root_pmap);
1338 1079
1339 return result; 1080 return ret;
1340} 1081}
1341 1082
1342void 1083void
1343rxvt_term::bg_set_root_pixmap () 1084rxvt_term::bg_set_root_pixmap ()
1344{ 1085{
1351# endif /* ENABLE_TRANSPARENCY */ 1092# endif /* ENABLE_TRANSPARENCY */
1352 1093
1353bool 1094bool
1354rxvt_term::bg_render () 1095rxvt_term::bg_render ()
1355{ 1096{
1356 unsigned long tr_flags = 0; 1097 bool transparent = false;
1357 1098
1358 bg_invalidate (); 1099 bg_invalidate ();
1359# ifdef ENABLE_TRANSPARENCY 1100# ifdef ENABLE_TRANSPARENCY
1360 if (bg_flags & BG_IS_TRANSPARENT) 1101 if (bg_flags & BG_IS_TRANSPARENT)
1361 { 1102 {
1362 /* we need to re-generate transparency pixmap in that case ! */ 1103 /* we need to re-generate transparency pixmap in that case ! */
1363 tr_flags = make_transparency_pixmap (); 1104 transparent = make_transparency_pixmap ();
1364 if (tr_flags == 0) 1105 if (transparent)
1365 return false;
1366 bg_flags |= BG_IS_VALID; 1106 bg_flags |= BG_IS_VALID;
1367 } 1107 }
1368# endif 1108# endif
1369 1109
1370# ifdef BG_IMAGE_FROM_FILE 1110# ifdef BG_IMAGE_FROM_FILE
1371 if ((bg_flags & BG_IS_FROM_FILE) 1111 if (bg_flags & BG_IS_FROM_FILE)
1372 || (tr_flags & BG_EFFECTS_FLAGS))
1373 { 1112 {
1374 if (render_image (tr_flags)) 1113 if (render_image (transparent))
1375 bg_flags |= BG_IS_VALID; 1114 bg_flags |= BG_IS_VALID;
1376 } 1115 }
1377# endif 1116# endif
1378 1117
1379 if (!(bg_flags & BG_IS_VALID)) 1118 if (!(bg_flags & BG_IS_VALID))
1395 1134
1396void 1135void
1397rxvt_term::bg_init () 1136rxvt_term::bg_init ()
1398{ 1137{
1399#ifdef ENABLE_TRANSPARENCY 1138#ifdef ENABLE_TRANSPARENCY
1400 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1401 tint.set (this, c);
1402 shade = 100; 1139 shade = 100;
1403#endif 1140#endif
1404 1141
1405 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV); 1142 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV);
1406#if XRENDER 1143#if XRENDER
1419#endif 1156#endif
1420} 1157}
1421 1158
1422#endif /* HAVE_BG_PIXMAP */ 1159#endif /* HAVE_BG_PIXMAP */
1423 1160
1424#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1161#ifdef ENABLE_TRANSPARENCY
1425/* based on code from aterm-0.4.2 */ 1162/* based on code from aterm-0.4.2 */
1426 1163
1427static inline void 1164static inline void
1428fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high) 1165fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1429{ 1166{
1437} 1174}
1438 1175
1439void 1176void
1440rxvt_term::tint_ximage (Visual *visual, XImage *ximage) 1177rxvt_term::tint_ximage (Visual *visual, XImage *ximage)
1441{ 1178{
1179 unsigned int size_r, size_g, size_b;
1442 int sh_r, sh_g, sh_b; 1180 int sh_r, sh_g, sh_b;
1443 uint32_t mask_r, mask_g, mask_b; 1181 uint32_t mask_r, mask_g, mask_b;
1444 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1182 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1445 unsigned short low; 1183 unsigned short low;
1446 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 1184 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1451 mask_r = visual->red_mask; 1189 mask_r = visual->red_mask;
1452 mask_g = visual->green_mask; 1190 mask_g = visual->green_mask;
1453 mask_b = visual->blue_mask; 1191 mask_b = visual->blue_mask;
1454 1192
1455 /* boring lookup table pre-initialization */ 1193 /* boring lookup table pre-initialization */
1456 switch (ximage->depth) 1194 sh_r = ecb_ctz32 (mask_r);
1457 { 1195 sh_g = ecb_ctz32 (mask_g);
1458 case 15: 1196 sh_b = ecb_ctz32 (mask_b);
1459 if ((mask_r != 0x7c00) || 1197
1460 (mask_g != 0x03e0) || 1198 size_r = mask_r >> sh_r;
1461 (mask_b != 0x001f)) 1199 size_g = mask_g >> sh_g;
1200 size_b = mask_b >> sh_b;
1201
1202 if (size_r++ > 255 || size_g++ > 255 || size_b++ > 255)
1462 return; 1203 return;
1463 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32)); 1204
1205 lookup = (uint32_t *)malloc (sizeof (uint32_t) * (size_r + size_g + size_b));
1464 lookup_r = lookup; 1206 lookup_r = lookup;
1465 lookup_g = lookup+32; 1207 lookup_g = lookup + size_r;
1466 lookup_b = lookup+32+32; 1208 lookup_b = lookup + size_r + size_g;
1467 sh_r = 10;
1468 sh_g = 5;
1469 sh_b = 0;
1470 break;
1471 case 16:
1472 if ((mask_r != 0xf800) ||
1473 (mask_g != 0x07e0) ||
1474 (mask_b != 0x001f))
1475 return;
1476 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1477 lookup_r = lookup;
1478 lookup_g = lookup+32;
1479 lookup_b = lookup+32+64;
1480 sh_r = 11;
1481 sh_g = 5;
1482 sh_b = 0;
1483 break;
1484 case 24:
1485 if ((mask_r != 0xff0000) ||
1486 (mask_g != 0x00ff00) ||
1487 (mask_b != 0x0000ff))
1488 return;
1489 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1490 lookup_r = lookup;
1491 lookup_g = lookup+256;
1492 lookup_b = lookup+256+256;
1493 sh_r = 16;
1494 sh_g = 8;
1495 sh_b = 0;
1496 break;
1497 case 32:
1498 if ((mask_r != 0xff0000) ||
1499 (mask_g != 0x00ff00) ||
1500 (mask_b != 0x0000ff))
1501 return;
1502 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1503 lookup_r = lookup;
1504 lookup_g = lookup+256;
1505 lookup_b = lookup+256+256;
1506 sh_r = 16;
1507 sh_g = 8;
1508 sh_b = 0;
1509 break;
1510 default:
1511 return; /* we do not support this color depth */
1512 }
1513 1209
1514 rgba c; 1210 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1515 1211
1212 if (bg_flags & BG_TINT_SET)
1516 tint.get (c); 1213 tint.get (c);
1517 1214
1518 /* prepare limits for color transformation (each channel is handled separately) */ 1215 /* prepare limits for color transformation (each channel is handled separately) */
1519 if (shade > 100) 1216 if (shade > 100)
1520 { 1217 {
1521 c.r = c.r * (200 - shade) / 100; 1218 c.r = c.r * (200 - shade) / 100;
1538 fill_lut (lookup_g, mask_g, sh_g, low, c.g); 1235 fill_lut (lookup_g, mask_g, sh_g, low, c.g);
1539 fill_lut (lookup_b, mask_b, sh_b, low, c.b); 1236 fill_lut (lookup_b, mask_b, sh_b, low, c.b);
1540 1237
1541 /* apply table to input image (replacing colors by newly calculated ones) */ 1238 /* apply table to input image (replacing colors by newly calculated ones) */
1542 if (ximage->bits_per_pixel == 32 1239 if (ximage->bits_per_pixel == 32
1543 && (ximage->depth == 24 || ximage->depth == 32)
1544 && ximage->byte_order == host_byte_order) 1240 && ximage->byte_order == host_byte_order)
1545 { 1241 {
1546 uint32_t *p1, *pf, *p, *pl; 1242 char *line = ximage->data;
1547 p1 = (uint32_t *) ximage->data;
1548 pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line);
1549 1243
1550 while (p1 < pf) 1244 for (int y = 0; y < ximage->height; y++)
1551 {
1552 p = p1;
1553 pl = p1 + ximage->width;
1554 for (; p < pl; p++)
1555 { 1245 {
1556 *p = lookup_r[(*p & 0xff0000) >> 16] | 1246 uint32_t *p = (uint32_t *)line;
1557 lookup_g[(*p & 0x00ff00) >> 8] | 1247 for (int x = 0; x < ximage->width; x++)
1558 lookup_b[(*p & 0x0000ff)] |
1559 (*p & 0xff000000);
1560 } 1248 {
1561 p1 = (uint32_t *) ((char *) p1 + ximage->bytes_per_line); 1249 *p = lookup_r[(*p & mask_r) >> sh_r] |
1250 lookup_g[(*p & mask_g) >> sh_g] |
1251 lookup_b[(*p & mask_b) >> sh_b];
1252 p++;
1253 }
1254 line += ximage->bytes_per_line;
1562 } 1255 }
1563 } 1256 }
1564 else 1257 else
1565 { 1258 {
1566 for (int y = 0; y < ximage->height; y++) 1259 for (int y = 0; y < ximage->height; y++)
1574 } 1267 }
1575 } 1268 }
1576 1269
1577 free (lookup); 1270 free (lookup);
1578} 1271}
1579#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1272#endif /* ENABLE_TRANSPARENCY */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines