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.75 by sf-exg, Sun Oct 10 21:58:00 2010 UTC vs.
Revision 1.93 by sf-exg, Tue Oct 19 14:44:30 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
… …
174{ 176{
175# ifdef HAVE_AFTERIMAGE 177# ifdef HAVE_AFTERIMAGE
176 if (original_asim) 178 if (original_asim)
177 return true; 179 return true;
178# endif 180# endif
179# ifdef ENABLE_TRANSPARENCY
180 if (flags & isTransparent)
181 {
182# ifdef HAVE_AFTERIMAGE // can't blur without libAI anyways
183 if ((flags & blurNeeded) && !(flags & blurServerSide))
184 return true;
185# endif
186 if ((flags & tintNeeded) && !(flags & tintServerSide))
187 return true;
188 }
189# endif
190 return false; 181 return false;
191} 182}
192 183
193# ifdef BG_IMAGE_FROM_FILE 184# ifdef BG_IMAGE_FROM_FILE
194static inline bool 185static inline bool
… …
231 int diff = window_size - image_size; 222 int diff = window_size - image_size;
232 int smaller = min (image_size, window_size); 223 int smaller = min (image_size, window_size);
233 224
234 if (align >= 0 && align <= 100) 225 if (align >= 0 && align <= 100)
235 return diff * align / 100; 226 return diff * align / 100;
236 else if (align > 100 && align <= 200 ) 227 else if (align > 100 && align <= 200)
237 return ((align - 100) * smaller / 100) + window_size - smaller; 228 return ((align - 100) * smaller / 100) + window_size - smaller;
238 else if (align >= -100 && align < 0) 229 else if (align >= -100 && align < 0)
239 return ((align + 100) * smaller / 100) - image_size; 230 return ((align + 100) * smaller / 100) - image_size;
240 return 0; 231 return 0;
241} 232}
… …
477 x = make_align_position (h_align, target_width, w); 468 x = make_align_position (h_align, target_width, w);
478 y = make_align_position (v_align, target_height, h); 469 y = make_align_position (v_align, target_height, h);
479 } 470 }
480 471
481 flags &= ~sizeSensitive; 472 flags &= ~sizeSensitive;
482 if (h_scale != 0 || v_scale != 0 473 if ((flags & propScale) || h_scale || v_scale
483 || h_align != 0 || v_align != 0 474 || (!(flags & rootAlign) && (h_align || v_align))
484 || w > target_width || h > target_height) 475 || w > target_width || h > target_height)
485 flags |= sizeSensitive; 476 flags |= sizeSensitive;
486} 477}
487 478
488# ifdef HAVE_AFTERIMAGE 479# ifdef HAVE_AFTERIMAGE
… …
514 as_shade.tintColor.blue = c.b; 505 as_shade.tintColor.blue = c.b;
515 506
516 background_tint = shading2tint32 (&as_shade); 507 background_tint = shading2tint32 (&as_shade);
517 } 508 }
518 509
519 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL) 510 if (!(background_flags & transpPmapBlurred) && (flags & blurNeeded) && background != NULL)
520 { 511 {
521 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 512 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
522 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 513 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
523 100, ASIMAGE_QUALITY_DEFAULT); 514 100, ASIMAGE_QUALITY_DEFAULT);
524 if (tmp) 515 if (tmp)
… …
744 return false; 735 return false;
745 736
746 if (!pixbuf) 737 if (!pixbuf)
747 return false; 738 return false;
748 739
749 // TODO: add alpha blending 740#if !XFT
750 if (background_flags) 741 if (background_flags)
751 return false; 742 return false;
743#endif
752 744
753 GdkPixbuf *result; 745 GdkPixbuf *result;
754 746
755 int image_width = gdk_pixbuf_get_width (pixbuf); 747 int image_width = gdk_pixbuf_get_width (pixbuf);
756 int image_height = gdk_pixbuf_get_height (pixbuf); 748 int image_height = gdk_pixbuf_get_height (pixbuf);
… …
788 780
789 if (result) 781 if (result)
790 { 782 {
791 XGCValues gcv; 783 XGCValues gcv;
792 GC gc; 784 GC gc;
785 Pixmap root_pmap;
793 786
794 image_width = gdk_pixbuf_get_width (result); 787 image_width = gdk_pixbuf_get_width (result);
795 image_height = gdk_pixbuf_get_height (result); 788 image_height = gdk_pixbuf_get_height (result);
796 789
790 if (background_flags)
791 {
792 root_pmap = pixmap;
793 pixmap = None;
794 }
795 else
796 {
797 if (h_scale == 0 || v_scale == 0) 797 if (h_scale == 0 || v_scale == 0)
798 { 798 {
799 new_pmap_width = min (image_width, target_width); 799 new_pmap_width = min (image_width, target_width);
800 new_pmap_height = min (image_height, target_height); 800 new_pmap_height = min (image_height, target_height);
801 }
801 } 802 }
802 803
803 if (pixmap) 804 if (pixmap)
804 { 805 {
805 if (pmap_width != new_pmap_width 806 if (pmap_width != new_pmap_width
… …
861 dst_width, dst_height, 862 dst_width, dst_height,
862 XLIB_RGB_DITHER_NONE, 863 XLIB_RGB_DITHER_NONE,
863 0, 0); 864 0, 0);
864 } 865 }
865 866
867#if XFT
868 if (background_flags)
869 {
870 Display *dpy = target->dpy;
871 XRenderPictureAttributes pa;
872
873 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen));
874 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
875
876 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
877 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
878
879 pa.repeat = True;
880 Pixmap mask_pmap = XCreatePixmap (dpy, target->vt, 1, 1, 8);
881 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
882 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
883 XFreePixmap (dpy, mask_pmap);
884
885 if (src && dst && mask)
886 {
887 XRenderColor mask_c;
888
889 mask_c.alpha = 0x8000;
890 mask_c.red = 0;
891 mask_c.green = 0;
892 mask_c.blue = 0;
893 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
894 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
895 }
896
897 XRenderFreePicture (dpy, src);
898 XRenderFreePicture (dpy, dst);
899 XRenderFreePicture (dpy, mask);
900
901 XFreePixmap (dpy, root_pmap);
902 }
903#endif
904
866 if (result != pixbuf) 905 if (result != pixbuf)
867 g_object_unref (result); 906 g_object_unref (result);
868 907
869 XFreeGC (target->dpy, gc); 908 XFreeGC (target->dpy, gc);
870 909
… …
892 } 931 }
893 932
894# ifdef HAVE_AFTERIMAGE 933# ifdef HAVE_AFTERIMAGE
895 if (!target->asimman) 934 if (!target->asimman)
896 target->asimman = create_generic_imageman (target->rs[Rs_path]); 935 target->asimman = create_generic_imageman (target->rs[Rs_path]);
897 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 936 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
937 if (image)
938 {
898 if (original_asim) 939 if (original_asim)
940 safe_asimage_destroy (original_asim);
941 original_asim = image;
899 have_image = true; 942 have_image = true;
900 return have_image; 943 return true;
944 }
901# endif 945# endif
902 946
903# ifdef HAVE_PIXBUF 947# ifdef HAVE_PIXBUF
904 pixbuf = gdk_pixbuf_new_from_file (file, NULL); 948 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
949 if (image)
950 {
905 if (pixbuf) 951 if (pixbuf)
952 g_object_unref (pixbuf);
953 pixbuf = image;
906 have_image = true; 954 have_image = true;
907 return have_image; 955 return true;
956 }
908# endif 957# endif
909 } 958 }
910 959
911 return false; 960 return false;
912} 961}
… …
937 if (!(geom_flags & WidthValue)) 986 if (!(geom_flags & WidthValue))
938 hr = 1; 987 hr = 1;
939 if (!(geom_flags & HeightValue)) 988 if (!(geom_flags & HeightValue))
940 vr = hr; 989 vr = hr;
941 990
991 min_it (hr, 128);
992 min_it (vr, 128);
993
942 if (h_blurRadius != hr) 994 if (h_blurRadius != hr)
943 { 995 {
944 ++changed; 996 ++changed;
945 h_blurRadius = hr; 997 h_blurRadius = hr;
946 } 998 }
… …
953 1005
954 if (v_blurRadius == 0 && h_blurRadius == 0) 1006 if (v_blurRadius == 0 && h_blurRadius == 0)
955 flags &= ~blurNeeded; 1007 flags &= ~blurNeeded;
956 else 1008 else
957 flags |= blurNeeded; 1009 flags |= blurNeeded;
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
958 1022
959 return (changed > 0); 1023 return (changed > 0);
960} 1024}
961 1025
962static inline unsigned long 1026static inline unsigned long
… …
1049 } 1113 }
1050 1114
1051 return false; 1115 return false;
1052} 1116}
1053 1117
1118#if XFT
1119static void
1120get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1121{
1122 double sigma = radius / 2.0;
1123 double scale = sqrt (2.0 * M_PI) * sigma;
1124 double sum = 0.0;
1125
1126 for (int i = 0; i < width; i++)
1127 {
1128 double x = i - width / 2;
1129 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1130 sum += kernel[i];
1131 }
1132
1133 params[0] = XDoubleToFixed (width);
1134 params[1] = XDoubleToFixed (1);
1135
1136 for (int i = 0; i < width; i++)
1137 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1138}
1139#endif
1140
1054bool 1141bool
1142bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1143{
1144 bool ret = false;
1145#if XFT
1146 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1147 double *kernel = (double *)malloc (size * sizeof (double));
1148 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1149
1150 Display *dpy = target->dpy;
1151 XRenderPictureAttributes pa;
1152 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1153
1154 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1155 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1156
1157 if (kernel && params && src && dst)
1158 {
1159 if (h_blurRadius)
1160 {
1161 size = h_blurRadius * 2 + 1;
1162 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1163
1164 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1165 XRenderComposite (dpy,
1166 PictOpSrc,
1167 src,
1168 None,
1169 dst,
1170 0, 0,
1171 0, 0,
1172 0, 0,
1173 width, height);
1174 }
1175
1176 if (v_blurRadius)
1177 {
1178 size = v_blurRadius * 2 + 1;
1179 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1180 swap (params[0], params[1]);
1181
1182 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1183 XRenderComposite (dpy,
1184 PictOpSrc,
1185 src,
1186 None,
1187 dst,
1188 0, 0,
1189 0, 0,
1190 0, 0,
1191 width, height);
1192 }
1193
1194 ret = true;
1195 }
1196
1197 free (kernel);
1198 free (params);
1199 XRenderFreePicture (dpy, src);
1200 XRenderFreePicture (dpy, dst);
1201#endif
1202 return ret;
1203}
1204
1205bool
1055bgPixmap_t::tint_pixmap (Pixmap pixmap, Window root, int width, int height) 1206bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1056{ 1207{
1057 Display *dpy = target->dpy; 1208 Display *dpy = target->dpy;
1058 bool ret = false; 1209 bool ret = false;
1059 1210
1060 if (flags & tintWholesome) 1211 if (flags & tintWholesome)
… …
1066 * performance improvements, as we eliminate XImage transfer 1217 * performance improvements, as we eliminate XImage transfer
1067 */ 1218 */
1068 gcv.foreground = Pixel (tint); 1219 gcv.foreground = Pixel (tint);
1069 gcv.function = GXand; 1220 gcv.function = GXand;
1070 gcv.fill_style = FillSolid; 1221 gcv.fill_style = FillSolid;
1071 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv); 1222 gc = XCreateGC (dpy, pixmap, GCFillStyle | GCForeground | GCFunction, &gcv);
1072 if (gc) 1223 if (gc)
1073 { 1224 {
1074 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height); 1225 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1075 ret = true; 1226 ret = true;
1076 XFreeGC (dpy, gc); 1227 XFreeGC (dpy, gc);
… …
1096 c.g = ((0xffff - c.g) * (200 - shade)) / 100; 1247 c.g = ((0xffff - c.g) * (200 - shade)) / 100;
1097 c.b = ((0xffff - c.b) * (200 - shade)) / 100; 1248 c.b = ((0xffff - c.b) * (200 - shade)) / 100;
1098 } 1249 }
1099 1250
1100 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32); 1251 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1101 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen))); 1252 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1102 XRenderPictureAttributes pa; 1253 XRenderPictureAttributes pa;
1103 1254
1104 Picture back_pic = XRenderCreatePicture (dpy, pixmap, root_format, 0, &pa); 1255 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1105 1256
1106 pa.repeat = True; 1257 pa.repeat = True;
1107 1258
1108 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32); 1259 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1109 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa); 1260 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1110 XFreePixmap (dpy, overlay_pmap); 1261 XFreePixmap (dpy, overlay_pmap);
1111 1262
1112 pa.component_alpha = True; 1263 pa.component_alpha = True;
1113 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32); 1264 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1114 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa); 1265 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1115 XFreePixmap (dpy, mask_pmap); 1266 XFreePixmap (dpy, mask_pmap);
1116 1267
1117 if (mask_pic && overlay_pic && back_pic) 1268 if (mask_pic && overlay_pic && back_pic)
1118 { 1269 {
… …
1167 unsigned int root_pmap_width, root_pmap_height; 1318 unsigned int root_pmap_width, root_pmap_height;
1168 int window_width = target->szHint.width; 1319 int window_width = target->szHint.width;
1169 int window_height = target->szHint.height; 1320 int window_height = target->szHint.height;
1170 int sx, sy; 1321 int sx, sy;
1171 XGCValues gcv; 1322 XGCValues gcv;
1323 GC gc;
1172 1324
1173 TIMING_TEST_START (tp); 1325 TIMING_TEST_START (tp);
1174 target->get_window_origin (sx, sy); 1326 target->get_window_origin (sx, sy);
1175 1327
1176 /* check if we are outside of the visible part of the virtual screen : */ 1328 /* check if we are outside of the visible part of the virtual screen : */
… …
1178 || sx >= root_width || sy >= root_height) 1330 || sx >= root_width || sy >= root_height)
1179 return 0; 1331 return 0;
1180 1332
1181 if (root_pixmap != None) 1333 if (root_pixmap != None)
1182 { 1334 {
1183 /* we want to validate the pixmap and get it's size at the same time : */ 1335 /* we want to validate the pixmap and get its size at the same time : */
1184 int junk; 1336 int junk;
1185 unsigned int ujunk; 1337 unsigned int ujunk;
1186 /* root pixmap may be bad - allow a error */ 1338 /* root pixmap may be bad - allow a error */
1187 target->allowedxerror = -1; 1339 target->allowedxerror = -1;
1188 1340
… …
1190 root_pixmap = None; 1342 root_pixmap = None;
1191 1343
1192 target->allowedxerror = 0; 1344 target->allowedxerror = 0;
1193 } 1345 }
1194 1346
1347 if (root_pixmap == None)
1348 return 0;
1349
1195 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1350 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth);
1196 GC gc = NULL;
1197 1351
1198 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1352 if (tiled_root_pmap == None) /* something really bad happened - abort */
1199 return 0; 1353 return 0;
1200 1354
1201 if (root_pixmap == None)
1202 {
1203 /* use tricks to obtain the root background image :*/
1204 /* we want to create Overrideredirect window overlapping out window
1205 with background type of Parent Relative and then grab it */
1206 XSetWindowAttributes attr;
1207 Window src;
1208 bool success = false;
1209
1210 attr.background_pixmap = ParentRelative;
1211 attr.backing_store = Always;
1212 attr.event_mask = ExposureMask;
1213 attr.override_redirect = True;
1214 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
1215 CopyFromParent, CopyFromParent, CopyFromParent,
1216 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
1217 &attr);
1218
1219 if (src != None)
1220 {
1221 XEvent event;
1222 int ev_count = 0;
1223 XGrabServer (dpy);
1224 XMapRaised (dpy, src);
1225 XSync (dpy, False);
1226
1227 /* XSync should get window where it's properly exposed,
1228 * but to be on the safe side - let's check for the actual event to arrive : */
1229 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
1230 ++ev_count;
1231
1232 if (ev_count > 0);
1233 {
1234 /* hooray! - we can grab the image! */
1235 gc = XCreateGC (dpy, root, 0, NULL);
1236 if (gc)
1237 {
1238 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
1239 success = true;
1240 }
1241 }
1242
1243 XDestroyWindow (dpy, src);
1244 XUngrabServer (dpy);
1245 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
1246 }
1247
1248 if (!success)
1249 {
1250 XFreePixmap (dpy, tiled_root_pmap);
1251 tiled_root_pmap = None;
1252 }
1253 else
1254 result |= transpPmapTiled;
1255 }
1256 else
1257 {
1258 /* straightforward pixmap copy */ 1355 /* straightforward pixmap copy */
1259 gcv.tile = root_pixmap; 1356 gcv.tile = root_pixmap;
1260 gcv.fill_style = FillTiled; 1357 gcv.fill_style = FillTiled;
1261 1358
1262 while (sx < 0) sx += (int)root_width; 1359 while (sx < 0) sx += (int)root_width;
1263 while (sy < 0) sy += (int)root_height; 1360 while (sy < 0) sy += (int)root_height;
1264 1361
1265 gcv.ts_x_origin = -sx; 1362 gcv.ts_x_origin = -sx;
1266 gcv.ts_y_origin = -sy; 1363 gcv.ts_y_origin = -sy;
1267 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1364 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1268 1365
1269 if (gc) 1366 if (gc)
1270 { 1367 {
1271 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);
1272 result |= transpPmapTiled; 1369 result |= transpPmapTiled;
1273 } 1370 XFreeGC (dpy, gc);
1274 } 1371 }
1275 TIMING_TEST_PRINT_RESULT (tp); 1372 TIMING_TEST_PRINT_RESULT (tp);
1276 1373
1277 if (tiled_root_pmap != None) 1374 if (tiled_root_pmap != None)
1278 { 1375 {
1279 if (!need_client_side_rendering ()) 1376 if (!need_client_side_rendering ())
1280 { 1377 {
1281 if ((flags & tintNeeded)) 1378 if (flags & (blurNeeded | blurServerSide))
1379 {
1380 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height))
1381 result |= transpPmapBlurred;
1282 { 1382 }
1383 if (flags & (tintNeeded | tintServerSide))
1384 {
1283 if (tint_pixmap (tiled_root_pmap, root, window_width, window_height)) 1385 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height))
1284 result |= transpPmapTinted; 1386 result |= transpPmapTinted;
1285 } 1387 }
1286 } /* server side rendering completed */ 1388 } /* server side rendering completed */
1287 1389
1288 if (pixmap) 1390 if (pixmap)
… …
1292 pmap_width = window_width; 1394 pmap_width = window_width;
1293 pmap_height = window_height; 1395 pmap_height = window_height;
1294 pmap_depth = root_depth; 1396 pmap_depth = root_depth;
1295 } 1397 }
1296 1398
1297 if (gc)
1298 XFreeGC (dpy, gc);
1299
1300 TIMING_TEST_PRINT_RESULT (tp); 1399 TIMING_TEST_PRINT_RESULT (tp);
1301 1400
1302 return result; 1401 return result;
1303} 1402}
1304 1403
… …
1318 return false; 1417 return false;
1319} 1418}
1320# endif /* ENABLE_TRANSPARENCY */ 1419# endif /* ENABLE_TRANSPARENCY */
1321 1420
1322# ifndef HAVE_AFTERIMAGE 1421# ifndef HAVE_AFTERIMAGE
1323static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm); 1422static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm);
1324# endif 1423# endif
1325 1424
1326bool 1425bool
1327bgPixmap_t::render () 1426bgPixmap_t::render ()
1328{ 1427{
… …
1372 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1471 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1373 { 1472 {
1374 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1473 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1375 if (flags & tintSet) 1474 if (flags & tintSet)
1376 tint.get (c); 1475 tint.get (c);
1377 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1476 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b);
1378 } 1477 }
1379# endif 1478# endif
1380 1479
1381 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1480 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1382 1481
… …
1517/* taken from aterm-0.4.2 */ 1616/* taken from aterm-0.4.2 */
1518 1617
1519typedef uint32_t RUINT32T; 1618typedef uint32_t RUINT32T;
1520 1619
1521static void 1620static void
1522ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm) 1621ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm)
1523{ 1622{
1524 int sh_r, sh_g, sh_b; 1623 int sh_r, sh_g, sh_b;
1525 RUINT32T mask_r, mask_g, mask_b; 1624 RUINT32T mask_r, mask_g, mask_b;
1526 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1625 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1527 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1626 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1528 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1627 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1529 int i; 1628 int i;
1629 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1530 1630
1531 Visual *visual = term->visual;
1532
1533 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1631 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1534 1632
1535 /* for convenience */ 1633 /* for convenience */
1536 mask_r = visual->red_mask; 1634 mask_r = visual->red_mask;
1537 mask_g = visual->green_mask; 1635 mask_g = visual->green_mask;
1538 mask_b = visual->blue_mask; 1636 mask_b = visual->blue_mask;
1539 1637
1540 /* boring lookup table pre-initialization */ 1638 /* boring lookup table pre-initialization */
1541 switch (srcImage->bits_per_pixel) { 1639 switch (srcImage->depth)
1640 {
1542 case 15: 1641 case 15:
1543 if ((mask_r != 0x7c00) || 1642 if ((mask_r != 0x7c00) ||
1544 (mask_g != 0x03e0) || 1643 (mask_g != 0x03e0) ||
1545 (mask_b != 0x001f)) 1644 (mask_b != 0x001f))
1546 return; 1645 return;
1547 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1646 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
1548 lookup_r = lookup; 1647 lookup_r = lookup;
1549 lookup_g = lookup+32; 1648 lookup_g = lookup+32;
1550 lookup_b = lookup+32+32; 1649 lookup_b = lookup+32+32;
1551 sh_r = 10; 1650 sh_r = 10;
1552 sh_g = 5; 1651 sh_g = 5;
1553 sh_b = 0; 1652 sh_b = 0;
1554 break; 1653 break;
1555 case 16: 1654 case 16:
1556 if ((mask_r != 0xf800) || 1655 if ((mask_r != 0xf800) ||
1557 (mask_g != 0x07e0) || 1656 (mask_g != 0x07e0) ||
1558 (mask_b != 0x001f)) 1657 (mask_b != 0x001f))
1559 return; 1658 return;
1560 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1659 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
1561 lookup_r = lookup; 1660 lookup_r = lookup;
1562 lookup_g = lookup+32; 1661 lookup_g = lookup+32;
1563 lookup_b = lookup+32+64; 1662 lookup_b = lookup+32+64;
1564 sh_r = 11; 1663 sh_r = 11;
1565 sh_g = 5; 1664 sh_g = 5;
1566 sh_b = 0; 1665 sh_b = 0;
1567 break; 1666 break;
1568 case 24: 1667 case 24:
1569 if ((mask_r != 0xff0000) || 1668 if ((mask_r != 0xff0000) ||
1570 (mask_g != 0x00ff00) || 1669 (mask_g != 0x00ff00) ||
1571 (mask_b != 0x0000ff)) 1670 (mask_b != 0x0000ff))
1572 return; 1671 return;
1573 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1672 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
1574 lookup_r = lookup; 1673 lookup_r = lookup;
1575 lookup_g = lookup+256; 1674 lookup_g = lookup+256;
1576 lookup_b = lookup+256+256; 1675 lookup_b = lookup+256+256;
1577 sh_r = 16; 1676 sh_r = 16;
1578 sh_g = 8; 1677 sh_g = 8;
1579 sh_b = 0; 1678 sh_b = 0;
1580 break; 1679 break;
1581 case 32: 1680 case 32:
1582 if ((mask_r != 0xff0000) || 1681 if ((mask_r != 0xff0000) ||
1583 (mask_g != 0x00ff00) || 1682 (mask_g != 0x00ff00) ||
1584 (mask_b != 0x0000ff)) 1683 (mask_b != 0x0000ff))
1585 return; 1684 return;
1586 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1685 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
1587 lookup_r = lookup; 1686 lookup_r = lookup;
1588 lookup_g = lookup+256; 1687 lookup_g = lookup+256;
1589 lookup_b = lookup+256+256; 1688 lookup_b = lookup+256+256;
1590 sh_r = 16; 1689 sh_r = 16;
1591 sh_g = 8; 1690 sh_g = 8;
1592 sh_b = 0; 1691 sh_b = 0;
1593 break; 1692 break;
1594 default: 1693 default:
1595 return; /* we do not support this color depth */ 1694 return; /* we do not support this color depth */
1596 } 1695 }
1597 1696
1598 /* prepare limits for color transformation (each channel is handled separately) */ 1697 /* prepare limits for color transformation (each channel is handled separately) */
1599 if (shade > 100) { 1698 if (shade > 100)
1699 {
1600 shade = 200 - shade; 1700 shade = 200 - shade;
1601 1701
1602 lower_lim_r = 65535-rm; 1702 lower_lim_r = 65535-rm;
1603 lower_lim_g = 65535-gm; 1703 lower_lim_g = 65535-gm;
1604 lower_lim_b = 65535-bm; 1704 lower_lim_b = 65535-bm;
1605 1705
1606 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1706 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
1607 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1707 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
1608 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1708 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
1609 1709
1610 upper_lim_r = upper_lim_g = upper_lim_b = 65535; 1710 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1711 }
1611 } else { 1712 else
1713 {
1612 1714
1613 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1715 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1614 1716
1615 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100); 1717 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1616 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100); 1718 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1617 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100); 1719 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1618 } 1720 }
1619
1620 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1621 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1622 {
1623 unsigned int tmp;
1624
1625 tmp = lower_lim_r;
1626 lower_lim_r = lower_lim_b;
1627 lower_lim_b = tmp;
1628
1629 tmp = upper_lim_r;
1630 upper_lim_r = upper_lim_b;
1631 upper_lim_b = tmp;
1632 }
1633 1721
1634 /* fill our lookup tables */ 1722 /* fill our lookup tables */
1635 for (i = 0; i <= mask_r>>sh_r; i++) 1723 for (i = 0; i <= mask_r>>sh_r; i++)
1636 { 1724 {
1637 RUINT32T tmp; 1725 RUINT32T tmp;
1638 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1726 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
1639 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1727 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
1640 lookup_r[i] = (tmp/65535)<<sh_r; 1728 lookup_r[i] = (tmp/65535)<<sh_r;
1641 } 1729 }
1642 for (i = 0; i <= mask_g>>sh_g; i++) 1730 for (i = 0; i <= mask_g>>sh_g; i++)
1643 { 1731 {
1644 RUINT32T tmp; 1732 RUINT32T tmp;
1645 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1733 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
1646 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1734 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
1647 lookup_g[i] = (tmp/65535)<<sh_g; 1735 lookup_g[i] = (tmp/65535)<<sh_g;
1648 } 1736 }
1649 for (i = 0; i <= mask_b>>sh_b; i++) 1737 for (i = 0; i <= mask_b>>sh_b; i++)
1650 { 1738 {
1651 RUINT32T tmp; 1739 RUINT32T tmp;
1652 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1740 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
1653 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1741 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
1654 lookup_b[i] = (tmp/65535)<<sh_b; 1742 lookup_b[i] = (tmp/65535)<<sh_b;
1655 } 1743 }
1656 1744
1657 /* apply table to input image (replacing colors by newly calculated ones) */ 1745 /* apply table to input image (replacing colors by newly calculated ones) */
1658 switch (srcImage->bits_per_pixel) 1746 if (srcImage->bits_per_pixel == 32
1659 { 1747 && (srcImage->depth == 24 || srcImage->depth == 32)
1660 case 15: 1748 && srcImage->byte_order == host_byte_order)
1661 {
1662 unsigned short *p1, *pf, *p, *pl;
1663 p1 = (unsigned short *) srcImage->data;
1664 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1665 while (p1 < pf)
1666 {
1667 p = p1;
1668 pl = p1 + srcImage->width;
1669 for (; p < pl; p++)
1670 {
1671 *p = lookup_r[(*p & 0x7c00)>>10] |
1672 lookup_g[(*p & 0x03e0)>> 5] |
1673 lookup_b[(*p & 0x001f)];
1674 }
1675 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1676 }
1677 break;
1678 }
1679 case 16:
1680 {
1681 unsigned short *p1, *pf, *p, *pl;
1682 p1 = (unsigned short *) srcImage->data;
1683 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1684 while (p1 < pf)
1685 {
1686 p = p1;
1687 pl = p1 + srcImage->width;
1688 for (; p < pl; p++)
1689 {
1690 *p = lookup_r[(*p & 0xf800)>>11] |
1691 lookup_g[(*p & 0x07e0)>> 5] |
1692 lookup_b[(*p & 0x001f)];
1693 }
1694 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1695 }
1696 break;
1697 }
1698 case 24:
1699 {
1700 unsigned char *p1, *pf, *p, *pl;
1701 p1 = (unsigned char *) srcImage->data;
1702 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1703 while (p1 < pf)
1704 {
1705 p = p1;
1706 pl = p1 + srcImage->width * 3;
1707 for (; p < pl; p += 3)
1708 {
1709 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1710 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1711 p[2] = lookup_r[(p[2] & 0x0000ff)];
1712 }
1713 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1714 }
1715 break;
1716 }
1717 case 32:
1718 { 1749 {
1719 RUINT32T *p1, *pf, *p, *pl; 1750 RUINT32T *p1, *pf, *p, *pl;
1720 p1 = (RUINT32T *) srcImage->data; 1751 p1 = (RUINT32T *) srcImage->data;
1721 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1752 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1722 1753
1723 while (p1 < pf) 1754 while (p1 < pf)
1724 { 1755 {
1725 p = p1; 1756 p = p1;
1726 pl = p1 + srcImage->width; 1757 pl = p1 + srcImage->width;
1727 for (; p < pl; p++) 1758 for (; p < pl; p++)
1728 { 1759 {
1729 *p = lookup_r[(*p & 0xff0000)>>16] | 1760 *p = lookup_r[(*p & 0xff0000) >> 16] |
1730 lookup_g[(*p & 0x00ff00)>> 8] | 1761 lookup_g[(*p & 0x00ff00) >> 8] |
1731 lookup_b[(*p & 0x0000ff)] | 1762 lookup_b[(*p & 0x0000ff)] |
1732 (*p & ~0xffffff); 1763 (*p & 0xff000000);
1733 } 1764 }
1734 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line); 1765 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1735 } 1766 }
1736 break; 1767 }
1768 else
1737 } 1769 {
1770 for (int y = 0; y < srcImage->height; y++)
1771 for (int x = 0; x < srcImage->width; x++)
1772 {
1773 unsigned long pixel = XGetPixel (srcImage, x, y);
1774 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1775 lookup_g[(pixel & mask_g) >> sh_g] |
1776 lookup_b[(pixel & mask_b) >> sh_b];
1777 XPutPixel (srcImage, x, y, pixel);
1778 }
1738 } 1779 }
1739 1780
1740 free (lookup); 1781 free (lookup);
1741} 1782}
1742#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1783#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */

Diff Legend

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