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.77 by sf-exg, Tue Oct 12 22:14:04 2010 UTC vs.
Revision 1.95 by sf-exg, Fri Oct 22 16:21:05 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
… …
538 529
539 int x = 0; 530 int x = 0;
540 int y = 0; 531 int y = 0;
541 int w = 0; 532 int w = 0;
542 int h = 0; 533 int h = 0;
543
544 TIMING_TEST_START (asim);
545 534
546 if (original_asim) 535 if (original_asim)
547 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y); 536 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
548 537
549 if (!original_asim 538 if (!original_asim
… …
666 } 655 }
667 656
668 free (layers); 657 free (layers);
669 } 658 }
670 } 659 }
671 TIMING_TEST_PRINT_RESULT (asim);
672 660
673 bool ret = false; 661 bool ret = false;
674 662
675 if (result) 663 if (result)
676 { 664 {
… …
722 710
723 if (result != background && result != original_asim) 711 if (result != background && result != original_asim)
724 destroy_asimage (&result); 712 destroy_asimage (&result);
725 713
726 XFreeGC (target->dpy, gc); 714 XFreeGC (target->dpy, gc);
727 TIMING_TEST_PRINT_RESULT (asim);
728 715
729 ret = true; 716 ret = true;
730 } 717 }
731 718
732 if (background) 719 if (background)
… …
744 return false; 731 return false;
745 732
746 if (!pixbuf) 733 if (!pixbuf)
747 return false; 734 return false;
748 735
749 // TODO: add alpha blending 736#if !XFT
750 if (background_flags) 737 if (background_flags)
751 return false; 738 return false;
739#endif
752 740
753 GdkPixbuf *result; 741 GdkPixbuf *result;
754 742
755 int image_width = gdk_pixbuf_get_width (pixbuf); 743 int image_width = gdk_pixbuf_get_width (pixbuf);
756 int image_height = gdk_pixbuf_get_height (pixbuf); 744 int image_height = gdk_pixbuf_get_height (pixbuf);
… …
788 776
789 if (result) 777 if (result)
790 { 778 {
791 XGCValues gcv; 779 XGCValues gcv;
792 GC gc; 780 GC gc;
781 Pixmap root_pmap;
793 782
794 image_width = gdk_pixbuf_get_width (result); 783 image_width = gdk_pixbuf_get_width (result);
795 image_height = gdk_pixbuf_get_height (result); 784 image_height = gdk_pixbuf_get_height (result);
796 785
786 if (background_flags)
787 {
788 root_pmap = pixmap;
789 pixmap = None;
790 }
791 else
792 {
797 if (h_scale == 0 || v_scale == 0) 793 if (h_scale == 0 || v_scale == 0)
798 { 794 {
799 new_pmap_width = min (image_width, target_width); 795 new_pmap_width = min (image_width, target_width);
800 new_pmap_height = min (image_height, target_height); 796 new_pmap_height = min (image_height, target_height);
797 }
801 } 798 }
802 799
803 if (pixmap) 800 if (pixmap)
804 { 801 {
805 if (pmap_width != new_pmap_width 802 if (pmap_width != new_pmap_width
… …
861 dst_width, dst_height, 858 dst_width, dst_height,
862 XLIB_RGB_DITHER_NONE, 859 XLIB_RGB_DITHER_NONE,
863 0, 0); 860 0, 0);
864 } 861 }
865 862
863#if XFT
864 if (background_flags)
865 {
866 Display *dpy = target->dpy;
867 XRenderPictureAttributes pa;
868
869 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen));
870 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
871
872 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
873 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
874
875 pa.repeat = True;
876 Pixmap mask_pmap = XCreatePixmap (dpy, target->vt, 1, 1, 8);
877 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
878 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
879 XFreePixmap (dpy, mask_pmap);
880
881 if (src && dst && mask)
882 {
883 XRenderColor mask_c;
884
885 mask_c.alpha = 0x8000;
886 mask_c.red = 0;
887 mask_c.green = 0;
888 mask_c.blue = 0;
889 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
890 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
891 }
892
893 XRenderFreePicture (dpy, src);
894 XRenderFreePicture (dpy, dst);
895 XRenderFreePicture (dpy, mask);
896
897 XFreePixmap (dpy, root_pmap);
898 }
899#endif
900
866 if (result != pixbuf) 901 if (result != pixbuf)
867 g_object_unref (result); 902 g_object_unref (result);
868 903
869 XFreeGC (target->dpy, gc); 904 XFreeGC (target->dpy, gc);
870 905
… …
892 } 927 }
893 928
894# ifdef HAVE_AFTERIMAGE 929# ifdef HAVE_AFTERIMAGE
895 if (!target->asimman) 930 if (!target->asimman)
896 target->asimman = create_generic_imageman (target->rs[Rs_path]); 931 target->asimman = create_generic_imageman (target->rs[Rs_path]);
897 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 932 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
933 if (image)
934 {
898 if (original_asim) 935 if (original_asim)
936 safe_asimage_destroy (original_asim);
937 original_asim = image;
899 have_image = true; 938 have_image = true;
900 return have_image; 939 return true;
940 }
901# endif 941# endif
902 942
903# ifdef HAVE_PIXBUF 943# ifdef HAVE_PIXBUF
904 pixbuf = gdk_pixbuf_new_from_file (file, NULL); 944 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
945 if (image)
946 {
905 if (pixbuf) 947 if (pixbuf)
948 g_object_unref (pixbuf);
949 pixbuf = image;
906 have_image = true; 950 have_image = true;
907 return have_image; 951 return true;
952 }
908# endif 953# endif
909 } 954 }
910 955
911 return false; 956 return false;
912} 957}
… …
937 if (!(geom_flags & WidthValue)) 982 if (!(geom_flags & WidthValue))
938 hr = 1; 983 hr = 1;
939 if (!(geom_flags & HeightValue)) 984 if (!(geom_flags & HeightValue))
940 vr = hr; 985 vr = hr;
941 986
987 min_it (hr, 128);
988 min_it (vr, 128);
989
942 if (h_blurRadius != hr) 990 if (h_blurRadius != hr)
943 { 991 {
944 ++changed; 992 ++changed;
945 h_blurRadius = hr; 993 h_blurRadius = hr;
946 } 994 }
… …
953 1001
954 if (v_blurRadius == 0 && h_blurRadius == 0) 1002 if (v_blurRadius == 0 && h_blurRadius == 0)
955 flags &= ~blurNeeded; 1003 flags &= ~blurNeeded;
956 else 1004 else
957 flags |= blurNeeded; 1005 flags |= blurNeeded;
1006
1007#if XFT
1008 XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root);
1009 if (filters)
1010 {
1011 for (int i = 0; i < filters->nfilter; i++)
1012 if (!strcmp (filters->filter[i], FilterConvolution))
1013 flags |= bgPixmap_t::blurServerSide;
1014
1015 XFree (filters);
1016 }
1017#endif
958 1018
959 return (changed > 0); 1019 return (changed > 0);
960} 1020}
961 1021
962static inline unsigned long 1022static inline unsigned long
… …
1047 flags = (flags & (~tintFlags | tintSet)) | new_flags; 1107 flags = (flags & (~tintFlags | tintSet)) | new_flags;
1048 return true; 1108 return true;
1049 } 1109 }
1050 1110
1051 return false; 1111 return false;
1112}
1113
1114#if XFT
1115static void
1116get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1117{
1118 double sigma = radius / 2.0;
1119 double scale = sqrt (2.0 * M_PI) * sigma;
1120 double sum = 0.0;
1121
1122 for (int i = 0; i < width; i++)
1123 {
1124 double x = i - width / 2;
1125 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1126 sum += kernel[i];
1127 }
1128
1129 params[0] = XDoubleToFixed (width);
1130 params[1] = XDoubleToFixed (1);
1131
1132 for (int i = 0; i < width; i++)
1133 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1134}
1135#endif
1136
1137bool
1138bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1139{
1140 bool ret = false;
1141#if XFT
1142 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1143 double *kernel = (double *)malloc (size * sizeof (double));
1144 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1145
1146 Display *dpy = target->dpy;
1147 XRenderPictureAttributes pa;
1148 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1149
1150 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1151 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1152
1153 if (kernel && params && src && dst)
1154 {
1155 if (h_blurRadius)
1156 {
1157 size = h_blurRadius * 2 + 1;
1158 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1159
1160 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1161 XRenderComposite (dpy,
1162 PictOpSrc,
1163 src,
1164 None,
1165 dst,
1166 0, 0,
1167 0, 0,
1168 0, 0,
1169 width, height);
1170 }
1171
1172 if (v_blurRadius)
1173 {
1174 size = v_blurRadius * 2 + 1;
1175 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1176 swap (params[0], params[1]);
1177
1178 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1179 XRenderComposite (dpy,
1180 PictOpSrc,
1181 src,
1182 None,
1183 dst,
1184 0, 0,
1185 0, 0,
1186 0, 0,
1187 width, height);
1188 }
1189
1190 ret = true;
1191 }
1192
1193 free (kernel);
1194 free (params);
1195 XRenderFreePicture (dpy, src);
1196 XRenderFreePicture (dpy, dst);
1197#endif
1198 return ret;
1052} 1199}
1053 1200
1054bool 1201bool
1055bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1202bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1056{ 1203{
… …
1132 } 1279 }
1133 1280
1134 XRenderFreePicture (dpy, mask_pic); 1281 XRenderFreePicture (dpy, mask_pic);
1135 XRenderFreePicture (dpy, overlay_pic); 1282 XRenderFreePicture (dpy, overlay_pic);
1136 XRenderFreePicture (dpy, back_pic); 1283 XRenderFreePicture (dpy, back_pic);
1137# if DO_TIMING_TEST
1138 XSync (dpy, False);
1139# endif
1140# endif 1284# endif
1141 } 1285 }
1142 1286
1143 return ret; 1287 return ret;
1144} 1288}
… …
1167 unsigned int root_pmap_width, root_pmap_height; 1311 unsigned int root_pmap_width, root_pmap_height;
1168 int window_width = target->szHint.width; 1312 int window_width = target->szHint.width;
1169 int window_height = target->szHint.height; 1313 int window_height = target->szHint.height;
1170 int sx, sy; 1314 int sx, sy;
1171 XGCValues gcv; 1315 XGCValues gcv;
1316 GC gc;
1172 1317
1173 TIMING_TEST_START (tp);
1174 target->get_window_origin (sx, sy); 1318 target->get_window_origin (sx, sy);
1175 1319
1176 /* check if we are outside of the visible part of the virtual screen : */ 1320 /* check if we are outside of the visible part of the virtual screen : */
1177 if (sx + window_width <= 0 || sy + window_height <= 0 1321 if (sx + window_width <= 0 || sy + window_height <= 0
1178 || sx >= root_width || sy >= root_height) 1322 || sx >= root_width || sy >= root_height)
1179 return 0; 1323 return 0;
1180 1324
1181 if (root_pixmap != None) 1325 if (root_pixmap != None)
1182 { 1326 {
1183 /* we want to validate the pixmap and get it's size at the same time : */ 1327 /* we want to validate the pixmap and get its size at the same time : */
1184 int junk; 1328 int junk;
1185 unsigned int ujunk; 1329 unsigned int ujunk;
1186 /* root pixmap may be bad - allow a error */ 1330 /* root pixmap may be bad - allow a error */
1187 target->allowedxerror = -1; 1331 target->allowedxerror = -1;
1188 1332
… …
1190 root_pixmap = None; 1334 root_pixmap = None;
1191 1335
1192 target->allowedxerror = 0; 1336 target->allowedxerror = 0;
1193 } 1337 }
1194 1338
1339 if (root_pixmap == None)
1340 return 0;
1341
1195 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1342 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth);
1196 GC gc = NULL;
1197 1343
1198 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1344 if (tiled_root_pmap == None) /* something really bad happened - abort */
1199 return 0; 1345 return 0;
1200 1346
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 */ 1347 /* straightforward pixmap copy */
1259 gcv.tile = root_pixmap; 1348 gcv.tile = root_pixmap;
1260 gcv.fill_style = FillTiled; 1349 gcv.fill_style = FillTiled;
1261 1350
1262 while (sx < 0) sx += (int)root_width; 1351 while (sx < 0) sx += (int)root_width;
1263 while (sy < 0) sy += (int)root_height; 1352 while (sy < 0) sy += (int)root_height;
1264 1353
1265 gcv.ts_x_origin = -sx; 1354 gcv.ts_x_origin = -sx;
1266 gcv.ts_y_origin = -sy; 1355 gcv.ts_y_origin = -sy;
1267 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1356 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1268 1357
1269 if (gc) 1358 if (gc)
1270 { 1359 {
1271 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1360 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1272 result |= transpPmapTiled; 1361 result |= transpPmapTiled;
1273 } 1362 XFreeGC (dpy, gc);
1274 } 1363 }
1275 TIMING_TEST_PRINT_RESULT (tp);
1276 1364
1277 if (tiled_root_pmap != None) 1365 if (tiled_root_pmap != None)
1278 { 1366 {
1279 if (!need_client_side_rendering ()) 1367 if (!need_client_side_rendering ())
1280 { 1368 {
1281 if ((flags & tintNeeded)) 1369 if (flags & (blurNeeded | blurServerSide))
1370 {
1371 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height))
1372 result |= transpPmapBlurred;
1282 { 1373 }
1374 if (flags & (tintNeeded | tintServerSide))
1375 {
1283 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height)) 1376 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height))
1284 result |= transpPmapTinted; 1377 result |= transpPmapTinted;
1285 } 1378 }
1286 } /* server side rendering completed */ 1379 } /* server side rendering completed */
1287 1380
1288 if (pixmap) 1381 if (pixmap)
… …
1292 pmap_width = window_width; 1385 pmap_width = window_width;
1293 pmap_height = window_height; 1386 pmap_height = window_height;
1294 pmap_depth = root_depth; 1387 pmap_depth = root_depth;
1295 } 1388 }
1296 1389
1297 if (gc)
1298 XFreeGC (dpy, gc);
1299
1300 TIMING_TEST_PRINT_RESULT (tp);
1301
1302 return result; 1390 return result;
1303} 1391}
1304 1392
1305bool 1393bool
1306bgPixmap_t::set_root_pixmap () 1394bgPixmap_t::set_root_pixmap ()
… …
1318 return false; 1406 return false;
1319} 1407}
1320# endif /* ENABLE_TRANSPARENCY */ 1408# endif /* ENABLE_TRANSPARENCY */
1321 1409
1322# ifndef HAVE_AFTERIMAGE 1410# ifndef HAVE_AFTERIMAGE
1323static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm); 1411static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm);
1324# endif 1412# endif
1325 1413
1326bool 1414bool
1327bgPixmap_t::render () 1415bgPixmap_t::render ()
1328{ 1416{
1329 unsigned long background_flags = 0; 1417 unsigned long background_flags = 0;
1330 1418
1331 if (target == NULL) 1419 if (target == NULL)
1332 return false; 1420 return false;
1333
1334 TIMING_TEST_START (tp);
1335 1421
1336 invalidate (); 1422 invalidate ();
1337# ifdef ENABLE_TRANSPARENCY 1423# ifdef ENABLE_TRANSPARENCY
1338 if (flags & isTransparent) 1424 if (flags & isTransparent)
1339 { 1425 {
… …
1372 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1458 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1373 { 1459 {
1374 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1460 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1375 if (flags & tintSet) 1461 if (flags & tintSet)
1376 tint.get (c); 1462 tint.get (c);
1377 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1463 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b);
1378 } 1464 }
1379# endif 1465# endif
1380 1466
1381 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1467 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1382 1468
… …
1428 } 1514 }
1429 } 1515 }
1430 1516
1431 apply (); 1517 apply ();
1432 1518
1433 XSync (target->dpy, False);
1434 valid_since = ev::now (); 1519 valid_since = ev::now ();
1435
1436 TIMING_TEST_PRINT_RESULT (tp);
1437 1520
1438 return true; 1521 return true;
1439} 1522}
1440 1523
1441bool 1524bool
… …
1514#endif /* HAVE_BG_PIXMAP */ 1597#endif /* HAVE_BG_PIXMAP */
1515 1598
1516#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1599#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT
1517/* taken from aterm-0.4.2 */ 1600/* taken from aterm-0.4.2 */
1518 1601
1519typedef uint32_t RUINT32T;
1520
1521static void 1602static void
1522ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm) 1603ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm)
1523{ 1604{
1524 int sh_r, sh_g, sh_b; 1605 int sh_r, sh_g, sh_b;
1525 RUINT32T mask_r, mask_g, mask_b; 1606 uint32_t mask_r, mask_g, mask_b;
1526 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1607 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1527 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1608 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1528 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1609 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1529 int i; 1610 int i;
1611 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1530 1612
1531 Visual *visual = term->visual;
1532
1533 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1613 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1534 1614
1535 /* for convenience */ 1615 /* for convenience */
1536 mask_r = visual->red_mask; 1616 mask_r = visual->red_mask;
1537 mask_g = visual->green_mask; 1617 mask_g = visual->green_mask;
1538 mask_b = visual->blue_mask; 1618 mask_b = visual->blue_mask;
1539 1619
1540 /* boring lookup table pre-initialization */ 1620 /* boring lookup table pre-initialization */
1541 switch (srcImage->bits_per_pixel) { 1621 switch (srcImage->depth)
1622 {
1542 case 15: 1623 case 15:
1543 if ((mask_r != 0x7c00) || 1624 if ((mask_r != 0x7c00) ||
1544 (mask_g != 0x03e0) || 1625 (mask_g != 0x03e0) ||
1545 (mask_b != 0x001f)) 1626 (mask_b != 0x001f))
1546 return; 1627 return;
1547 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1628 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32));
1548 lookup_r = lookup; 1629 lookup_r = lookup;
1549 lookup_g = lookup+32; 1630 lookup_g = lookup+32;
1550 lookup_b = lookup+32+32; 1631 lookup_b = lookup+32+32;
1551 sh_r = 10; 1632 sh_r = 10;
1552 sh_g = 5; 1633 sh_g = 5;
1553 sh_b = 0; 1634 sh_b = 0;
1554 break; 1635 break;
1555 case 16: 1636 case 16:
1556 if ((mask_r != 0xf800) || 1637 if ((mask_r != 0xf800) ||
1557 (mask_g != 0x07e0) || 1638 (mask_g != 0x07e0) ||
1558 (mask_b != 0x001f)) 1639 (mask_b != 0x001f))
1559 return; 1640 return;
1560 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1641 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1561 lookup_r = lookup; 1642 lookup_r = lookup;
1562 lookup_g = lookup+32; 1643 lookup_g = lookup+32;
1563 lookup_b = lookup+32+64; 1644 lookup_b = lookup+32+64;
1564 sh_r = 11; 1645 sh_r = 11;
1565 sh_g = 5; 1646 sh_g = 5;
1566 sh_b = 0; 1647 sh_b = 0;
1567 break; 1648 break;
1568 case 24: 1649 case 24:
1569 if ((mask_r != 0xff0000) || 1650 if ((mask_r != 0xff0000) ||
1570 (mask_g != 0x00ff00) || 1651 (mask_g != 0x00ff00) ||
1571 (mask_b != 0x0000ff)) 1652 (mask_b != 0x0000ff))
1572 return; 1653 return;
1573 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1654 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1574 lookup_r = lookup; 1655 lookup_r = lookup;
1575 lookup_g = lookup+256; 1656 lookup_g = lookup+256;
1576 lookup_b = lookup+256+256; 1657 lookup_b = lookup+256+256;
1577 sh_r = 16; 1658 sh_r = 16;
1578 sh_g = 8; 1659 sh_g = 8;
1579 sh_b = 0; 1660 sh_b = 0;
1580 break; 1661 break;
1581 case 32: 1662 case 32:
1582 if ((mask_r != 0xff0000) || 1663 if ((mask_r != 0xff0000) ||
1583 (mask_g != 0x00ff00) || 1664 (mask_g != 0x00ff00) ||
1584 (mask_b != 0x0000ff)) 1665 (mask_b != 0x0000ff))
1585 return; 1666 return;
1586 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1667 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1587 lookup_r = lookup; 1668 lookup_r = lookup;
1588 lookup_g = lookup+256; 1669 lookup_g = lookup+256;
1589 lookup_b = lookup+256+256; 1670 lookup_b = lookup+256+256;
1590 sh_r = 16; 1671 sh_r = 16;
1591 sh_g = 8; 1672 sh_g = 8;
1592 sh_b = 0; 1673 sh_b = 0;
1593 break; 1674 break;
1594 default: 1675 default:
1595 return; /* we do not support this color depth */ 1676 return; /* we do not support this color depth */
1596 } 1677 }
1597 1678
1598 /* prepare limits for color transformation (each channel is handled separately) */ 1679 /* prepare limits for color transformation (each channel is handled separately) */
1599 if (shade > 100) { 1680 if (shade > 100)
1681 {
1600 shade = 200 - shade; 1682 shade = 200 - shade;
1601 1683
1602 lower_lim_r = 65535-rm; 1684 lower_lim_r = 65535-rm;
1603 lower_lim_g = 65535-gm; 1685 lower_lim_g = 65535-gm;
1604 lower_lim_b = 65535-bm; 1686 lower_lim_b = 65535-bm;
1605 1687
1606 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1688 lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100);
1607 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1689 lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100);
1608 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1690 lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100);
1609 1691
1610 upper_lim_r = upper_lim_g = upper_lim_b = 65535; 1692 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1693 }
1611 } else { 1694 else
1695 {
1612 1696
1613 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1697 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1614 1698
1615 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100); 1699 upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1616 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100); 1700 upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1617 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100); 1701 upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1618 } 1702 }
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 1703
1634 /* fill our lookup tables */ 1704 /* fill our lookup tables */
1635 for (i = 0; i <= mask_r>>sh_r; i++) 1705 for (i = 0; i <= mask_r>>sh_r; i++)
1636 { 1706 {
1637 RUINT32T tmp; 1707 uint32_t tmp;
1638 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1708 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r));
1639 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1709 tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r);
1640 lookup_r[i] = (tmp/65535)<<sh_r; 1710 lookup_r[i] = (tmp/65535)<<sh_r;
1641 } 1711 }
1642 for (i = 0; i <= mask_g>>sh_g; i++) 1712 for (i = 0; i <= mask_g>>sh_g; i++)
1643 { 1713 {
1644 RUINT32T tmp; 1714 uint32_t tmp;
1645 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1715 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g));
1646 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1716 tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g);
1647 lookup_g[i] = (tmp/65535)<<sh_g; 1717 lookup_g[i] = (tmp/65535)<<sh_g;
1648 } 1718 }
1649 for (i = 0; i <= mask_b>>sh_b; i++) 1719 for (i = 0; i <= mask_b>>sh_b; i++)
1650 { 1720 {
1651 RUINT32T tmp; 1721 uint32_t tmp;
1652 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1722 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b));
1653 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1723 tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b);
1654 lookup_b[i] = (tmp/65535)<<sh_b; 1724 lookup_b[i] = (tmp/65535)<<sh_b;
1655 } 1725 }
1656 1726
1657 /* apply table to input image (replacing colors by newly calculated ones) */ 1727 /* apply table to input image (replacing colors by newly calculated ones) */
1658 switch (srcImage->bits_per_pixel) 1728 if (srcImage->bits_per_pixel == 32
1729 && (srcImage->depth == 24 || srcImage->depth == 32)
1730 && srcImage->byte_order == host_byte_order)
1659 { 1731 {
1660 case 15:
1661 {
1662 unsigned short *p1, *pf, *p, *pl; 1732 uint32_t *p1, *pf, *p, *pl;
1663 p1 = (unsigned short *) srcImage->data; 1733 p1 = (uint32_t *) srcImage->data;
1664 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1734 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1735
1665 while (p1 < pf) 1736 while (p1 < pf)
1666 { 1737 {
1667 p = p1; 1738 p = p1;
1668 pl = p1 + srcImage->width; 1739 pl = p1 + srcImage->width;
1669 for (; p < pl; p++) 1740 for (; p < pl; p++)
1670 { 1741 {
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 {
1719 RUINT32T *p1, *pf, *p, *pl;
1720 p1 = (RUINT32T *) srcImage->data;
1721 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1722
1723 while (p1 < pf)
1724 {
1725 p = p1;
1726 pl = p1 + srcImage->width;
1727 for (; p < pl; p++)
1728 {
1729 *p = lookup_r[(*p & 0xff0000)>>16] | 1742 *p = lookup_r[(*p & 0xff0000) >> 16] |
1730 lookup_g[(*p & 0x00ff00)>> 8] | 1743 lookup_g[(*p & 0x00ff00) >> 8] |
1731 lookup_b[(*p & 0x0000ff)] | 1744 lookup_b[(*p & 0x0000ff)] |
1732 (*p & ~0xffffff); 1745 (*p & 0xff000000);
1746 }
1747 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line);
1748 }
1749 }
1750 else
1751 {
1752 for (int y = 0; y < srcImage->height; y++)
1753 for (int x = 0; x < srcImage->width; x++)
1754 {
1755 unsigned long pixel = XGetPixel (srcImage, x, y);
1756 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1757 lookup_g[(pixel & mask_g) >> sh_g] |
1758 lookup_b[(pixel & mask_b) >> sh_b];
1759 XPutPixel (srcImage, x, y, pixel);
1733 } 1760 }
1734 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1735 } 1761 }
1736 break;
1737 }
1738 }
1739 1762
1740 free (lookup); 1763 free (lookup);
1741} 1764}
1742#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1765#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */

Diff Legend

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