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.81 by sf-exg, Wed Oct 13 23:08:11 2010 UTC

… …
19 * You should have received a copy of the GNU General Public License 19 * You should have received a copy of the GNU General Public License
20 * along with this program; if not, write to the Free Software 20 * along with this program; if not, write to the Free Software
21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22 *---------------------------------------------------------------------*/ 22 *---------------------------------------------------------------------*/
23 23
24#include <cmath>
24#include "../config.h" /* NECESSARY */ 25#include "../config.h" /* NECESSARY */
25#include "rxvt.h" /* NECESSARY */ 26#include "rxvt.h" /* NECESSARY */
26 27
27#define DO_TIMING_TEST 0 28#define DO_TIMING_TEST 0
28 29
… …
104#ifdef BG_IMAGE_FROM_FILE 105#ifdef BG_IMAGE_FROM_FILE
105 have_image = false; 106 have_image = false;
106 h_scale = v_scale = 0; 107 h_scale = v_scale = 0;
107 h_align = v_align = 0; 108 h_align = v_align = 0;
108#endif 109#endif
110#ifdef ENABLE_TRANSPARENCY
111 shade = 100;
112#endif
109 flags = 0; 113 flags = 0;
110 pixmap = None; 114 pixmap = None;
111 valid_since = invalid_since = 0; 115 valid_since = invalid_since = 0;
112 target = 0; 116 target = 0;
113} 117}
… …
174 return true; 178 return true;
175# endif 179# endif
176# ifdef ENABLE_TRANSPARENCY 180# ifdef ENABLE_TRANSPARENCY
177 if (flags & isTransparent) 181 if (flags & isTransparent)
178 { 182 {
179# ifdef HAVE_AFTERIMAGE // can't blur without libAI anyways 183# ifdef HAVE_AFTERIMAGE
180 if ((flags & blurNeeded) && !(flags & blurServerSide)) 184 if ((flags & blurNeeded) && !(flags & blurServerSide))
181 return true; 185 return true;
182# endif 186# endif
183 if ((flags & tintNeeded) && !(flags & tintServerSide)) 187 if ((flags & tintNeeded) && !(flags & tintServerSide))
184 return true; 188 return true;
… …
499 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); 503 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
500 504
501 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 505 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
502 { 506 {
503 ShadingInfo as_shade; 507 ShadingInfo as_shade;
504 as_shade.shading = (shade == 0) ? 100 : shade; 508 as_shade.shading = shade;
505 509
506 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 510 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
507 if (flags & tintSet) 511 if (flags & tintSet)
508 tint.get (c); 512 tint.get (c);
509 as_shade.tintColor.red = c.r; 513 as_shade.tintColor.red = c.r;
… …
511 as_shade.tintColor.blue = c.b; 515 as_shade.tintColor.blue = c.b;
512 516
513 background_tint = shading2tint32 (&as_shade); 517 background_tint = shading2tint32 (&as_shade);
514 } 518 }
515 519
516 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL) 520 if (!(background_flags & transpPmapBlurred) && (flags & blurNeeded) && background != NULL)
517 { 521 {
518 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 522 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, 523 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
520 100, ASIMAGE_QUALITY_DEFAULT); 524 100, ASIMAGE_QUALITY_DEFAULT);
521 if (tmp) 525 if (tmp)
… …
616 layers[0].clip_width = target_width; 620 layers[0].clip_width = target_width;
617 layers[0].clip_height = target_height; 621 layers[0].clip_height = target_height;
618 layers[0].tint = background_tint; 622 layers[0].tint = background_tint;
619 layers[1].im = result; 623 layers[1].im = result;
620 624
621 if (w <= 0) 625 if (h_scale == 0 || v_scale == 0)
622 { 626 {
623 /* tile horizontally */ 627 /* tile horizontally */
624 while (x > 0) x -= (int)result->width; 628 while (x > 0) x -= (int)result->width;
625 layers[1].dst_x = x; 629 layers[1].dst_x = x;
626 layers[1].clip_width = result->width+target_width; 630 layers[1].clip_width = result->width+target_width;
… …
630 /* clip horizontally */ 634 /* clip horizontally */
631 layers[1].dst_x = x; 635 layers[1].dst_x = x;
632 layers[1].clip_width = result->width; 636 layers[1].clip_width = result->width;
633 } 637 }
634 638
635 if (h <= 0) 639 if (h_scale == 0 || v_scale == 0)
636 { 640 {
637 while (y > 0) y -= (int)result->height; 641 while (y > 0) y -= (int)result->height;
638 layers[1].dst_y = y; 642 layers[1].dst_y = y;
639 layers[1].clip_height = result->height + target_height; 643 layers[1].clip_height = result->height + target_height;
640 } 644 }
… …
741 return false; 745 return false;
742 746
743 if (!pixbuf) 747 if (!pixbuf)
744 return false; 748 return false;
745 749
746 // TODO: add alpha blending 750#if !XFT
747 if (background_flags) 751 if (background_flags)
748 return false; 752 return false;
753#endif
749 754
750 GdkPixbuf *result; 755 GdkPixbuf *result;
751 756
752 int image_width = gdk_pixbuf_get_width (pixbuf); 757 int image_width = gdk_pixbuf_get_width (pixbuf);
753 int image_height = gdk_pixbuf_get_height (pixbuf); 758 int image_height = gdk_pixbuf_get_height (pixbuf);
… …
785 790
786 if (result) 791 if (result)
787 { 792 {
788 XGCValues gcv; 793 XGCValues gcv;
789 GC gc; 794 GC gc;
795 Pixmap root_pmap;
790 796
791 image_width = gdk_pixbuf_get_width (result); 797 image_width = gdk_pixbuf_get_width (result);
792 image_height = gdk_pixbuf_get_height (result); 798 image_height = gdk_pixbuf_get_height (result);
793 799
800 if (background_flags)
801 {
802 root_pmap = pixmap;
803 pixmap = None;
804 }
805 else
806 {
794 if (h_scale == 0 || v_scale == 0) 807 if (h_scale == 0 || v_scale == 0)
795 { 808 {
796 new_pmap_width = min (image_width, target_width); 809 new_pmap_width = min (image_width, target_width);
797 new_pmap_height = min (image_height, target_height); 810 new_pmap_height = min (image_height, target_height);
811 }
798 } 812 }
799 813
800 if (pixmap) 814 if (pixmap)
801 { 815 {
802 if (pmap_width != new_pmap_width 816 if (pmap_width != new_pmap_width
… …
857 dst_x, dst_y, 871 dst_x, dst_y,
858 dst_width, dst_height, 872 dst_width, dst_height,
859 XLIB_RGB_DITHER_NONE, 873 XLIB_RGB_DITHER_NONE,
860 0, 0); 874 0, 0);
861 } 875 }
876
877#if XFT
878 if (background_flags)
879 {
880 Display *dpy = target->dpy;
881 XRenderPictureAttributes pa;
882
883 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen));
884 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
885
886 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
887 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
888
889 pa.repeat = True;
890 Pixmap mask_pmap = XCreatePixmap (dpy, target->vt, 1, 1, 8);
891 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
892 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
893 XFreePixmap (dpy, mask_pmap);
894
895 if (src && dst && mask)
896 {
897 XRenderColor mask_c;
898
899 mask_c.alpha = 0x8000;
900 mask_c.red = 0;
901 mask_c.green = 0;
902 mask_c.blue = 0;
903 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
904 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
905 }
906
907 XRenderFreePicture (dpy, src);
908 XRenderFreePicture (dpy, dst);
909 XRenderFreePicture (dpy, mask);
910
911 XFreePixmap (dpy, root_pmap);
912 }
913#endif
862 914
863 if (result != pixbuf) 915 if (result != pixbuf)
864 g_object_unref (result); 916 g_object_unref (result);
865 917
866 XFreeGC (target->dpy, gc); 918 XFreeGC (target->dpy, gc);
… …
934 if (!(geom_flags & WidthValue)) 986 if (!(geom_flags & WidthValue))
935 hr = 1; 987 hr = 1;
936 if (!(geom_flags & HeightValue)) 988 if (!(geom_flags & HeightValue))
937 vr = hr; 989 vr = hr;
938 990
991 min_it (hr, 128);
992 min_it (vr, 128);
993
939 if (h_blurRadius != hr) 994 if (h_blurRadius != hr)
940 { 995 {
941 ++changed; 996 ++changed;
942 h_blurRadius = hr; 997 h_blurRadius = hr;
943 } 998 }
… …
951 if (v_blurRadius == 0 && h_blurRadius == 0) 1006 if (v_blurRadius == 0 && h_blurRadius == 0)
952 flags &= ~blurNeeded; 1007 flags &= ~blurNeeded;
953 else 1008 else
954 flags |= blurNeeded; 1009 flags |= blurNeeded;
955 1010
1011#if XFT
1012 XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root);
1013 if (filters)
1014 {
1015 for (int i = 0; i < filters->nfilter; i++)
1016 if (!strcmp (filters->filter[i], FilterConvolution))
1017 flags |= bgPixmap_t::blurServerSide;
1018
1019 XFree (filters);
1020 }
1021#endif
1022
956 return (changed > 0); 1023 return (changed > 0);
957} 1024}
958 1025
959static inline unsigned long 1026static inline unsigned long
960compute_tint_shade_flags (rxvt_color *tint, int shade) 1027compute_tint_shade_flags (rxvt_color *tint, int shade)
961{ 1028{
962 unsigned long flags = 0; 1029 unsigned long flags = 0;
963 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1030 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
964 bool has_shade = (shade > 0 && shade < 100) || (shade > 100 && shade < 200); 1031 bool has_shade = shade != 100;
965 1032
966 if (tint) 1033 if (tint)
967 { 1034 {
968 tint->get (c); 1035 tint->get (c);
969# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 1036# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
… …
1001} 1068}
1002 1069
1003bool 1070bool
1004bgPixmap_t::set_tint (rxvt_color &new_tint) 1071bgPixmap_t::set_tint (rxvt_color &new_tint)
1005{ 1072{
1006 if (tint != new_tint) 1073 if (!(flags & tintSet) || tint != new_tint)
1007 { 1074 {
1008 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1075 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
1009 tint = new_tint; 1076 tint = new_tint;
1010 flags = (flags & ~tintFlags) | new_flags | tintSet; 1077 flags = (flags & ~tintFlags) | new_flags | tintSet;
1011 return true; 1078 return true;
… …
1029} 1096}
1030 1097
1031bool 1098bool
1032bgPixmap_t::set_shade (const char *shade_str) 1099bgPixmap_t::set_shade (const char *shade_str)
1033{ 1100{
1034 int new_shade = (shade_str) ? atoi (shade_str) : 0; 1101 int new_shade = (shade_str) ? atoi (shade_str) : 100;
1035 1102
1036 if (new_shade < 0 && new_shade > -100) 1103 clamp_it (new_shade, -100, 200);
1104 if (new_shade < 0)
1037 new_shade = 200 - (100 + new_shade); 1105 new_shade = 200 - (100 + new_shade);
1038 else if (new_shade == 100)
1039 new_shade = 0;
1040 1106
1041 if (new_shade != shade) 1107 if (new_shade != shade)
1042 { 1108 {
1043 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 1109 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
1044 shade = new_shade; 1110 shade = new_shade;
… …
1047 } 1113 }
1048 1114
1049 return false; 1115 return false;
1050} 1116}
1051 1117
1118static void
1119get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1120{
1121 double sigma = radius / 2.0;
1122 double scale = sqrt (2.0 * M_PI) * sigma;
1123 double sum = 0.0;
1124
1125 for (int i = 0; i < width; i++)
1126 {
1127 double x = i - width / 2;
1128 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1129 sum += kernel[i];
1130 }
1131
1132 params[0] = XDoubleToFixed (width);
1133 params[1] = XDoubleToFixed (1);
1134
1135 for (int i = 0; i < width; i++)
1136 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1137}
1138
1052bool 1139bool
1140bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1141{
1142 bool ret = false;
1143#if XFT
1144 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1145 double *kernel = (double *)malloc (size * sizeof (double));
1146 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1147
1148 Display *dpy = target->dpy;
1149 XRenderPictureAttributes pa;
1150 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, target->visual);
1151
1152 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1153 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1154
1155 if (kernel && params && src && dst)
1156 {
1157 if (h_blurRadius)
1158 {
1159 size = h_blurRadius * 2 + 1;
1160 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1161
1162 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1163 XRenderComposite (dpy,
1164 PictOpSrc,
1165 src,
1166 None,
1167 dst,
1168 0, 0,
1169 0, 0,
1170 0, 0,
1171 width, height);
1172 }
1173
1174 if (v_blurRadius)
1175 {
1176 size = v_blurRadius * 2 + 1;
1177 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1178 swap (params[0], params[1]);
1179
1180 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1181 XRenderComposite (dpy,
1182 PictOpSrc,
1183 src,
1184 None,
1185 dst,
1186 0, 0,
1187 0, 0,
1188 0, 0,
1189 width, height);
1190 }
1191
1192 ret = true;
1193 }
1194
1195 free (kernel);
1196 free (params);
1197 XRenderFreePicture (dpy, src);
1198 XRenderFreePicture (dpy, dst);
1199#endif
1200 return ret;
1201}
1202
1203bool
1053bgPixmap_t::tint_pixmap (Pixmap pixmap, Window root, int width, int height) 1204bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1054{ 1205{
1055 Display *dpy = target->dpy; 1206 Display *dpy = target->dpy;
1056 bool ret = false; 1207 bool ret = false;
1057 1208
1058 if (flags & tintWholesome) 1209 if (flags & tintWholesome)
… …
1064 * performance improvements, as we eliminate XImage transfer 1215 * performance improvements, as we eliminate XImage transfer
1065 */ 1216 */
1066 gcv.foreground = Pixel (tint); 1217 gcv.foreground = Pixel (tint);
1067 gcv.function = GXand; 1218 gcv.function = GXand;
1068 gcv.fill_style = FillSolid; 1219 gcv.fill_style = FillSolid;
1069 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv); 1220 gc = XCreateGC (dpy, pixmap, GCFillStyle | GCForeground | GCFunction, &gcv);
1070 if (gc) 1221 if (gc)
1071 { 1222 {
1072 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height); 1223 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1073 ret = true; 1224 ret = true;
1074 XFreeGC (dpy, gc); 1225 XFreeGC (dpy, gc);
… …
1080 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1231 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1081 1232
1082 if (flags & tintSet) 1233 if (flags & tintSet)
1083 tint.get (c); 1234 tint.get (c);
1084 1235
1085 if (shade > 0 && shade < 100) 1236 if (shade <= 100)
1086 { 1237 {
1087 c.r = (c.r * shade) / 100; 1238 c.r = (c.r * shade) / 100;
1088 c.g = (c.g * shade) / 100; 1239 c.g = (c.g * shade) / 100;
1089 c.b = (c.b * shade) / 100; 1240 c.b = (c.b * shade) / 100;
1090 } 1241 }
1091 else if (shade > 100 && shade < 200) 1242 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 } 1243 {
1244 c.r = ((0xffff - c.r) * (200 - shade)) / 100;
1245 c.g = ((0xffff - c.g) * (200 - shade)) / 100;
1246 c.b = ((0xffff - c.b) * (200 - shade)) / 100;
1247 }
1097 1248
1098 XRenderPictFormat pf; 1249 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, 1250 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; 1251 XRenderPictureAttributes pa;
1117 1252
1118 Picture back_pic = XRenderCreatePicture (dpy, pixmap, root_format, 0, &pa); 1253 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1119 1254
1120 pa.repeat = True; 1255 pa.repeat = True;
1121 1256
1122 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32); 1257 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1123 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa); 1258 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1124 XFreePixmap (dpy, overlay_pmap); 1259 XFreePixmap (dpy, overlay_pmap);
1125 1260
1126 pa.component_alpha = True; 1261 pa.component_alpha = True;
1127 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32); 1262 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1128 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa); 1263 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1129 XFreePixmap (dpy, mask_pmap); 1264 XFreePixmap (dpy, mask_pmap);
1130 1265
1131 if (mask_pic && overlay_pic && back_pic) 1266 if (mask_pic && overlay_pic && back_pic)
1132 { 1267 {
… …
1181 unsigned int root_pmap_width, root_pmap_height; 1316 unsigned int root_pmap_width, root_pmap_height;
1182 int window_width = target->szHint.width; 1317 int window_width = target->szHint.width;
1183 int window_height = target->szHint.height; 1318 int window_height = target->szHint.height;
1184 int sx, sy; 1319 int sx, sy;
1185 XGCValues gcv; 1320 XGCValues gcv;
1321 GC gc;
1186 1322
1187 TIMING_TEST_START (tp); 1323 TIMING_TEST_START (tp);
1188 target->get_window_origin (sx, sy); 1324 target->get_window_origin (sx, sy);
1189 1325
1190 /* check if we are outside of the visible part of the virtual screen : */ 1326 /* check if we are outside of the visible part of the virtual screen : */
… …
1192 || sx >= root_width || sy >= root_height) 1328 || sx >= root_width || sy >= root_height)
1193 return 0; 1329 return 0;
1194 1330
1195 if (root_pixmap != None) 1331 if (root_pixmap != None)
1196 { 1332 {
1197 /* we want to validate the pixmap and get it's size at the same time : */ 1333 /* we want to validate the pixmap and get its size at the same time : */
1198 int junk; 1334 int junk;
1199 unsigned int ujunk; 1335 unsigned int ujunk;
1200 /* root pixmap may be bad - allow a error */ 1336 /* root pixmap may be bad - allow a error */
1201 target->allowedxerror = -1; 1337 target->allowedxerror = -1;
1202 1338
… …
1204 root_pixmap = None; 1340 root_pixmap = None;
1205 1341
1206 target->allowedxerror = 0; 1342 target->allowedxerror = 0;
1207 } 1343 }
1208 1344
1345 if (root_pixmap == None)
1346 return 0;
1347
1209 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1348 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth);
1210 GC gc = NULL;
1211 1349
1212 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1350 if (tiled_root_pmap == None) /* something really bad happened - abort */
1213 return 0; 1351 return 0;
1214 1352
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 */ 1353 /* straightforward pixmap copy */
1273 gcv.tile = root_pixmap; 1354 gcv.tile = root_pixmap;
1274 gcv.fill_style = FillTiled; 1355 gcv.fill_style = FillTiled;
1275 1356
1276 while (sx < 0) sx += (int)root_width; 1357 while (sx < 0) sx += (int)root_width;
1277 while (sy < 0) sy += (int)root_height; 1358 while (sy < 0) sy += (int)root_height;
1278 1359
1279 gcv.ts_x_origin = -sx; 1360 gcv.ts_x_origin = -sx;
1280 gcv.ts_y_origin = -sy; 1361 gcv.ts_y_origin = -sy;
1281 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1362 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1282 1363
1283 if (gc) 1364 if (gc)
1284 { 1365 {
1285 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1366 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1286 result |= transpPmapTiled; 1367 result |= transpPmapTiled;
1287 } 1368 XFreeGC (dpy, gc);
1288 } 1369 }
1289 TIMING_TEST_PRINT_RESULT (tp); 1370 TIMING_TEST_PRINT_RESULT (tp);
1290 1371
1291 if (tiled_root_pmap != None) 1372 if (tiled_root_pmap != None)
1292 { 1373 {
1293 if (!need_client_side_rendering ()) 1374 if (!need_client_side_rendering ())
1294 { 1375 {
1376 if ((flags & blurNeeded))
1377 {
1378 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height))
1379 result |= transpPmapBlurred;
1380 }
1295 if ((flags & tintNeeded)) 1381 if ((flags & tintNeeded))
1296 { 1382 {
1297 if (tint_pixmap (tiled_root_pmap, root, window_width, window_height)) 1383 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height))
1298 result |= transpPmapTinted; 1384 result |= transpPmapTinted;
1299 } 1385 }
1300 } /* server side rendering completed */ 1386 } /* server side rendering completed */
1301 1387
1302 if (pixmap) 1388 if (pixmap)
… …
1305 pixmap = tiled_root_pmap; 1391 pixmap = tiled_root_pmap;
1306 pmap_width = window_width; 1392 pmap_width = window_width;
1307 pmap_height = window_height; 1393 pmap_height = window_height;
1308 pmap_depth = root_depth; 1394 pmap_depth = root_depth;
1309 } 1395 }
1310
1311 if (gc)
1312 XFreeGC (dpy, gc);
1313 1396
1314 TIMING_TEST_PRINT_RESULT (tp); 1397 TIMING_TEST_PRINT_RESULT (tp);
1315 1398
1316 return result; 1399 return result;
1317} 1400}
… …
1543 int i; 1626 int i;
1544 1627
1545 Visual *visual = term->visual; 1628 Visual *visual = term->visual;
1546 1629
1547 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1630 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ;
1548
1549 if (shade == 0)
1550 shade = 100;
1551 1631
1552 /* for convenience */ 1632 /* for convenience */
1553 mask_r = visual->red_mask; 1633 mask_r = visual->red_mask;
1554 mask_g = visual->green_mask; 1634 mask_g = visual->green_mask;
1555 mask_b = visual->blue_mask; 1635 mask_b = visual->blue_mask;
… …
1611 default: 1691 default:
1612 return; /* we do not support this color depth */ 1692 return; /* we do not support this color depth */
1613 } 1693 }
1614 1694
1615 /* prepare limits for color transformation (each channel is handled separately) */ 1695 /* prepare limits for color transformation (each channel is handled separately) */
1616 if (shade < 0) { 1696 if (shade > 100) {
1617 shade = -shade; 1697 shade = 200 - shade;
1618 if (shade < 0) shade = 0;
1619 if (shade > 100) shade = 100;
1620 1698
1621 lower_lim_r = 65535-rm; 1699 lower_lim_r = 65535-rm;
1622 lower_lim_g = 65535-gm; 1700 lower_lim_g = 65535-gm;
1623 lower_lim_b = 65535-bm; 1701 lower_lim_b = 65535-bm;
1624 1702
… …
1626 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1704 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
1627 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1705 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
1628 1706
1629 upper_lim_r = upper_lim_g = upper_lim_b = 65535; 1707 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1630 } else { 1708 } else {
1631 if (shade < 0) shade = 0;
1632 if (shade > 100) shade = 100;
1633 1709
1634 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1710 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1635 1711
1636 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100); 1712 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1637 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100); 1713 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);

Diff Legend

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