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

Diff Legend

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