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

Diff Legend

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