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

Diff Legend

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