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.79 by sf-exg, Wed Oct 13 23:01:40 2010 UTC vs.
Revision 1.104 by sf-exg, Sun Oct 31 17:44:39 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#if !XFT 734#if !XRENDER
750 if (background_flags) 735 if (background_flags)
751 return false; 736 return false;
752#endif 737#endif
753 738
754 GdkPixbuf *result; 739 GdkPixbuf *result;
… …
871 dst_width, dst_height, 856 dst_width, dst_height,
872 XLIB_RGB_DITHER_NONE, 857 XLIB_RGB_DITHER_NONE,
873 0, 0); 858 0, 0);
874 } 859 }
875 860
876#if XFT 861#if XRENDER
877 if (background_flags) 862 if (background_flags)
878 { 863 {
879 Display *dpy = target->dpy; 864 Display *dpy = target->dpy;
880 XRenderPictureAttributes pa; 865 XRenderPictureAttributes pa;
881 866
882 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen)); 867 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, target->visual);
883 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 868 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
884 869
885 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); 870 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
886 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa); 871 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
887 872
… …
940 } 925 }
941 926
942# ifdef HAVE_AFTERIMAGE 927# ifdef HAVE_AFTERIMAGE
943 if (!target->asimman) 928 if (!target->asimman)
944 target->asimman = create_generic_imageman (target->rs[Rs_path]); 929 target->asimman = create_generic_imageman (target->rs[Rs_path]);
945 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 930 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
931 if (image)
932 {
946 if (original_asim) 933 if (original_asim)
934 safe_asimage_destroy (original_asim);
935 original_asim = image;
947 have_image = true; 936 have_image = true;
948 return have_image; 937 return true;
938 }
949# endif 939# endif
950 940
951# ifdef HAVE_PIXBUF 941# ifdef HAVE_PIXBUF
952 pixbuf = gdk_pixbuf_new_from_file (file, NULL); 942 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
943 if (image)
944 {
953 if (pixbuf) 945 if (pixbuf)
946 g_object_unref (pixbuf);
947 pixbuf = image;
954 have_image = true; 948 have_image = true;
955 return have_image; 949 return true;
950 }
956# endif 951# endif
957 } 952 }
958 953
959 return false; 954 return false;
960} 955}
… …
985 if (!(geom_flags & WidthValue)) 980 if (!(geom_flags & WidthValue))
986 hr = 1; 981 hr = 1;
987 if (!(geom_flags & HeightValue)) 982 if (!(geom_flags & HeightValue))
988 vr = hr; 983 vr = hr;
989 984
985 min_it (hr, 128);
986 min_it (vr, 128);
987
990 if (h_blurRadius != hr) 988 if (h_blurRadius != hr)
991 { 989 {
992 ++changed; 990 ++changed;
993 h_blurRadius = hr; 991 h_blurRadius = hr;
994 } 992 }
… …
1001 999
1002 if (v_blurRadius == 0 && h_blurRadius == 0) 1000 if (v_blurRadius == 0 && h_blurRadius == 0)
1003 flags &= ~blurNeeded; 1001 flags &= ~blurNeeded;
1004 else 1002 else
1005 flags |= blurNeeded; 1003 flags |= blurNeeded;
1004
1005#if XRENDER
1006 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
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
1006 1016
1007 return (changed > 0); 1017 return (changed > 0);
1008} 1018}
1009 1019
1010static inline unsigned long 1020static inline unsigned long
… …
1040 { 1050 {
1041 if (flags & bgPixmap_t::tintWholesome) 1051 if (flags & bgPixmap_t::tintWholesome)
1042 flags |= bgPixmap_t::tintServerSide; 1052 flags |= bgPixmap_t::tintServerSide;
1043 else 1053 else
1044 { 1054 {
1045#if XFT 1055#if XRENDER
1046 flags |= bgPixmap_t::tintServerSide; 1056 flags |= bgPixmap_t::tintServerSide;
1047#endif 1057#endif
1048 } 1058 }
1049 } 1059 }
1050 1060
… …
1095 flags = (flags & (~tintFlags | tintSet)) | new_flags; 1105 flags = (flags & (~tintFlags | tintSet)) | new_flags;
1096 return true; 1106 return true;
1097 } 1107 }
1098 1108
1099 return false; 1109 return false;
1110}
1111
1112#if XRENDER
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 XRENDER
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;
1100} 1197}
1101 1198
1102bool 1199bool
1103bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1200bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1104{ 1201{
… …
1124 XFreeGC (dpy, gc); 1221 XFreeGC (dpy, gc);
1125 } 1222 }
1126 } 1223 }
1127 else 1224 else
1128 { 1225 {
1129# if XFT 1226# if XRENDER
1130 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1227 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1131 1228
1132 if (flags & tintSet) 1229 if (flags & tintSet)
1133 tint.get (c); 1230 tint.get (c);
1134 1231
… …
1180 } 1277 }
1181 1278
1182 XRenderFreePicture (dpy, mask_pic); 1279 XRenderFreePicture (dpy, mask_pic);
1183 XRenderFreePicture (dpy, overlay_pic); 1280 XRenderFreePicture (dpy, overlay_pic);
1184 XRenderFreePicture (dpy, back_pic); 1281 XRenderFreePicture (dpy, back_pic);
1185# if DO_TIMING_TEST
1186 XSync (dpy, False);
1187# endif
1188# endif 1282# endif
1189 } 1283 }
1190 1284
1191 return ret; 1285 return ret;
1192} 1286}
1193 1287
1194/* make_transparency_pixmap() 1288/* make_transparency_pixmap()
1195 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1289 * Builds a pixmap of the same size as the terminal window that contains
1196 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 1290 * the tiled portion of the root pixmap that is supposed to be covered by
1197 * our window. 1291 * our window.
1198 */ 1292 */
1199unsigned long 1293unsigned long
1200bgPixmap_t::make_transparency_pixmap () 1294bgPixmap_t::make_transparency_pixmap ()
1201{ 1295{
… …
1205 return 0; 1299 return 0;
1206 1300
1207 /* root dimensions may change from call to call - but Display structure should 1301 /* root dimensions may change from call to call - but Display structure should
1208 * be always up-to-date, so let's use it : 1302 * be always up-to-date, so let's use it :
1209 */ 1303 */
1210 Window root = target->display->root;
1211 int screen = target->display->screen; 1304 int screen = target->display->screen;
1212 Display *dpy = target->dpy; 1305 Display *dpy = target->dpy;
1306 int root_depth = DefaultDepth (dpy, screen);
1213 int root_width = DisplayWidth (dpy, screen); 1307 int root_width = DisplayWidth (dpy, screen);
1214 int root_height = DisplayHeight (dpy, screen); 1308 int root_height = DisplayHeight (dpy, screen);
1215 unsigned int root_pmap_width, root_pmap_height; 1309 unsigned int root_pmap_width, root_pmap_height;
1216 int window_width = target->szHint.width; 1310 int window_width = target->szHint.width;
1217 int window_height = target->szHint.height; 1311 int window_height = target->szHint.height;
1218 int sx, sy; 1312 int sx, sy;
1219 XGCValues gcv; 1313 XGCValues gcv;
1314 GC gc;
1220 1315
1221 TIMING_TEST_START (tp);
1222 target->get_window_origin (sx, sy); 1316 target->get_window_origin (sx, sy);
1223 1317
1224 /* 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 : */
1225 if (sx + window_width <= 0 || sy + window_height <= 0 1319 if (sx + window_width <= 0 || sy + window_height <= 0
1226 || sx >= root_width || sy >= root_height) 1320 || sx >= root_width || sy >= root_height)
1227 return 0; 1321 return 0;
1228 1322
1323 // validate root pixmap and get its size
1229 if (root_pixmap != None) 1324 if (root_pixmap != None)
1230 { 1325 {
1231 /* we want to validate the pixmap and get its size at the same time : */ 1326 Window wdummy;
1232 int junk; 1327 int idummy;
1233 unsigned int ujunk; 1328 unsigned int udummy;
1234 /* root pixmap may be bad - allow a error */ 1329
1235 target->allowedxerror = -1; 1330 target->allowedxerror = -1;
1236 1331
1237 if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk)) 1332 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy))
1238 root_pixmap = None; 1333 root_pixmap = None;
1239 1334
1240 target->allowedxerror = 0; 1335 target->allowedxerror = 0;
1241 } 1336 }
1242 1337
1338 Pixmap recoded_root_pmap = root_pixmap;
1339
1340 if (root_pixmap != None && root_depth != target->depth)
1341 {
1342#if XRENDER
1343 XRenderPictureAttributes pa;
1344
1345 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1346 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1347
1348 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
1349 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
1350 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1351
1352 if (src && dst)
1353 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1354 else
1355 {
1356 XFreePixmap (dpy, recoded_root_pmap);
1357 root_pixmap = None;
1358 }
1359
1360 XRenderFreePicture (dpy, src);
1361 XRenderFreePicture (dpy, dst);
1362#else
1363 root_pixmap = None;
1364#endif
1365 }
1366
1367 if (root_pixmap == None)
1368 return 0;
1369
1243 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1370 Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth);
1244 GC gc = NULL;
1245 1371
1246 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1372 if (tiled_root_pmap == None) /* something really bad happened - abort */
1247 return 0; 1373 return 0;
1248 1374
1249 if (root_pixmap == None)
1250 {
1251 /* use tricks to obtain the root background image :*/
1252 /* we want to create Overrideredirect window overlapping out window
1253 with background type of Parent Relative and then grab it */
1254 XSetWindowAttributes attr;
1255 Window src;
1256 bool success = false;
1257
1258 attr.background_pixmap = ParentRelative;
1259 attr.backing_store = Always;
1260 attr.event_mask = ExposureMask;
1261 attr.override_redirect = True;
1262 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
1263 CopyFromParent, CopyFromParent, CopyFromParent,
1264 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
1265 &attr);
1266
1267 if (src != None)
1268 {
1269 XEvent event;
1270 int ev_count = 0;
1271 XGrabServer (dpy);
1272 XMapRaised (dpy, src);
1273 XSync (dpy, False);
1274
1275 /* XSync should get window where it's properly exposed,
1276 * but to be on the safe side - let's check for the actual event to arrive : */
1277 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
1278 ++ev_count;
1279
1280 if (ev_count > 0);
1281 {
1282 /* hooray! - we can grab the image! */
1283 gc = XCreateGC (dpy, root, 0, NULL);
1284 if (gc)
1285 {
1286 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
1287 success = true;
1288 }
1289 }
1290
1291 XDestroyWindow (dpy, src);
1292 XUngrabServer (dpy);
1293 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
1294 }
1295
1296 if (!success)
1297 {
1298 XFreePixmap (dpy, tiled_root_pmap);
1299 tiled_root_pmap = None;
1300 }
1301 else
1302 result |= transpPmapTiled;
1303 }
1304 else
1305 {
1306 /* straightforward pixmap copy */ 1375 /* straightforward pixmap copy */
1307 gcv.tile = root_pixmap; 1376 gcv.tile = recoded_root_pmap;
1308 gcv.fill_style = FillTiled; 1377 gcv.fill_style = FillTiled;
1309 1378
1310 while (sx < 0) sx += (int)root_width; 1379 while (sx < 0) sx += (int)root_width;
1311 while (sy < 0) sy += (int)root_height; 1380 while (sy < 0) sy += (int)root_height;
1312 1381
1313 gcv.ts_x_origin = -sx; 1382 gcv.ts_x_origin = -sx;
1314 gcv.ts_y_origin = -sy; 1383 gcv.ts_y_origin = -sy;
1315 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1384 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1316 1385
1317 if (gc) 1386 if (gc)
1318 { 1387 {
1319 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1388 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1320 result |= transpPmapTiled; 1389 result |= transpPmapTiled;
1321 } 1390 XFreeGC (dpy, gc);
1322 } 1391 }
1323 TIMING_TEST_PRINT_RESULT (tp);
1324 1392
1325 if (tiled_root_pmap != None) 1393 if (tiled_root_pmap != None)
1326 { 1394 {
1327 if (!need_client_side_rendering ()) 1395 if (!need_client_side_rendering ())
1328 { 1396 {
1329 if ((flags & tintNeeded)) 1397 if (flags & (blurNeeded | blurServerSide))
1398 {
1399 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1400 result |= transpPmapBlurred;
1330 { 1401 }
1402 if (flags & (tintNeeded | tintServerSide))
1403 {
1331 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height)) 1404 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1332 result |= transpPmapTinted; 1405 result |= transpPmapTinted;
1333 } 1406 }
1334 } /* server side rendering completed */ 1407 } /* server side rendering completed */
1335 1408
1336 if (pixmap) 1409 if (pixmap)
1337 XFreePixmap (dpy, pixmap); 1410 XFreePixmap (dpy, pixmap);
1338 1411
1339 pixmap = tiled_root_pmap; 1412 pixmap = tiled_root_pmap;
1340 pmap_width = window_width; 1413 pmap_width = window_width;
1341 pmap_height = window_height; 1414 pmap_height = window_height;
1342 pmap_depth = root_depth; 1415 pmap_depth = target->depth;
1343 } 1416 }
1344 1417
1345 if (gc) 1418 if (recoded_root_pmap != root_pixmap)
1346 XFreeGC (dpy, gc); 1419 XFreePixmap (dpy, recoded_root_pmap);
1347
1348 TIMING_TEST_PRINT_RESULT (tp);
1349 1420
1350 return result; 1421 return result;
1351} 1422}
1352 1423
1353bool 1424void
1354bgPixmap_t::set_root_pixmap () 1425bgPixmap_t::set_root_pixmap ()
1355{ 1426{
1356 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1427 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1357 if (new_root_pixmap == None) 1428 if (new_root_pixmap == None)
1358 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1429 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1359 1430
1360 if (new_root_pixmap != root_pixmap)
1361 {
1362 root_pixmap = new_root_pixmap; 1431 root_pixmap = new_root_pixmap;
1363 return true;
1364 }
1365
1366 return false;
1367} 1432}
1368# endif /* ENABLE_TRANSPARENCY */ 1433# endif /* ENABLE_TRANSPARENCY */
1369 1434
1370# ifndef HAVE_AFTERIMAGE 1435# ifndef HAVE_AFTERIMAGE
1371static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm); 1436static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm);
1372# endif 1437# endif
1373 1438
1374bool 1439bool
1375bgPixmap_t::render () 1440bgPixmap_t::render ()
1376{ 1441{
1377 unsigned long background_flags = 0; 1442 unsigned long background_flags = 0;
1378 1443
1379 if (target == NULL) 1444 if (target == NULL)
1380 return false; 1445 return false;
1381
1382 TIMING_TEST_START (tp);
1383 1446
1384 invalidate (); 1447 invalidate ();
1385# ifdef ENABLE_TRANSPARENCY 1448# ifdef ENABLE_TRANSPARENCY
1386 if (flags & isTransparent) 1449 if (flags & isTransparent)
1387 { 1450 {
1388 /* we need to re-generate transparency pixmap in that case ! */ 1451 /* we need to re-generate transparency pixmap in that case ! */
1389 background_flags = make_transparency_pixmap (); 1452 background_flags = make_transparency_pixmap ();
1390 if (background_flags == 0) 1453 if (background_flags == 0)
1391 return false; 1454 return false;
1392 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1455 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1393 && pmap_depth == target->depth)
1394 flags = flags & ~isInvalid; 1456 flags = flags & ~isInvalid;
1395 } 1457 }
1396# endif 1458# endif
1397 1459
1398# ifdef BG_IMAGE_FROM_FILE 1460# ifdef BG_IMAGE_FROM_FILE
… …
1411 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1473 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1412 } 1474 }
1413 1475
1414 if (result) 1476 if (result)
1415 { 1477 {
1416# if !defined(HAVE_AFTERIMAGE) && !XFT 1478# if !defined(HAVE_AFTERIMAGE) && !XRENDER
1417 /* our own client-side tinting */ 1479 /* our own client-side tinting */
1418 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1419 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1420 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1480 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1421 { 1481 {
1422 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1482 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1423 if (flags & tintSet) 1483 if (flags & tintSet)
1424 tint.get (c); 1484 tint.get (c);
1425 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1485 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b);
1426 } 1486 }
1427# endif 1487# endif
1428 1488
1429 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1489 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1430 1490
1431 if (gc) 1491 if (gc)
1432 { 1492 {
1433 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1434 {
1435 XFreePixmap (target->dpy, pixmap);
1436 pixmap = None;
1437 }
1438
1439 if (pixmap == None)
1440 {
1441 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1442 pmap_width = result->width;
1443 pmap_height = result->height;
1444 pmap_depth = target->depth;
1445 }
1446
1447 if (pmap_depth != result->depth)
1448 {
1449 /* Bad Match error will ensue ! stupid X !!!! */
1450 if (result->depth == 24 && pmap_depth == 32)
1451 result->depth = 32;
1452 else if (result->depth == 32 && pmap_depth == 24)
1453 result->depth = 24;
1454 else
1455 {
1456 /* TODO: implement image recoding */
1457 }
1458 }
1459
1460 if (pmap_depth == result->depth)
1461 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1493 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1462 1494
1463 XFreeGC (target->dpy, gc); 1495 XFreeGC (target->dpy, gc);
1464 flags = flags & ~isInvalid; 1496 flags = flags & ~isInvalid;
1465 } 1497 }
1466 1498
… …
1476 } 1508 }
1477 } 1509 }
1478 1510
1479 apply (); 1511 apply ();
1480 1512
1481 XSync (target->dpy, False);
1482 valid_since = ev::now (); 1513 valid_since = ev::now ();
1483
1484 TIMING_TEST_PRINT_RESULT (tp);
1485 1514
1486 return true; 1515 return true;
1487} 1516}
1488 1517
1489bool 1518bool
… …
1491{ 1520{
1492 if (new_target) 1521 if (new_target)
1493 if (target != new_target) 1522 if (target != new_target)
1494 { 1523 {
1495 target = new_target; 1524 target = new_target;
1496# ifdef ENABLE_TRANSPARENCY
1497 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1498# endif
1499 return true; 1525 return true;
1500 } 1526 }
1501 1527
1502 return false; 1528 return false;
1503} 1529}
… …
1505void 1531void
1506bgPixmap_t::apply () 1532bgPixmap_t::apply ()
1507{ 1533{
1508 if (target) 1534 if (target)
1509 { 1535 {
1510 flags &= ~isVtOrigin;
1511
1512 if (pixmap != None) 1536 if (pixmap != None)
1513 { 1537 {
1514 /* set target's background to pixmap */ 1538 /* set target's background to pixmap */
1515# ifdef ENABLE_TRANSPARENCY 1539# ifdef ENABLE_TRANSPARENCY
1516 if (flags & isTransparent) 1540 if (flags & isTransparent)
… …
1522 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1546 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1523 } 1547 }
1524 else 1548 else
1525# endif 1549# endif
1526 { 1550 {
1527 flags |= isVtOrigin;
1528 /* force old pixmap dereference in case it was transparent before :*/ 1551 /* force old pixmap dereference in case it was transparent before :*/
1529 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1552 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1530 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1553 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1531 /* do we also need to set scrollbar's background here ? */ 1554 /* do we also need to set scrollbar's background here ? */
1532 1555
… …
1559 } 1582 }
1560} 1583}
1561 1584
1562#endif /* HAVE_BG_PIXMAP */ 1585#endif /* HAVE_BG_PIXMAP */
1563 1586
1564#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1587#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XRENDER
1565/* taken from aterm-0.4.2 */ 1588/* taken from aterm-0.4.2 */
1566 1589
1567typedef uint32_t RUINT32T;
1568
1569static void 1590static void
1570ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm) 1591ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm)
1571{ 1592{
1572 int sh_r, sh_g, sh_b; 1593 int sh_r, sh_g, sh_b;
1573 RUINT32T mask_r, mask_g, mask_b; 1594 uint32_t mask_r, mask_g, mask_b;
1574 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1595 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1575 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1596 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1576 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1597 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1577 int i; 1598 int i;
1599 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1578 1600
1579 Visual *visual = term->visual;
1580
1581 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1601 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1582 1602
1583 /* for convenience */ 1603 /* for convenience */
1584 mask_r = visual->red_mask; 1604 mask_r = visual->red_mask;
1585 mask_g = visual->green_mask; 1605 mask_g = visual->green_mask;
1586 mask_b = visual->blue_mask; 1606 mask_b = visual->blue_mask;
1587 1607
1588 /* boring lookup table pre-initialization */ 1608 /* boring lookup table pre-initialization */
1589 switch (srcImage->bits_per_pixel) { 1609 switch (srcImage->depth)
1610 {
1590 case 15: 1611 case 15:
1591 if ((mask_r != 0x7c00) || 1612 if ((mask_r != 0x7c00) ||
1592 (mask_g != 0x03e0) || 1613 (mask_g != 0x03e0) ||
1593 (mask_b != 0x001f)) 1614 (mask_b != 0x001f))
1594 return; 1615 return;
1595 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1616 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32));
1596 lookup_r = lookup; 1617 lookup_r = lookup;
1597 lookup_g = lookup+32; 1618 lookup_g = lookup+32;
1598 lookup_b = lookup+32+32; 1619 lookup_b = lookup+32+32;
1599 sh_r = 10; 1620 sh_r = 10;
1600 sh_g = 5; 1621 sh_g = 5;
1601 sh_b = 0; 1622 sh_b = 0;
1602 break; 1623 break;
1603 case 16: 1624 case 16:
1604 if ((mask_r != 0xf800) || 1625 if ((mask_r != 0xf800) ||
1605 (mask_g != 0x07e0) || 1626 (mask_g != 0x07e0) ||
1606 (mask_b != 0x001f)) 1627 (mask_b != 0x001f))
1607 return; 1628 return;
1608 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1629 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1609 lookup_r = lookup; 1630 lookup_r = lookup;
1610 lookup_g = lookup+32; 1631 lookup_g = lookup+32;
1611 lookup_b = lookup+32+64; 1632 lookup_b = lookup+32+64;
1612 sh_r = 11; 1633 sh_r = 11;
1613 sh_g = 5; 1634 sh_g = 5;
1614 sh_b = 0; 1635 sh_b = 0;
1615 break; 1636 break;
1616 case 24: 1637 case 24:
1617 if ((mask_r != 0xff0000) || 1638 if ((mask_r != 0xff0000) ||
1618 (mask_g != 0x00ff00) || 1639 (mask_g != 0x00ff00) ||
1619 (mask_b != 0x0000ff)) 1640 (mask_b != 0x0000ff))
1620 return; 1641 return;
1621 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1642 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1622 lookup_r = lookup; 1643 lookup_r = lookup;
1623 lookup_g = lookup+256; 1644 lookup_g = lookup+256;
1624 lookup_b = lookup+256+256; 1645 lookup_b = lookup+256+256;
1625 sh_r = 16; 1646 sh_r = 16;
1626 sh_g = 8; 1647 sh_g = 8;
1627 sh_b = 0; 1648 sh_b = 0;
1628 break; 1649 break;
1629 case 32: 1650 case 32:
1630 if ((mask_r != 0xff0000) || 1651 if ((mask_r != 0xff0000) ||
1631 (mask_g != 0x00ff00) || 1652 (mask_g != 0x00ff00) ||
1632 (mask_b != 0x0000ff)) 1653 (mask_b != 0x0000ff))
1633 return; 1654 return;
1634 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1655 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1635 lookup_r = lookup; 1656 lookup_r = lookup;
1636 lookup_g = lookup+256; 1657 lookup_g = lookup+256;
1637 lookup_b = lookup+256+256; 1658 lookup_b = lookup+256+256;
1638 sh_r = 16; 1659 sh_r = 16;
1639 sh_g = 8; 1660 sh_g = 8;
1640 sh_b = 0; 1661 sh_b = 0;
1641 break; 1662 break;
1642 default: 1663 default:
1643 return; /* we do not support this color depth */ 1664 return; /* we do not support this color depth */
1644 } 1665 }
1645 1666
1646 /* prepare limits for color transformation (each channel is handled separately) */ 1667 /* prepare limits for color transformation (each channel is handled separately) */
1647 if (shade > 100) { 1668 if (shade > 100)
1669 {
1648 shade = 200 - shade; 1670 shade = 200 - shade;
1649 1671
1650 lower_lim_r = 65535-rm; 1672 lower_lim_r = 65535-rm;
1651 lower_lim_g = 65535-gm; 1673 lower_lim_g = 65535-gm;
1652 lower_lim_b = 65535-bm; 1674 lower_lim_b = 65535-bm;
1653 1675
1654 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1676 lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100);
1655 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1677 lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100);
1656 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1678 lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100);
1657 1679
1658 upper_lim_r = upper_lim_g = upper_lim_b = 65535; 1680 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1681 }
1659 } else { 1682 else
1683 {
1660 1684
1661 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1685 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1662 1686
1663 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100); 1687 upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1664 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100); 1688 upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1665 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100); 1689 upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1666 } 1690 }
1667
1668 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1669 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1670 {
1671 unsigned int tmp;
1672
1673 tmp = lower_lim_r;
1674 lower_lim_r = lower_lim_b;
1675 lower_lim_b = tmp;
1676
1677 tmp = upper_lim_r;
1678 upper_lim_r = upper_lim_b;
1679 upper_lim_b = tmp;
1680 }
1681 1691
1682 /* fill our lookup tables */ 1692 /* fill our lookup tables */
1683 for (i = 0; i <= mask_r>>sh_r; i++) 1693 for (i = 0; i <= mask_r>>sh_r; i++)
1684 { 1694 {
1685 RUINT32T tmp; 1695 uint32_t tmp;
1686 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1696 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r));
1687 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1697 tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r);
1688 lookup_r[i] = (tmp/65535)<<sh_r; 1698 lookup_r[i] = (tmp/65535)<<sh_r;
1689 } 1699 }
1690 for (i = 0; i <= mask_g>>sh_g; i++) 1700 for (i = 0; i <= mask_g>>sh_g; i++)
1691 { 1701 {
1692 RUINT32T tmp; 1702 uint32_t tmp;
1693 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1703 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g));
1694 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1704 tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g);
1695 lookup_g[i] = (tmp/65535)<<sh_g; 1705 lookup_g[i] = (tmp/65535)<<sh_g;
1696 } 1706 }
1697 for (i = 0; i <= mask_b>>sh_b; i++) 1707 for (i = 0; i <= mask_b>>sh_b; i++)
1698 { 1708 {
1699 RUINT32T tmp; 1709 uint32_t tmp;
1700 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1710 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b));
1701 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1711 tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b);
1702 lookup_b[i] = (tmp/65535)<<sh_b; 1712 lookup_b[i] = (tmp/65535)<<sh_b;
1703 } 1713 }
1704 1714
1705 /* apply table to input image (replacing colors by newly calculated ones) */ 1715 /* apply table to input image (replacing colors by newly calculated ones) */
1706 switch (srcImage->bits_per_pixel) 1716 if (srcImage->bits_per_pixel == 32
1717 && (srcImage->depth == 24 || srcImage->depth == 32)
1718 && srcImage->byte_order == host_byte_order)
1707 { 1719 {
1708 case 15:
1709 {
1710 unsigned short *p1, *pf, *p, *pl; 1720 uint32_t *p1, *pf, *p, *pl;
1711 p1 = (unsigned short *) srcImage->data; 1721 p1 = (uint32_t *) srcImage->data;
1712 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1722 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1723
1713 while (p1 < pf) 1724 while (p1 < pf)
1714 { 1725 {
1715 p = p1; 1726 p = p1;
1716 pl = p1 + srcImage->width; 1727 pl = p1 + srcImage->width;
1717 for (; p < pl; p++) 1728 for (; p < pl; p++)
1718 { 1729 {
1719 *p = lookup_r[(*p & 0x7c00)>>10] |
1720 lookup_g[(*p & 0x03e0)>> 5] |
1721 lookup_b[(*p & 0x001f)];
1722 }
1723 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1724 }
1725 break;
1726 }
1727 case 16:
1728 {
1729 unsigned short *p1, *pf, *p, *pl;
1730 p1 = (unsigned short *) srcImage->data;
1731 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1732 while (p1 < pf)
1733 {
1734 p = p1;
1735 pl = p1 + srcImage->width;
1736 for (; p < pl; p++)
1737 {
1738 *p = lookup_r[(*p & 0xf800)>>11] |
1739 lookup_g[(*p & 0x07e0)>> 5] |
1740 lookup_b[(*p & 0x001f)];
1741 }
1742 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1743 }
1744 break;
1745 }
1746 case 24:
1747 {
1748 unsigned char *p1, *pf, *p, *pl;
1749 p1 = (unsigned char *) srcImage->data;
1750 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1751 while (p1 < pf)
1752 {
1753 p = p1;
1754 pl = p1 + srcImage->width * 3;
1755 for (; p < pl; p += 3)
1756 {
1757 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1758 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1759 p[2] = lookup_r[(p[2] & 0x0000ff)];
1760 }
1761 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1762 }
1763 break;
1764 }
1765 case 32:
1766 {
1767 RUINT32T *p1, *pf, *p, *pl;
1768 p1 = (RUINT32T *) srcImage->data;
1769 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1770
1771 while (p1 < pf)
1772 {
1773 p = p1;
1774 pl = p1 + srcImage->width;
1775 for (; p < pl; p++)
1776 {
1777 *p = lookup_r[(*p & 0xff0000)>>16] | 1730 *p = lookup_r[(*p & 0xff0000) >> 16] |
1778 lookup_g[(*p & 0x00ff00)>> 8] | 1731 lookup_g[(*p & 0x00ff00) >> 8] |
1779 lookup_b[(*p & 0x0000ff)] | 1732 lookup_b[(*p & 0x0000ff)] |
1780 (*p & ~0xffffff); 1733 (*p & 0xff000000);
1734 }
1735 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line);
1736 }
1737 }
1738 else
1739 {
1740 for (int y = 0; y < srcImage->height; y++)
1741 for (int x = 0; x < srcImage->width; x++)
1742 {
1743 unsigned long pixel = XGetPixel (srcImage, x, y);
1744 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1745 lookup_g[(pixel & mask_g) >> sh_g] |
1746 lookup_b[(pixel & mask_b) >> sh_b];
1747 XPutPixel (srcImage, x, y, pixel);
1781 } 1748 }
1782 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1783 } 1749 }
1784 break;
1785 }
1786 }
1787 1750
1788 free (lookup); 1751 free (lookup);
1789} 1752}
1790#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1753#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */

Diff Legend

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