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

Diff Legend

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