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.67 by sf-exg, Mon Oct 4 21:56:42 2010 UTC vs.
Revision 1.118 by sf-exg, Tue Nov 16 15:49:56 2010 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 <pcg@goof.com> 6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com>
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 * 9 *
9 * 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
10 * 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
11 * the Free Software Foundation; either version 2 of the License, or 12 * the Free Software Foundation; either version 2 of the License, or
12 * (at your option) any later version. 13 * (at your option) any later version.
… …
19 * 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
20 * along with this program; if not, write to the Free Software 21 * along with this program; if not, write to the Free Software
21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 22 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22 *---------------------------------------------------------------------*/ 23 *---------------------------------------------------------------------*/
23 24
25#include <cmath>
24#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
25#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
28
29#if XRENDER
30# include <X11/extensions/Xrender.h>
31#endif
32
33#ifndef FilterConvolution
34#define FilterConvolution "convolution"
35#endif
26 36
27#define DO_TIMING_TEST 0 37#define DO_TIMING_TEST 0
28 38
29#if DO_TIMING_TEST 39#if DO_TIMING_TEST
30# include <sys/time.h> 40# include <sys/time.h>
… …
104#ifdef BG_IMAGE_FROM_FILE 114#ifdef BG_IMAGE_FROM_FILE
105 have_image = false; 115 have_image = false;
106 h_scale = v_scale = 0; 116 h_scale = v_scale = 0;
107 h_align = v_align = 0; 117 h_align = v_align = 0;
108#endif 118#endif
119#ifdef ENABLE_TRANSPARENCY
120 shade = 100;
121#endif
109 flags = 0; 122 flags = 0;
110 pixmap = None; 123 pixmap = None;
111 valid_since = invalid_since = 0; 124 valid_since = invalid_since = 0;
112 target = 0; 125 target = 0;
113} 126}
… …
163 return true; 176 return true;
164 } 177 }
165# endif 178# endif
166 179
167 return false; 180 return false;
168}; 181}
169 182
170bool bgPixmap_t::need_client_side_rendering () 183bool bgPixmap_t::need_client_side_rendering ()
171{ 184{
172# ifdef HAVE_AFTERIMAGE 185# ifdef HAVE_AFTERIMAGE
173 if (original_asim) 186 if (original_asim)
174 return true; 187 return true;
175# endif
176# ifdef ENABLE_TRANSPARENCY
177 if (flags & isTransparent)
178 {
179# ifdef HAVE_AFTERIMAGE // can't blur without libAI anyways
180 if ((flags & blurNeeded) && !(flags & blurServerSide))
181 return true;
182# endif
183 if ((flags & tintNeeded) && !(flags & tintServerSide))
184 return true;
185 }
186# endif 188# endif
187 return false; 189 return false;
188} 190}
189 191
190# ifdef BG_IMAGE_FROM_FILE 192# ifdef BG_IMAGE_FROM_FILE
… …
228 int diff = window_size - image_size; 230 int diff = window_size - image_size;
229 int smaller = min (image_size, window_size); 231 int smaller = min (image_size, window_size);
230 232
231 if (align >= 0 && align <= 100) 233 if (align >= 0 && align <= 100)
232 return diff * align / 100; 234 return diff * align / 100;
233 else if (align > 100 && align <= 200 ) 235 else if (align > 100 && align <= 200)
234 return ((align - 100) * smaller / 100) + window_size - smaller; 236 return ((align - 100) * smaller / 100) + window_size - smaller;
235 else if (align >= -100 && align < 0) 237 else if (align >= -100 && align < 0)
236 return ((align + 100) * smaller / 100) - image_size; 238 return ((align + 100) * smaller / 100) - image_size;
237 return 0; 239 return 0;
238} 240}
… …
256} 258}
257 259
258bool 260bool
259bgPixmap_t::set_geometry (const char *geom) 261bgPixmap_t::set_geometry (const char *geom)
260{ 262{
263 bool changed = false;
261 int geom_flags = 0, changed = 0; 264 int geom_flags = 0;
262 int x = 0, y = 0; 265 int x = 0, y = 0;
263 unsigned int w = 0, h = 0; 266 unsigned int w = 0, h = 0;
264 unsigned int n; 267 unsigned int n;
265 unsigned long new_flags = (flags & (~geometryFlags)); 268 unsigned long new_flags = (flags & (~geometryFlags));
266 const char *p; 269 const char *p;
… …
422 425
423 while (*ops != ':' && *ops != '\0') ++ops; 426 while (*ops != ':' && *ops != '\0') ++ops;
424 } /* done parsing ops */ 427 } /* done parsing ops */
425 } 428 }
426 429
427 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed; 430 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
428 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed; 431 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
429 if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed; 432 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
430 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed; 433 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
431 } 434 }
432 435
433 if (new_flags != flags) 436 if (new_flags != flags)
434 { 437 {
435 flags = new_flags; 438 flags = new_flags;
436 changed++; 439 changed = true;
437 } 440 }
438 441
439 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
440 // flags, h_scale, v_scale, h_align, v_align);
441 return (changed > 0); 442 return changed;
442} 443}
443 444
444void 445void
445bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 446bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
446{ 447{
… …
458 { 459 {
459 w = h_scale * target_width / 100; 460 w = h_scale * target_width / 100;
460 h = v_scale * target_height / 100; 461 h = v_scale * target_height / 100;
461 } 462 }
462 463
464 if (!w) w = image_width;
465 if (!h) h = image_height;
466
463 if (flags & rootAlign) 467 if (flags & rootAlign)
464 { 468 {
465 target->get_window_origin (x, y); 469 target->get_window_origin (x, y);
466 x = -x; 470 x = -x;
467 y = -y; 471 y = -y;
468 } 472 }
469 else 473 else
470 { 474 {
471 x = make_align_position (h_align, target_width, w > 0 ? w : image_width); 475 x = make_align_position (h_align, target_width, w);
472 y = make_align_position (v_align, target_height, h > 0 ? h : image_height); 476 y = make_align_position (v_align, target_height, h);
473 } 477 }
474 478
475 flags &= ~sizeSensitive; 479 flags &= ~sizeSensitive;
476 if (h_scale != 0 || v_scale != 0 480 if ((flags & propScale) || h_scale || v_scale
477 || h_align != 0 || v_align != 0 481 || (!(flags & rootAlign) && (h_align || v_align))
478 || image_width > target_width || image_height > target_height) 482 || w > target_width || h > target_height)
479 flags |= sizeSensitive; 483 flags |= sizeSensitive;
480} 484}
481 485
482# ifdef HAVE_AFTERIMAGE 486# ifdef HAVE_AFTERIMAGE
483bool 487bool
… …
496 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); 500 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
497 501
498 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 502 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
499 { 503 {
500 ShadingInfo as_shade; 504 ShadingInfo as_shade;
501 as_shade.shading = (shade == 0) ? 100 : shade; 505 as_shade.shading = shade;
502 506
503 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 507 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
504 if (flags & tintSet) 508 if (flags & tintSet)
505 tint.get (c); 509 tint.get (c);
506 as_shade.tintColor.red = c.r; 510 as_shade.tintColor.red = c.r;
… …
508 as_shade.tintColor.blue = c.b; 512 as_shade.tintColor.blue = c.b;
509 513
510 background_tint = shading2tint32 (&as_shade); 514 background_tint = shading2tint32 (&as_shade);
511 } 515 }
512 516
513 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL) 517 if (!(background_flags & transpPmapBlurred) && (flags & blurNeeded) && background != NULL)
514 { 518 {
515 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 519 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
516 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 520 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
517 100, ASIMAGE_QUALITY_DEFAULT); 521 100, ASIMAGE_QUALITY_DEFAULT);
518 if (tmp) 522 if (tmp)
… …
533 int x = 0; 537 int x = 0;
534 int y = 0; 538 int y = 0;
535 int w = 0; 539 int w = 0;
536 int h = 0; 540 int h = 0;
537 541
538 TIMING_TEST_START (asim);
539
540 if (original_asim) 542 if (original_asim)
541 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y); 543 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
542 544
543 if (!original_asim 545 if (!original_asim
544 || (!(flags & rootAlign) 546 || (!(flags & rootAlign)
545 && (x >= target_width 547 && (x >= target_width
546 || y >= target_height 548 || y >= target_height
547 || (w > 0 && x + w <= 0)
548 || (h > 0 && y + h <= 0)))) 549 || (x + w <= 0)
550 || (y + h <= 0))))
549 { 551 {
550 if (background) 552 if (background)
551 { 553 {
552 new_pmap_width = background->width; 554 new_pmap_width = background->width;
553 new_pmap_height = background->height; 555 new_pmap_height = background->height;
… …
567 } 569 }
568 else 570 else
569 { 571 {
570 result = original_asim; 572 result = original_asim;
571 573
572 if ((w > 0 && w != original_asim->width) 574 if ((w != original_asim->width)
573 || (h > 0 && h != original_asim->height)) 575 || (h != original_asim->height))
574 { 576 {
575 result = scale_asimage (target->asv, original_asim, 577 result = scale_asimage (target->asv, original_asim,
576 w > 0 ? w : original_asim->width, 578 w, h,
577 h > 0 ? h : original_asim->height,
578 background ? ASA_ASImage : ASA_XImage, 579 background ? ASA_ASImage : ASA_XImage,
579 100, ASIMAGE_QUALITY_DEFAULT); 580 100, ASIMAGE_QUALITY_DEFAULT);
580 } 581 }
581 582
582 if (background == NULL) 583 if (background == NULL)
… …
614 layers[0].clip_width = target_width; 615 layers[0].clip_width = target_width;
615 layers[0].clip_height = target_height; 616 layers[0].clip_height = target_height;
616 layers[0].tint = background_tint; 617 layers[0].tint = background_tint;
617 layers[1].im = result; 618 layers[1].im = result;
618 619
619 if (w <= 0) 620 if (h_scale == 0 || v_scale == 0)
620 { 621 {
621 /* tile horizontally */ 622 /* tile horizontally */
622 while (x > 0) x -= (int)result->width; 623 while (x > 0) x -= (int)result->width;
623 layers[1].dst_x = x; 624 layers[1].dst_x = x;
624 layers[1].clip_width = result->width+target_width; 625 layers[1].clip_width = result->width+target_width;
… …
628 /* clip horizontally */ 629 /* clip horizontally */
629 layers[1].dst_x = x; 630 layers[1].dst_x = x;
630 layers[1].clip_width = result->width; 631 layers[1].clip_width = result->width;
631 } 632 }
632 633
633 if (h <= 0) 634 if (h_scale == 0 || v_scale == 0)
634 { 635 {
635 while (y > 0) y -= (int)result->height; 636 while (y > 0) y -= (int)result->height;
636 layers[1].dst_y = y; 637 layers[1].dst_y = y;
637 layers[1].clip_height = result->height + target_height; 638 layers[1].clip_height = result->height + target_height;
638 } 639 }
… …
661 } 662 }
662 663
663 free (layers); 664 free (layers);
664 } 665 }
665 } 666 }
666 TIMING_TEST_PRINT_RESULT (asim);
667 667
668 bool ret = false; 668 bool ret = false;
669 669
670 if (result) 670 if (result)
671 { 671 {
672 XGCValues gcv; 672 XGCValues gcv;
673 GC gc; 673 GC gc;
674 674
675 if (pixmap)
676 {
677 if (pmap_width != new_pmap_width
678 || pmap_height != new_pmap_height
679 || pmap_depth != target->depth)
680 {
681 XFreePixmap (target->dpy, pixmap);
682 pixmap = None;
683 }
684 }
685
686 /* create Pixmap */ 675 /* create Pixmap */
687 if (pixmap == None) 676 if (pixmap == None
677 || pmap_width != new_pmap_width
678 || pmap_height != new_pmap_height
679 || pmap_depth != target->depth)
688 { 680 {
681 if (pixmap)
682 XFreePixmap (target->dpy, pixmap);
689 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 683 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
690 pmap_width = new_pmap_width; 684 pmap_width = new_pmap_width;
691 pmap_height = new_pmap_height; 685 pmap_height = new_pmap_height;
692 pmap_depth = target->depth; 686 pmap_depth = target->depth;
693 } 687 }
… …
717 711
718 if (result != background && result != original_asim) 712 if (result != background && result != original_asim)
719 destroy_asimage (&result); 713 destroy_asimage (&result);
720 714
721 XFreeGC (target->dpy, gc); 715 XFreeGC (target->dpy, gc);
722 TIMING_TEST_PRINT_RESULT (asim);
723 716
724 ret = true; 717 ret = true;
725 } 718 }
726 719
727 if (background) 720 if (background)
… …
739 return false; 732 return false;
740 733
741 if (!pixbuf) 734 if (!pixbuf)
742 return false; 735 return false;
743 736
744 // TODO: add alpha blending
745 if (background_flags) 737 if (background_flags
738 && !(flags & HAS_RENDER))
746 return false; 739 return false;
747 740
748 GdkPixbuf *result; 741 GdkPixbuf *result;
749 742
750 int image_width = gdk_pixbuf_get_width (pixbuf); 743 int image_width = gdk_pixbuf_get_width (pixbuf);
… …
763 get_image_geometry (image_width, image_height, w, h, x, y); 756 get_image_geometry (image_width, image_height, w, h, x, y);
764 757
765 if (!(flags & rootAlign) 758 if (!(flags & rootAlign)
766 && (x >= target_width 759 && (x >= target_width
767 || y >= target_height 760 || y >= target_height
768 || (w > 0 && x + w <= 0)
769 || (h > 0 && y + h <= 0))) 761 || (x + w <= 0)
762 || (y + h <= 0)))
770 return false; 763 return false;
771 764
772 result = pixbuf; 765 result = pixbuf;
773 766
774 if ((w > 0 && w != image_width) 767 if ((w != image_width)
775 || (h > 0 && h != image_height)) 768 || (h != image_height))
776 { 769 {
777 result = gdk_pixbuf_scale_simple (pixbuf, 770 result = gdk_pixbuf_scale_simple (pixbuf,
778 w > 0 ? w : image_width, 771 w, h,
779 h > 0 ? h : image_height,
780 GDK_INTERP_BILINEAR); 772 GDK_INTERP_BILINEAR);
781 } 773 }
782 774
783 bool ret = false; 775 bool ret = false;
784 776
785 if (result) 777 if (result)
786 { 778 {
787 XGCValues gcv; 779 XGCValues gcv;
788 GC gc; 780 GC gc;
781 Pixmap root_pmap;
789 782
790 image_width = gdk_pixbuf_get_width (result); 783 image_width = gdk_pixbuf_get_width (result);
791 image_height = gdk_pixbuf_get_height (result); 784 image_height = gdk_pixbuf_get_height (result);
792 785
786 if (background_flags)
787 {
788 root_pmap = pixmap;
789 pixmap = None;
790 }
791 else
792 {
793 if (h_scale == 0 || v_scale == 0) 793 if (h_scale == 0 || v_scale == 0)
794 { 794 {
795 new_pmap_width = min (image_width, target_width); 795 new_pmap_width = min (image_width, target_width);
796 new_pmap_height = min (image_height, target_height); 796 new_pmap_height = min (image_height, target_height);
797 }
798
799 if (pixmap)
800 {
801 if (pmap_width != new_pmap_width
802 || pmap_height != new_pmap_height
803 || pmap_depth != target->depth)
804 { 797 }
805 XFreePixmap (target->dpy, pixmap);
806 pixmap = None;
807 } 798 }
808 }
809 799
810 if (pixmap == None) 800 if (pixmap == None
801 || pmap_width != new_pmap_width
802 || pmap_height != new_pmap_height
803 || pmap_depth != target->depth)
811 { 804 {
805 if (pixmap)
806 XFreePixmap (target->dpy, pixmap);
812 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 807 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
813 pmap_width = new_pmap_width; 808 pmap_width = new_pmap_width;
814 pmap_height = new_pmap_height; 809 pmap_height = new_pmap_height;
815 pmap_depth = target->depth; 810 pmap_depth = target->depth;
816 } 811 }
… …
857 dst_width, dst_height, 852 dst_width, dst_height,
858 XLIB_RGB_DITHER_NONE, 853 XLIB_RGB_DITHER_NONE,
859 0, 0); 854 0, 0);
860 } 855 }
861 856
857#if XRENDER
858 if (background_flags)
859 {
860 Display *dpy = target->dpy;
861 XRenderPictureAttributes pa;
862
863 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, target->visual);
864 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
865
866 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
867 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
868
869 pa.repeat = True;
870 Pixmap mask_pmap = XCreatePixmap (dpy, target->vt, 1, 1, 8);
871 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
872 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
873 XFreePixmap (dpy, mask_pmap);
874
875 if (src && dst && mask)
876 {
877 XRenderColor mask_c;
878
879 mask_c.alpha = 0x8000;
880 mask_c.red = 0;
881 mask_c.green = 0;
882 mask_c.blue = 0;
883 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
884 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
885 }
886
887 XRenderFreePicture (dpy, src);
888 XRenderFreePicture (dpy, dst);
889 XRenderFreePicture (dpy, mask);
890
891 XFreePixmap (dpy, root_pmap);
892 }
893#endif
894
862 if (result != pixbuf) 895 if (result != pixbuf)
863 g_object_unref (result); 896 g_object_unref (result);
864 897
865 XFreeGC (target->dpy, gc); 898 XFreeGC (target->dpy, gc);
866 899
… …
872# endif /* HAVE_PIXBUF */ 905# endif /* HAVE_PIXBUF */
873 906
874bool 907bool
875bgPixmap_t::set_file (const char *file) 908bgPixmap_t::set_file (const char *file)
876{ 909{
877 assert (file); 910 if (!file || !*file)
911 return false;
878 912
879 if (*file)
880 {
881 if (const char *p = strchr (file, ';')) 913 if (const char *p = strchr (file, ';'))
882 { 914 {
883 size_t len = p - file; 915 size_t len = p - file;
884 char *f = rxvt_temp_buf<char> (len + 1); 916 char *f = rxvt_temp_buf<char> (len + 1);
885 memcpy (f, file, len); 917 memcpy (f, file, len);
886 f[len] = '\0'; 918 f[len] = '\0';
887 file = f; 919 file = f;
888 } 920 }
889 921
890# ifdef HAVE_AFTERIMAGE 922# ifdef HAVE_AFTERIMAGE
891 if (!target->asimman) 923 if (!target->asimman)
892 target->asimman = create_generic_imageman (target->rs[Rs_path]); 924 target->asimman = create_generic_imageman (target->rs[Rs_path]);
893 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 925 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
926 if (image)
927 {
894 if (original_asim) 928 if (original_asim)
929 safe_asimage_destroy (original_asim);
930 original_asim = image;
895 have_image = true; 931 have_image = true;
896 return have_image; 932 return true;
933 }
897# endif 934# endif
898 935
899# ifdef HAVE_PIXBUF 936# ifdef HAVE_PIXBUF
900 pixbuf = gdk_pixbuf_new_from_file (file, NULL); 937 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
938 if (image)
939 {
901 if (pixbuf) 940 if (pixbuf)
941 g_object_unref (pixbuf);
942 pixbuf = image;
902 have_image = true; 943 have_image = true;
903 return have_image; 944 return true;
945 }
904# endif 946# endif
905 }
906 947
907 return false; 948 return false;
908} 949}
909 950
910# endif /* BG_IMAGE_FROM_FILE */ 951# endif /* BG_IMAGE_FROM_FILE */
… …
923} 964}
924 965
925bool 966bool
926bgPixmap_t::set_blur_radius (const char *geom) 967bgPixmap_t::set_blur_radius (const char *geom)
927{ 968{
928 int changed = 0; 969 bool changed = false;
929 unsigned int hr, vr; 970 unsigned int hr, vr;
930 int junk; 971 int junk;
931 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 972 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
932 973
933 if (!(geom_flags & WidthValue)) 974 if (!(geom_flags & WidthValue))
934 hr = 1; 975 hr = 1;
935 if (!(geom_flags & HeightValue)) 976 if (!(geom_flags & HeightValue))
936 vr = hr; 977 vr = hr;
937 978
979 min_it (hr, 128);
980 min_it (vr, 128);
981
938 if (h_blurRadius != hr) 982 if (h_blurRadius != hr)
939 { 983 {
940 ++changed; 984 changed = true;
941 h_blurRadius = hr; 985 h_blurRadius = hr;
942 } 986 }
943 987
944 if (v_blurRadius != vr) 988 if (v_blurRadius != vr)
945 { 989 {
946 ++changed; 990 changed = true;
947 v_blurRadius = vr; 991 v_blurRadius = vr;
948 } 992 }
949 993
950 if (v_blurRadius == 0 && h_blurRadius == 0) 994 if (v_blurRadius == 0 && h_blurRadius == 0)
951 flags &= ~blurNeeded; 995 flags &= ~blurNeeded;
952 else 996 else
953 flags |= blurNeeded; 997 flags |= blurNeeded;
954 998
955 return (changed > 0); 999 return changed;
956} 1000}
957 1001
958static inline unsigned long 1002static inline unsigned long
959compute_tint_shade_flags (rxvt_color *tint, int shade) 1003compute_tint_shade_flags (rxvt_color *tint, int shade)
960{ 1004{
961 unsigned long flags = 0; 1005 unsigned long flags = 0;
962 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1006 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
963 bool has_shade = (shade > 0 && shade < 100) || (shade > 100 && shade < 200); 1007 bool has_shade = shade != 100;
964 1008
965 if (tint) 1009 if (tint)
966 { 1010 {
967 tint->get (c); 1011 tint->get (c);
968# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 1012# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
… …
982 { 1026 {
983 flags |= bgPixmap_t::tintNeeded; 1027 flags |= bgPixmap_t::tintNeeded;
984 } 1028 }
985 } 1029 }
986 1030
987 if (flags & bgPixmap_t::tintNeeded)
988 {
989 if (flags & bgPixmap_t::tintWholesome)
990 flags |= bgPixmap_t::tintServerSide;
991 else
992 {
993#if XFT
994 flags |= bgPixmap_t::tintServerSide;
995#endif
996 }
997 }
998
999 return flags; 1031 return flags;
1000} 1032}
1001 1033
1002bool 1034bool
1003bgPixmap_t::set_tint (rxvt_color &new_tint) 1035bgPixmap_t::set_tint (rxvt_color &new_tint)
1004{ 1036{
1005 if (tint != new_tint) 1037 if (!(flags & tintSet) || tint != new_tint)
1006 { 1038 {
1007 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1039 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
1008 tint = new_tint; 1040 tint = new_tint;
1009 flags = (flags & ~tintFlags) | new_flags | tintSet; 1041 flags = (flags & ~tintFlags) | new_flags | tintSet;
1010 return true; 1042 return true;
… …
1028} 1060}
1029 1061
1030bool 1062bool
1031bgPixmap_t::set_shade (const char *shade_str) 1063bgPixmap_t::set_shade (const char *shade_str)
1032{ 1064{
1033 int new_shade = (shade_str) ? atoi (shade_str) : 0; 1065 int new_shade = (shade_str) ? atoi (shade_str) : 100;
1034 1066
1035 if (new_shade < 0 && new_shade > -100) 1067 clamp_it (new_shade, -100, 200);
1068 if (new_shade < 0)
1036 new_shade = 200 - (100 + new_shade); 1069 new_shade = 200 - (100 + new_shade);
1037 else if (new_shade == 100)
1038 new_shade = 0;
1039 1070
1040 if (new_shade != shade) 1071 if (new_shade != shade)
1041 { 1072 {
1042 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 1073 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
1043 shade = new_shade; 1074 shade = new_shade;
… …
1046 } 1077 }
1047 1078
1048 return false; 1079 return false;
1049} 1080}
1050 1081
1082#if XRENDER
1083static void
1084get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1085{
1086 double sigma = radius / 2.0;
1087 double scale = sqrt (2.0 * M_PI) * sigma;
1088 double sum = 0.0;
1089
1090 for (int i = 0; i < width; i++)
1091 {
1092 double x = i - width / 2;
1093 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1094 sum += kernel[i];
1095 }
1096
1097 params[0] = XDoubleToFixed (width);
1098 params[1] = XDoubleToFixed (1);
1099
1100 for (int i = 0; i < width; i++)
1101 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1102}
1103#endif
1104
1051bool 1105bool
1052bgPixmap_t::tint_pixmap (Pixmap pixmap) 1106bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1053{ 1107{
1054 Window root = target->display->root; 1108 bool ret = false;
1109#if XRENDER
1110 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1111 double *kernel = (double *)malloc (size * sizeof (double));
1112 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1113
1055 Display *dpy = target->dpy; 1114 Display *dpy = target->dpy;
1056 int window_width = target->szHint.width; 1115 XRenderPictureAttributes pa;
1057 int window_height = target->szHint.height; 1116 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1117
1118 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1119 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1120
1121 if (kernel && params && src && dst)
1122 {
1123 if (h_blurRadius)
1124 {
1125 size = h_blurRadius * 2 + 1;
1126 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1127
1128 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1129 XRenderComposite (dpy,
1130 PictOpSrc,
1131 src,
1132 None,
1133 dst,
1134 0, 0,
1135 0, 0,
1136 0, 0,
1137 width, height);
1138 }
1139
1140 if (v_blurRadius)
1141 {
1142 size = v_blurRadius * 2 + 1;
1143 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1144 swap (params[0], params[1]);
1145
1146 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1147 XRenderComposite (dpy,
1148 PictOpSrc,
1149 src,
1150 None,
1151 dst,
1152 0, 0,
1153 0, 0,
1154 0, 0,
1155 width, height);
1156 }
1157
1158 ret = true;
1159 }
1160
1161 free (kernel);
1162 free (params);
1163 XRenderFreePicture (dpy, src);
1164 XRenderFreePicture (dpy, dst);
1165#endif
1166 return ret;
1167}
1168
1169bool
1170bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1171{
1172 Display *dpy = target->dpy;
1058 bool ret = false; 1173 bool ret = false;
1059 1174
1060 if (flags & tintWholesome) 1175 if (flags & tintWholesome)
1061 { 1176 {
1062 XGCValues gcv; 1177 XGCValues gcv;
… …
1066 * performance improvements, as we eliminate XImage transfer 1181 * performance improvements, as we eliminate XImage transfer
1067 */ 1182 */
1068 gcv.foreground = Pixel (tint); 1183 gcv.foreground = Pixel (tint);
1069 gcv.function = GXand; 1184 gcv.function = GXand;
1070 gcv.fill_style = FillSolid; 1185 gcv.fill_style = FillSolid;
1071 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv); 1186 gc = XCreateGC (dpy, pixmap, GCFillStyle | GCForeground | GCFunction, &gcv);
1072 if (gc) 1187 if (gc)
1073 { 1188 {
1074 XFillRectangle (dpy, pixmap, gc, 0, 0, window_width, window_height); 1189 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1075 ret = true; 1190 ret = true;
1076 XFreeGC (dpy, gc); 1191 XFreeGC (dpy, gc);
1077 } 1192 }
1078 } 1193 }
1079 else 1194 else
1080 { 1195 {
1081# if XFT 1196# if XRENDER
1082 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1197 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1083 1198
1084 if (flags & tintSet) 1199 if (flags & tintSet)
1085 tint.get (c); 1200 tint.get (c);
1086 1201
1087 if (shade > 0 && shade < 100) 1202 if (shade <= 100)
1088 { 1203 {
1089 c.r = (c.r * shade) / 100; 1204 c.r = (c.r * shade) / 100;
1090 c.g = (c.g * shade) / 100; 1205 c.g = (c.g * shade) / 100;
1091 c.b = (c.b * shade) / 100; 1206 c.b = (c.b * shade) / 100;
1092 } 1207 }
1093 else if (shade > 100 && shade < 200) 1208 else
1094 {
1095 c.r = (c.r * (200 - shade)) / 100;
1096 c.g = (c.g * (200 - shade)) / 100;
1097 c.b = (c.b * (200 - shade)) / 100;
1098 } 1209 {
1210 c.r = ((0xffff - c.r) * (200 - shade)) / 100;
1211 c.g = ((0xffff - c.g) * (200 - shade)) / 100;
1212 c.b = ((0xffff - c.b) * (200 - shade)) / 100;
1213 }
1099 1214
1100 XRenderPictFormat pf; 1215 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1101 pf.type = PictTypeDirect;
1102 pf.depth = 32;
1103 pf.direct.redMask = 0xff;
1104 pf.direct.greenMask = 0xff;
1105 pf.direct.blueMask = 0xff;
1106 pf.direct.alphaMask = 0xff;
1107
1108 XRenderPictFormat *solid_format = XRenderFindFormat (dpy, 1216 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1109 (PictFormatType|
1110 PictFormatDepth|
1111 PictFormatRedMask|
1112 PictFormatGreenMask|
1113 PictFormatBlueMask|
1114 PictFormatAlphaMask),
1115 &pf,
1116 0);
1117 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
1118 XRenderPictureAttributes pa; 1217 XRenderPictureAttributes pa;
1119 1218
1120 Picture back_pic = XRenderCreatePicture (dpy, pixmap, root_format, 0, &pa); 1219 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1121 1220
1122 pa.repeat = True; 1221 pa.repeat = True;
1123 1222
1124 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32); 1223 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1125 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa); 1224 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1126 XFreePixmap (dpy, overlay_pmap); 1225 XFreePixmap (dpy, overlay_pmap);
1127 1226
1128 pa.component_alpha = True; 1227 pa.component_alpha = True;
1129 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32); 1228 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1130 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa); 1229 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1131 XFreePixmap (dpy, mask_pmap); 1230 XFreePixmap (dpy, mask_pmap);
1132 1231
1133 if (mask_pic && overlay_pic && back_pic) 1232 if (mask_pic && overlay_pic && back_pic)
1134 { 1233 {
1135 XRenderColor mask_c; 1234 XRenderColor mask_c;
1136 1235
1137 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); 1236 mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0;
1138 mask_c.alpha = 0xffff; 1237 mask_c.alpha = 0xffff;
1139 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1238 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1140 1239
1141 mask_c.alpha = 0; 1240 mask_c.alpha = 0;
1142 mask_c.red = 0xffff - c.r; 1241 mask_c.red = 0xffff - c.r;
1143 mask_c.green = 0xffff - c.g; 1242 mask_c.green = 0xffff - c.g;
1144 mask_c.blue = 0xffff - c.b; 1243 mask_c.blue = 0xffff - c.b;
1145 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1244 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1146 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height); 1245 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1147 ret = true; 1246 ret = true;
1148 } 1247 }
1149 1248
1150 XRenderFreePicture (dpy, mask_pic); 1249 XRenderFreePicture (dpy, mask_pic);
1151 XRenderFreePicture (dpy, overlay_pic); 1250 XRenderFreePicture (dpy, overlay_pic);
1152 XRenderFreePicture (dpy, back_pic); 1251 XRenderFreePicture (dpy, back_pic);
1153# if DO_TIMING_TEST
1154 XSync (dpy, False);
1155# endif
1156# endif 1252# endif
1157 } 1253 }
1158 1254
1159 return ret; 1255 return ret;
1160} 1256}
1161 1257
1162/* make_transparency_pixmap() 1258/* make_transparency_pixmap()
1163 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1259 * Builds a pixmap of the same size as the terminal window that contains
1164 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 1260 * the tiled portion of the root pixmap that is supposed to be covered by
1165 * our window. 1261 * our window.
1166 */ 1262 */
1167unsigned long 1263unsigned long
1168bgPixmap_t::make_transparency_pixmap () 1264bgPixmap_t::make_transparency_pixmap ()
1169{ 1265{
… …
1173 return 0; 1269 return 0;
1174 1270
1175 /* root dimensions may change from call to call - but Display structure should 1271 /* root dimensions may change from call to call - but Display structure should
1176 * be always up-to-date, so let's use it : 1272 * be always up-to-date, so let's use it :
1177 */ 1273 */
1178 Window root = target->display->root;
1179 int screen = target->display->screen; 1274 int screen = target->display->screen;
1180 Display *dpy = target->dpy; 1275 Display *dpy = target->dpy;
1276 int root_depth = DefaultDepth (dpy, screen);
1181 int root_width = DisplayWidth (dpy, screen); 1277 int root_width = DisplayWidth (dpy, screen);
1182 int root_height = DisplayHeight (dpy, screen); 1278 int root_height = DisplayHeight (dpy, screen);
1183 unsigned int root_pmap_width, root_pmap_height; 1279 unsigned int root_pmap_width, root_pmap_height;
1184 int window_width = target->szHint.width; 1280 int window_width = target->szHint.width;
1185 int window_height = target->szHint.height; 1281 int window_height = target->szHint.height;
1186 int sx, sy; 1282 int sx, sy;
1187 XGCValues gcv; 1283 XGCValues gcv;
1284 GC gc;
1188 1285
1189 TIMING_TEST_START (tp);
1190 target->get_window_origin (sx, sy); 1286 target->get_window_origin (sx, sy);
1191 1287
1192 /* check if we are outside of the visible part of the virtual screen : */ 1288 /* check if we are outside of the visible part of the virtual screen : */
1193 if (sx + window_width <= 0 || sy + window_height <= 0 1289 if (sx + window_width <= 0 || sy + window_height <= 0
1194 || sx >= root_width || sy >= root_height) 1290 || sx >= root_width || sy >= root_height)
1195 return 0; 1291 return 0;
1196 1292
1293 // validate root pixmap and get its size
1197 if (root_pixmap != None) 1294 if (root_pixmap != None)
1198 { 1295 {
1199 /* we want to validate the pixmap and get it's size at the same time : */ 1296 Window wdummy;
1200 int junk; 1297 int idummy;
1201 unsigned int ujunk; 1298 unsigned int udummy;
1202 /* root pixmap may be bad - allow a error */ 1299
1203 target->allowedxerror = -1; 1300 target->allowedxerror = -1;
1204 1301
1205 if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk)) 1302 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy))
1206 root_pixmap = None; 1303 root_pixmap = None;
1207 1304
1208 target->allowedxerror = 0; 1305 target->allowedxerror = 0;
1209 } 1306 }
1210 1307
1308 Pixmap recoded_root_pmap = root_pixmap;
1309
1310 if (root_pixmap != None && root_depth != target->depth)
1311 {
1312#if XRENDER
1313 if (flags & HAS_RENDER)
1314 {
1315 XRenderPictureAttributes pa;
1316
1317 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1318 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1319
1320 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
1321 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
1322 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1323
1324 if (src && dst)
1325 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1326 else
1327 {
1328 XFreePixmap (dpy, recoded_root_pmap);
1329 root_pixmap = None;
1330 }
1331
1332 XRenderFreePicture (dpy, src);
1333 XRenderFreePicture (dpy, dst);
1334 }
1335 else
1336#endif
1337 root_pixmap = None;
1338 }
1339
1340 if (root_pixmap == None)
1341 return 0;
1342
1211 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1343 Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth);
1212 GC gc = NULL;
1213 1344
1214 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1345 if (tiled_root_pmap == None) /* something really bad happened - abort */
1215 return 0; 1346 return 0;
1216 1347
1217 if (root_pixmap == None)
1218 {
1219 /* use tricks to obtain the root background image :*/
1220 /* we want to create Overrideredirect window overlapping out window
1221 with background type of Parent Relative and then grab it */
1222 XSetWindowAttributes attr;
1223 Window src;
1224 bool success = false;
1225
1226 attr.background_pixmap = ParentRelative;
1227 attr.backing_store = Always;
1228 attr.event_mask = ExposureMask;
1229 attr.override_redirect = True;
1230 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
1231 CopyFromParent, CopyFromParent, CopyFromParent,
1232 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
1233 &attr);
1234
1235 if (src != None)
1236 {
1237 XEvent event;
1238 int ev_count = 0;
1239 XGrabServer (dpy);
1240 XMapRaised (dpy, src);
1241 XSync (dpy, False);
1242
1243 /* XSync should get window where it's properly exposed,
1244 * but to be on the safe side - let's check for the actual event to arrive : */
1245 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
1246 ++ev_count;
1247
1248 if (ev_count > 0);
1249 {
1250 /* hooray! - we can grab the image! */
1251 gc = XCreateGC (dpy, root, 0, NULL);
1252 if (gc)
1253 {
1254 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
1255 success = true;
1256 }
1257 }
1258
1259 XDestroyWindow (dpy, src);
1260 XUngrabServer (dpy);
1261 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
1262 }
1263
1264 if (!success)
1265 {
1266 XFreePixmap (dpy, tiled_root_pmap);
1267 tiled_root_pmap = None;
1268 }
1269 else
1270 result |= transpPmapTiled;
1271 }
1272 else
1273 {
1274 /* straightforward pixmap copy */ 1348 /* straightforward pixmap copy */
1275 gcv.tile = root_pixmap; 1349 gcv.tile = recoded_root_pmap;
1276 gcv.fill_style = FillTiled; 1350 gcv.fill_style = FillTiled;
1277 1351
1278 while (sx < 0) sx += (int)root_width; 1352 while (sx < 0) sx += (int)root_width;
1279 while (sy < 0) sy += (int)root_height; 1353 while (sy < 0) sy += (int)root_height;
1280 1354
1281 gcv.ts_x_origin = -sx; 1355 gcv.ts_x_origin = -sx;
1282 gcv.ts_y_origin = -sy; 1356 gcv.ts_y_origin = -sy;
1283 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1357 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1284 1358
1285 if (gc) 1359 if (gc)
1286 { 1360 {
1287 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1361 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1288 result |= transpPmapTiled; 1362 result |= transpPmapTiled;
1289 } 1363 XFreeGC (dpy, gc);
1290 }
1291 TIMING_TEST_PRINT_RESULT (tp);
1292 1364
1293 if (tiled_root_pmap != None)
1294 {
1295 if (!need_client_side_rendering ()) 1365 if (!need_client_side_rendering ())
1296 { 1366 {
1367 if ((flags & blurNeeded)
1368 && (flags & HAS_RENDER_CONV))
1369 {
1370 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1371 result |= transpPmapBlurred;
1372 }
1297 if ((flags & tintNeeded)) 1373 if ((flags & tintNeeded)
1374 && (flags & (tintWholesome | HAS_RENDER)))
1298 { 1375 {
1299 if (tint_pixmap (tiled_root_pmap)) 1376 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1300 result |= transpPmapTinted; 1377 result |= transpPmapTinted;
1301 } 1378 }
1302 } /* server side rendering completed */ 1379 } /* server side rendering completed */
1303 1380
1304 if (pixmap) 1381 if (pixmap)
1305 XFreePixmap (dpy, pixmap); 1382 XFreePixmap (dpy, pixmap);
1306 1383
1307 pixmap = tiled_root_pmap; 1384 pixmap = tiled_root_pmap;
1308 pmap_width = window_width; 1385 pmap_width = window_width;
1309 pmap_height = window_height; 1386 pmap_height = window_height;
1310 pmap_depth = root_depth; 1387 pmap_depth = target->depth;
1311 } 1388 }
1389 else
1390 XFreePixmap (dpy, tiled_root_pmap);
1312 1391
1313 if (gc) 1392 if (recoded_root_pmap != root_pixmap)
1314 XFreeGC (dpy, gc); 1393 XFreePixmap (dpy, recoded_root_pmap);
1315
1316 TIMING_TEST_PRINT_RESULT (tp);
1317 1394
1318 return result; 1395 return result;
1319} 1396}
1320 1397
1321bool 1398void
1322bgPixmap_t::set_root_pixmap () 1399bgPixmap_t::set_root_pixmap ()
1323{ 1400{
1324 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1401 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1325 if (new_root_pixmap == None) 1402 if (new_root_pixmap == None)
1326 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1403 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1327 1404
1328 if (new_root_pixmap != root_pixmap)
1329 {
1330 root_pixmap = new_root_pixmap; 1405 root_pixmap = new_root_pixmap;
1331 return true;
1332 }
1333
1334 return false;
1335} 1406}
1336# endif /* ENABLE_TRANSPARENCY */ 1407# endif /* ENABLE_TRANSPARENCY */
1337 1408
1338# ifndef HAVE_AFTERIMAGE 1409#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1339static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm); 1410static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c);
1340# endif 1411# endif
1341 1412
1342bool 1413bool
1343bgPixmap_t::render () 1414bgPixmap_t::render ()
1344{ 1415{
1345 unsigned long background_flags = 0; 1416 unsigned long background_flags = 0;
1346 1417
1347 if (target == NULL) 1418 if (target == NULL)
1348 return false; 1419 return false;
1349
1350 TIMING_TEST_START (tp);
1351 1420
1352 invalidate (); 1421 invalidate ();
1353# ifdef ENABLE_TRANSPARENCY 1422# ifdef ENABLE_TRANSPARENCY
1354 if (flags & isTransparent) 1423 if (flags & isTransparent)
1355 { 1424 {
1356 /* we need to re-generate transparency pixmap in that case ! */ 1425 /* we need to re-generate transparency pixmap in that case ! */
1357 background_flags = make_transparency_pixmap (); 1426 background_flags = make_transparency_pixmap ();
1358 if (background_flags == 0) 1427 if (background_flags == 0)
1359 return false; 1428 return false;
1360 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1429 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1361 && pmap_depth == target->depth)
1362 flags = flags & ~isInvalid; 1430 flags = flags & ~isInvalid;
1363 } 1431 }
1364# endif 1432# endif
1365 1433
1366# ifdef BG_IMAGE_FROM_FILE 1434# ifdef BG_IMAGE_FROM_FILE
… …
1370 if (render_image (background_flags)) 1438 if (render_image (background_flags))
1371 flags = flags & ~isInvalid; 1439 flags = flags & ~isInvalid;
1372 } 1440 }
1373# endif 1441# endif
1374 1442
1443# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1375 XImage *result = NULL; 1444 XImage *result = NULL;
1376 1445
1377 if (background_flags && (flags & isInvalid)) 1446 if (background_flags && (flags & isInvalid))
1378 { 1447 {
1379 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1448 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1380 } 1449 }
1381 1450
1382 if (result) 1451 if (result)
1383 { 1452 {
1384# if !defined(HAVE_AFTERIMAGE) && !XFT
1385 /* our own client-side tinting */ 1453 /* our own client-side tinting */
1386 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1387 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1388 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1454 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1389 { 1455 {
1390 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1456 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1391 if (flags & tintSet) 1457 if (flags & tintSet)
1392 tint.get (c); 1458 tint.get (c);
1393 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1459 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1394 } 1460 }
1395# endif
1396 1461
1397 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1462 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1398 1463
1399 if (gc) 1464 if (gc)
1400 { 1465 {
1401 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1402 {
1403 XFreePixmap (target->dpy, pixmap);
1404 pixmap = None;
1405 }
1406
1407 if (pixmap == None)
1408 {
1409 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1410 pmap_width = result->width;
1411 pmap_height = result->height;
1412 pmap_depth = target->depth;
1413 }
1414
1415 if (pmap_depth != result->depth)
1416 {
1417 /* Bad Match error will ensue ! stupid X !!!! */
1418 if (result->depth == 24 && pmap_depth == 32)
1419 result->depth = 32;
1420 else if (result->depth == 32 && pmap_depth == 24)
1421 result->depth = 24;
1422 else
1423 {
1424 /* TODO: implement image recoding */
1425 }
1426 }
1427
1428 if (pmap_depth == result->depth)
1429 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1466 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1430 1467
1431 XFreeGC (target->dpy, gc); 1468 XFreeGC (target->dpy, gc);
1432 flags = flags & ~isInvalid; 1469 flags = flags & ~isInvalid;
1433 } 1470 }
1434 1471
1435 XDestroyImage (result); 1472 XDestroyImage (result);
1436 } 1473 }
1474# endif
1437 1475
1438 if (flags & isInvalid) 1476 if (flags & isInvalid)
1439 { 1477 {
1440 if (pixmap != None) 1478 if (pixmap != None)
1441 { 1479 {
… …
1444 } 1482 }
1445 } 1483 }
1446 1484
1447 apply (); 1485 apply ();
1448 1486
1449 XSync (target->dpy, False);
1450 valid_since = ev::now (); 1487 valid_since = ev::now ();
1451 1488
1452 TIMING_TEST_PRINT_RESULT (tp);
1453
1454 return true; 1489 return true;
1455} 1490}
1456 1491
1457bool 1492void
1458bgPixmap_t::set_target (rxvt_term *new_target) 1493bgPixmap_t::set_target (rxvt_term *new_target)
1459{ 1494{
1460 if (new_target)
1461 if (target != new_target)
1462 {
1463 target = new_target; 1495 target = new_target;
1464# ifdef ENABLE_TRANSPARENCY 1496
1465 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1497 flags &= ~(HAS_RENDER | HAS_RENDER_CONV);
1498#if XRENDER
1499 int major, minor;
1500 if (XRenderQueryVersion (target->dpy, &major, &minor))
1501 flags |= HAS_RENDER;
1502 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1503 if (filters)
1504 {
1505 for (int i = 0; i < filters->nfilter; i++)
1506 if (!strcmp (filters->filter[i], FilterConvolution))
1507 flags |= HAS_RENDER_CONV;
1508
1509 XFree (filters);
1510 }
1466# endif 1511#endif
1467 return true;
1468 }
1469
1470 return false;
1471} 1512}
1472 1513
1473void 1514void
1474bgPixmap_t::apply () 1515bgPixmap_t::apply ()
1475{ 1516{
1476 if (target) 1517 if (target == NULL)
1477 { 1518 return;
1478 flags &= ~isVtOrigin;
1479 1519
1480 if (pixmap != None) 1520 if (pixmap != None)
1481 { 1521 {
1482 /* set target's background to pixmap */ 1522 /* set target's background to pixmap */
1483# ifdef ENABLE_TRANSPARENCY 1523# ifdef ENABLE_TRANSPARENCY
1484 if (flags & isTransparent) 1524 if (flags & isTransparent)
1485 { 1525 {
1486 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1526 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1487 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1527 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1488 1528
1489 if (target->scrollBar.win) 1529 if (target->scrollBar.win)
1490 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1530 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1491 } 1531 }
1492 else 1532 else
1493# endif 1533# endif
1494 { 1534 {
1495 flags |= isVtOrigin;
1496 /* force old pixmap dereference in case it was transparent before :*/ 1535 /* force old pixmap dereference in case it was transparent before :*/
1497 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1498 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1499 /* do we also need to set scrollbar's background here ? */
1500
1501 if (target->scrollBar.win)
1502 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1503 }
1504 }
1505 else
1506 {
1507 /* set target background to a pixel */
1508 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1536 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1509 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1537 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1510 /* do we also need to set scrollbar's background here ? */ 1538 /* do we also need to set scrollbar's background here ? */
1539
1511 if (target->scrollBar.win) 1540 if (target->scrollBar.win)
1512 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1541 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1513 } 1542 }
1543 }
1544 else
1545 {
1546 /* set target background to a pixel */
1547 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1548 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1549 /* do we also need to set scrollbar's background here ? */
1550 if (target->scrollBar.win)
1551 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1552 }
1514 1553
1515 /* don't want Expose on the parent or vt. It is better to use 1554 /* don't want Expose on the parent or vt. It is better to use
1516 scr_touch or we get a great deal of flicker otherwise: */ 1555 scr_touch or we get a great deal of flicker otherwise: */
1517 XClearWindow (target->dpy, target->parent[0]); 1556 XClearWindow (target->dpy, target->parent[0]);
1518 1557
1519 if (target->scrollBar.state && target->scrollBar.win) 1558 if (target->scrollBar.state && target->scrollBar.win)
1520 { 1559 {
1521 target->scrollBar.state = STATE_IDLE; 1560 target->scrollBar.state = STATE_IDLE;
1522 target->scrollBar.show (0); 1561 target->scrollBar.show (0);
1523 } 1562 }
1524 1563
1525 target->want_refresh = 1; 1564 target->want_refresh = 1;
1526 flags |= hasChanged; 1565 flags |= hasChanged;
1527 }
1528} 1566}
1529 1567
1530#endif /* HAVE_BG_PIXMAP */ 1568#endif /* HAVE_BG_PIXMAP */
1531 1569
1532#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1570#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1533/* taken from aterm-0.4.2 */ 1571/* taken from aterm-0.4.2 */
1534 1572
1535typedef uint32_t RUINT32T;
1536
1537static void 1573static void
1538ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm) 1574ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c)
1539{ 1575{
1540 int sh_r, sh_g, sh_b; 1576 int sh_r, sh_g, sh_b;
1541 RUINT32T mask_r, mask_g, mask_b; 1577 uint32_t mask_r, mask_g, mask_b;
1542 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1578 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1543 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1579 rgba low;
1544 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1580 rgba high;
1545 int i; 1581 int i;
1582 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1546 1583
1547 Visual *visual = term->visual;
1548
1549 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1584 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1550
1551 if (shade == 0)
1552 shade = 100;
1553 1585
1554 /* for convenience */ 1586 /* for convenience */
1555 mask_r = visual->red_mask; 1587 mask_r = visual->red_mask;
1556 mask_g = visual->green_mask; 1588 mask_g = visual->green_mask;
1557 mask_b = visual->blue_mask; 1589 mask_b = visual->blue_mask;
1558 1590
1559 /* boring lookup table pre-initialization */ 1591 /* boring lookup table pre-initialization */
1560 switch (srcImage->bits_per_pixel) { 1592 switch (srcImage->depth)
1593 {
1561 case 15: 1594 case 15:
1562 if ((mask_r != 0x7c00) || 1595 if ((mask_r != 0x7c00) ||
1563 (mask_g != 0x03e0) || 1596 (mask_g != 0x03e0) ||
1564 (mask_b != 0x001f)) 1597 (mask_b != 0x001f))
1565 return; 1598 return;
1566 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1599 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32));
1567 lookup_r = lookup; 1600 lookup_r = lookup;
1568 lookup_g = lookup+32; 1601 lookup_g = lookup+32;
1569 lookup_b = lookup+32+32; 1602 lookup_b = lookup+32+32;
1570 sh_r = 10; 1603 sh_r = 10;
1571 sh_g = 5; 1604 sh_g = 5;
1572 sh_b = 0; 1605 sh_b = 0;
1573 break; 1606 break;
1574 case 16: 1607 case 16:
1575 if ((mask_r != 0xf800) || 1608 if ((mask_r != 0xf800) ||
1576 (mask_g != 0x07e0) || 1609 (mask_g != 0x07e0) ||
1577 (mask_b != 0x001f)) 1610 (mask_b != 0x001f))
1578 return; 1611 return;
1579 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1612 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1580 lookup_r = lookup; 1613 lookup_r = lookup;
1581 lookup_g = lookup+32; 1614 lookup_g = lookup+32;
1582 lookup_b = lookup+32+64; 1615 lookup_b = lookup+32+64;
1583 sh_r = 11; 1616 sh_r = 11;
1584 sh_g = 5; 1617 sh_g = 5;
1585 sh_b = 0; 1618 sh_b = 0;
1586 break; 1619 break;
1587 case 24: 1620 case 24:
1588 if ((mask_r != 0xff0000) || 1621 if ((mask_r != 0xff0000) ||
1589 (mask_g != 0x00ff00) || 1622 (mask_g != 0x00ff00) ||
1590 (mask_b != 0x0000ff)) 1623 (mask_b != 0x0000ff))
1591 return; 1624 return;
1592 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1625 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1593 lookup_r = lookup; 1626 lookup_r = lookup;
1594 lookup_g = lookup+256; 1627 lookup_g = lookup+256;
1595 lookup_b = lookup+256+256; 1628 lookup_b = lookup+256+256;
1596 sh_r = 16; 1629 sh_r = 16;
1597 sh_g = 8; 1630 sh_g = 8;
1598 sh_b = 0; 1631 sh_b = 0;
1599 break; 1632 break;
1600 case 32: 1633 case 32:
1601 if ((mask_r != 0xff0000) || 1634 if ((mask_r != 0xff0000) ||
1602 (mask_g != 0x00ff00) || 1635 (mask_g != 0x00ff00) ||
1603 (mask_b != 0x0000ff)) 1636 (mask_b != 0x0000ff))
1604 return; 1637 return;
1605 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1638 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1606 lookup_r = lookup; 1639 lookup_r = lookup;
1607 lookup_g = lookup+256; 1640 lookup_g = lookup+256;
1608 lookup_b = lookup+256+256; 1641 lookup_b = lookup+256+256;
1609 sh_r = 16; 1642 sh_r = 16;
1610 sh_g = 8; 1643 sh_g = 8;
1611 sh_b = 0; 1644 sh_b = 0;
1612 break; 1645 break;
1613 default: 1646 default:
1614 return; /* we do not support this color depth */ 1647 return; /* we do not support this color depth */
1615 } 1648 }
1616 1649
1617 /* prepare limits for color transformation (each channel is handled separately) */ 1650 /* prepare limits for color transformation (each channel is handled separately) */
1618 if (shade < 0) { 1651 if (shade > 100)
1652 {
1619 shade = -shade; 1653 shade = 200 - shade;
1620 if (shade < 0) shade = 0;
1621 if (shade > 100) shade = 100;
1622 1654
1623 lower_lim_r = 65535-rm; 1655 high.r = (65535 - c.r) * shade / 100;
1624 lower_lim_g = 65535-gm; 1656 high.g = (65535 - c.g) * shade / 100;
1625 lower_lim_b = 65535-bm; 1657 high.b = (65535 - c.b) * shade / 100;
1626 1658
1627 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1659 low.r = 65535 - high.r;
1628 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1660 low.g = 65535 - high.g;
1629 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1661 low.b = 65535 - high.b;
1630
1631 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1632 } else {
1633 if (shade < 0) shade = 0;
1634 if (shade > 100) shade = 100;
1635
1636 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1637
1638 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1639 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1640 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1641 } 1662 }
1642 1663 else
1643 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1644 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1645 { 1664 {
1646 unsigned int tmp; 1665 high.r = c.r * shade / 100;
1666 high.g = c.g * shade / 100;
1667 high.b = c.b * shade / 100;
1647 1668
1648 tmp = lower_lim_r; 1669 low.r = low.g = low.b = 0;
1649 lower_lim_r = lower_lim_b;
1650 lower_lim_b = tmp;
1651
1652 tmp = upper_lim_r;
1653 upper_lim_r = upper_lim_b;
1654 upper_lim_b = tmp;
1655 } 1670 }
1656 1671
1657 /* fill our lookup tables */ 1672 /* fill our lookup tables */
1658 for (i = 0; i <= mask_r>>sh_r; i++) 1673 for (i = 0; i <= mask_r>>sh_r; i++)
1659 { 1674 {
1660 RUINT32T tmp; 1675 uint32_t tmp;
1661 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1676 tmp = i * high.r;
1662 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1677 tmp += (mask_r>>sh_r) * low.r;
1663 lookup_r[i] = (tmp/65535)<<sh_r; 1678 lookup_r[i] = (tmp/65535)<<sh_r;
1664 } 1679 }
1665 for (i = 0; i <= mask_g>>sh_g; i++) 1680 for (i = 0; i <= mask_g>>sh_g; i++)
1666 { 1681 {
1667 RUINT32T tmp; 1682 uint32_t tmp;
1668 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1683 tmp = i * high.g;
1669 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1684 tmp += (mask_g>>sh_g) * low.g;
1670 lookup_g[i] = (tmp/65535)<<sh_g; 1685 lookup_g[i] = (tmp/65535)<<sh_g;
1671 } 1686 }
1672 for (i = 0; i <= mask_b>>sh_b; i++) 1687 for (i = 0; i <= mask_b>>sh_b; i++)
1673 { 1688 {
1674 RUINT32T tmp; 1689 uint32_t tmp;
1675 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1690 tmp = i * high.b;
1676 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1691 tmp += (mask_b>>sh_b) * low.b;
1677 lookup_b[i] = (tmp/65535)<<sh_b; 1692 lookup_b[i] = (tmp/65535)<<sh_b;
1678 } 1693 }
1679 1694
1680 /* apply table to input image (replacing colors by newly calculated ones) */ 1695 /* apply table to input image (replacing colors by newly calculated ones) */
1681 switch (srcImage->bits_per_pixel) 1696 if (srcImage->bits_per_pixel == 32
1697 && (srcImage->depth == 24 || srcImage->depth == 32)
1698 && srcImage->byte_order == host_byte_order)
1682 { 1699 {
1683 case 15:
1684 {
1685 unsigned short *p1, *pf, *p, *pl; 1700 uint32_t *p1, *pf, *p, *pl;
1686 p1 = (unsigned short *) srcImage->data; 1701 p1 = (uint32_t *) srcImage->data;
1687 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1702 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1703
1688 while (p1 < pf) 1704 while (p1 < pf)
1689 { 1705 {
1690 p = p1; 1706 p = p1;
1691 pl = p1 + srcImage->width; 1707 pl = p1 + srcImage->width;
1692 for (; p < pl; p++) 1708 for (; p < pl; p++)
1693 { 1709 {
1694 *p = lookup_r[(*p & 0x7c00)>>10] |
1695 lookup_g[(*p & 0x03e0)>> 5] |
1696 lookup_b[(*p & 0x001f)];
1697 }
1698 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1699 }
1700 break;
1701 }
1702 case 16:
1703 {
1704 unsigned short *p1, *pf, *p, *pl;
1705 p1 = (unsigned short *) srcImage->data;
1706 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1707 while (p1 < pf)
1708 {
1709 p = p1;
1710 pl = p1 + srcImage->width;
1711 for (; p < pl; p++)
1712 {
1713 *p = lookup_r[(*p & 0xf800)>>11] |
1714 lookup_g[(*p & 0x07e0)>> 5] |
1715 lookup_b[(*p & 0x001f)];
1716 }
1717 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1718 }
1719 break;
1720 }
1721 case 24:
1722 {
1723 unsigned char *p1, *pf, *p, *pl;
1724 p1 = (unsigned char *) srcImage->data;
1725 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1726 while (p1 < pf)
1727 {
1728 p = p1;
1729 pl = p1 + srcImage->width * 3;
1730 for (; p < pl; p += 3)
1731 {
1732 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1733 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1734 p[2] = lookup_r[(p[2] & 0x0000ff)];
1735 }
1736 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1737 }
1738 break;
1739 }
1740 case 32:
1741 {
1742 RUINT32T *p1, *pf, *p, *pl;
1743 p1 = (RUINT32T *) srcImage->data;
1744 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1745
1746 while (p1 < pf)
1747 {
1748 p = p1;
1749 pl = p1 + srcImage->width;
1750 for (; p < pl; p++)
1751 {
1752 *p = lookup_r[(*p & 0xff0000)>>16] | 1710 *p = lookup_r[(*p & 0xff0000) >> 16] |
1753 lookup_g[(*p & 0x00ff00)>> 8] | 1711 lookup_g[(*p & 0x00ff00) >> 8] |
1754 lookup_b[(*p & 0x0000ff)] | 1712 lookup_b[(*p & 0x0000ff)] |
1755 (*p & ~0xffffff); 1713 (*p & 0xff000000);
1714 }
1715 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line);
1716 }
1717 }
1718 else
1719 {
1720 for (int y = 0; y < srcImage->height; y++)
1721 for (int x = 0; x < srcImage->width; x++)
1722 {
1723 unsigned long pixel = XGetPixel (srcImage, x, y);
1724 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1725 lookup_g[(pixel & mask_g) >> sh_g] |
1726 lookup_b[(pixel & mask_b) >> sh_b];
1727 XPutPixel (srcImage, x, y, pixel);
1756 } 1728 }
1757 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1758 } 1729 }
1759 break;
1760 }
1761 }
1762 1730
1763 free (lookup); 1731 free (lookup);
1764} 1732}
1765#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1733#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */

Diff Legend

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