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.80 by sf-exg, Wed Oct 13 23:04:57 2010 UTC vs.
Revision 1.106 by sf-exg, Mon Nov 1 11:37:02 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.
… …
175{ 176{
176# ifdef HAVE_AFTERIMAGE 177# ifdef HAVE_AFTERIMAGE
177 if (original_asim) 178 if (original_asim)
178 return true; 179 return true;
179# endif 180# endif
180# ifdef ENABLE_TRANSPARENCY
181 if (flags & isTransparent)
182 {
183# ifdef HAVE_AFTERIMAGE
184 if ((flags & blurNeeded) && !(flags & blurServerSide))
185 return true;
186# endif
187 if ((flags & tintNeeded) && !(flags & tintServerSide))
188 return true;
189 }
190# endif
191 return false; 181 return false;
192} 182}
193 183
194# ifdef BG_IMAGE_FROM_FILE 184# ifdef BG_IMAGE_FROM_FILE
195static inline bool 185static inline bool
… …
232 int diff = window_size - image_size; 222 int diff = window_size - image_size;
233 int smaller = min (image_size, window_size); 223 int smaller = min (image_size, window_size);
234 224
235 if (align >= 0 && align <= 100) 225 if (align >= 0 && align <= 100)
236 return diff * align / 100; 226 return diff * align / 100;
237 else if (align > 100 && align <= 200 ) 227 else if (align > 100 && align <= 200)
238 return ((align - 100) * smaller / 100) + window_size - smaller; 228 return ((align - 100) * smaller / 100) + window_size - smaller;
239 else if (align >= -100 && align < 0) 229 else if (align >= -100 && align < 0)
240 return ((align + 100) * smaller / 100) - image_size; 230 return ((align + 100) * smaller / 100) - image_size;
241 return 0; 231 return 0;
242} 232}
… …
438 { 428 {
439 flags = new_flags; 429 flags = new_flags;
440 changed++; 430 changed++;
441 } 431 }
442 432
443 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
444 // flags, h_scale, v_scale, h_align, v_align);
445 return (changed > 0); 433 return (changed > 0);
446} 434}
447 435
448void 436void
449bgPixmap_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)
… …
478 x = make_align_position (h_align, target_width, w); 466 x = make_align_position (h_align, target_width, w);
479 y = make_align_position (v_align, target_height, h); 467 y = make_align_position (v_align, target_height, h);
480 } 468 }
481 469
482 flags &= ~sizeSensitive; 470 flags &= ~sizeSensitive;
483 if (h_scale != 0 || v_scale != 0 471 if ((flags & propScale) || h_scale || v_scale
484 || h_align != 0 || v_align != 0 472 || (!(flags & rootAlign) && (h_align || v_align))
485 || w > target_width || h > target_height) 473 || w > target_width || h > target_height)
486 flags |= sizeSensitive; 474 flags |= sizeSensitive;
487} 475}
488 476
489# ifdef HAVE_AFTERIMAGE 477# ifdef HAVE_AFTERIMAGE
… …
539 527
540 int x = 0; 528 int x = 0;
541 int y = 0; 529 int y = 0;
542 int w = 0; 530 int w = 0;
543 int h = 0; 531 int h = 0;
544
545 TIMING_TEST_START (asim);
546 532
547 if (original_asim) 533 if (original_asim)
548 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);
549 535
550 if (!original_asim 536 if (!original_asim
… …
667 } 653 }
668 654
669 free (layers); 655 free (layers);
670 } 656 }
671 } 657 }
672 TIMING_TEST_PRINT_RESULT (asim);
673 658
674 bool ret = false; 659 bool ret = false;
675 660
676 if (result) 661 if (result)
677 { 662 {
… …
723 708
724 if (result != background && result != original_asim) 709 if (result != background && result != original_asim)
725 destroy_asimage (&result); 710 destroy_asimage (&result);
726 711
727 XFreeGC (target->dpy, gc); 712 XFreeGC (target->dpy, gc);
728 TIMING_TEST_PRINT_RESULT (asim);
729 713
730 ret = true; 714 ret = true;
731 } 715 }
732 716
733 if (background) 717 if (background)
… …
745 return false; 729 return false;
746 730
747 if (!pixbuf) 731 if (!pixbuf)
748 return false; 732 return false;
749 733
750#if !XFT 734#if !XRENDER
751 if (background_flags) 735 if (background_flags)
752 return false; 736 return false;
753#endif 737#endif
754 738
755 GdkPixbuf *result; 739 GdkPixbuf *result;
… …
872 dst_width, dst_height, 856 dst_width, dst_height,
873 XLIB_RGB_DITHER_NONE, 857 XLIB_RGB_DITHER_NONE,
874 0, 0); 858 0, 0);
875 } 859 }
876 860
877#if XFT 861#if XRENDER
878 if (background_flags) 862 if (background_flags)
879 { 863 {
880 Display *dpy = target->dpy; 864 Display *dpy = target->dpy;
881 XRenderPictureAttributes pa; 865 XRenderPictureAttributes pa;
882 866
883 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen)); 867 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, target->visual);
884 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 868 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
885 869
886 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); 870 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
887 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa); 871 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
888 872
… …
941 } 925 }
942 926
943# ifdef HAVE_AFTERIMAGE 927# ifdef HAVE_AFTERIMAGE
944 if (!target->asimman) 928 if (!target->asimman)
945 target->asimman = create_generic_imageman (target->rs[Rs_path]); 929 target->asimman = create_generic_imageman (target->rs[Rs_path]);
946 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 930 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
931 if (image)
932 {
947 if (original_asim) 933 if (original_asim)
934 safe_asimage_destroy (original_asim);
935 original_asim = image;
948 have_image = true; 936 have_image = true;
949 return have_image; 937 return true;
938 }
950# endif 939# endif
951 940
952# ifdef HAVE_PIXBUF 941# ifdef HAVE_PIXBUF
953 pixbuf = gdk_pixbuf_new_from_file (file, NULL); 942 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
943 if (image)
944 {
954 if (pixbuf) 945 if (pixbuf)
946 g_object_unref (pixbuf);
947 pixbuf = image;
955 have_image = true; 948 have_image = true;
956 return have_image; 949 return true;
950 }
957# endif 951# endif
958 } 952 }
959 953
960 return false; 954 return false;
961} 955}
… …
1006 if (v_blurRadius == 0 && h_blurRadius == 0) 1000 if (v_blurRadius == 0 && h_blurRadius == 0)
1007 flags &= ~blurNeeded; 1001 flags &= ~blurNeeded;
1008 else 1002 else
1009 flags |= blurNeeded; 1003 flags |= blurNeeded;
1010 1004
1011#if XFT 1005#if XRENDER
1012 XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root); 1006 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1013 if (filters) 1007 if (filters)
1014 { 1008 {
1015 for (int i = 0; i < filters->nfilter; i++) 1009 for (int i = 0; i < filters->nfilter; i++)
1016 if (!strcmp (filters->filter[i], FilterConvolution)) 1010 if (!strcmp (filters->filter[i], FilterConvolution))
1017 flags |= bgPixmap_t::blurServerSide; 1011 flags |= bgPixmap_t::blurServerSide;
1018 1012
1019 XFree (filters); 1013 XFree (filters);
1020 } 1014 }
1021#endif 1015#endif
1022 1016
1023 return (changed > 0); 1017 return (changed > 0);
1024} 1018}
1025 1019
… …
1056 { 1050 {
1057 if (flags & bgPixmap_t::tintWholesome) 1051 if (flags & bgPixmap_t::tintWholesome)
1058 flags |= bgPixmap_t::tintServerSide; 1052 flags |= bgPixmap_t::tintServerSide;
1059 else 1053 else
1060 { 1054 {
1061#if XFT 1055#if XRENDER
1062 flags |= bgPixmap_t::tintServerSide; 1056 flags |= bgPixmap_t::tintServerSide;
1063#endif 1057#endif
1064 } 1058 }
1065 } 1059 }
1066 1060
… …
1113 } 1107 }
1114 1108
1115 return false; 1109 return false;
1116} 1110}
1117 1111
1112#if XRENDER
1118static void 1113static void
1119get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 1114get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1120{ 1115{
1121 double sigma = radius / 2.0; 1116 double sigma = radius / 2.0;
1122 double scale = sqrt (2.0 * M_PI) * sigma; 1117 double scale = sqrt (2.0 * M_PI) * sigma;
1123 double sum = 0.0; 1118 double sum = 0.0;
1124 1119
1125 for (int i = 0; i < width; i++) 1120 for (int i = 0; i < width; i++)
1126 { 1121 {
1127 double x = i - width / 2; 1122 double x = i - width / 2;
1128 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; 1123 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1129 sum += kernel[i]; 1124 sum += kernel[i];
1130 } 1125 }
1131 1126
1132 params[0] = XDoubleToFixed (width); 1127 params[0] = XDoubleToFixed (width);
1133 params[1] = XDoubleToFixed (1); 1128 params[1] = XDoubleToFixed (1);
1134 1129
1135 for (int i = 0; i < width; i++) 1130 for (int i = 0; i < width; i++)
1136 params[i+2] = XDoubleToFixed (kernel[i] / sum); 1131 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1137} 1132}
1133#endif
1138 1134
1139bool 1135bool
1140bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1136bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1141{ 1137{
1142 bool ret = false; 1138 bool ret = false;
1143#if XFT 1139#if XRENDER
1144 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1140 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1145 double *kernel = (double *)malloc (size * sizeof (double)); 1141 double *kernel = (double *)malloc (size * sizeof (double));
1146 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1142 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1147 1143
1148 Display *dpy = target->dpy; 1144 Display *dpy = target->dpy;
1149 XRenderPictureAttributes pa; 1145 XRenderPictureAttributes pa;
1150 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, target->visual); 1146 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1151 1147
1152 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1148 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1153 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1149 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1154 1150
1155 if (kernel && params && src && dst) 1151 if (kernel && params && src && dst)
… …
1225 XFreeGC (dpy, gc); 1221 XFreeGC (dpy, gc);
1226 } 1222 }
1227 } 1223 }
1228 else 1224 else
1229 { 1225 {
1230# if XFT 1226# if XRENDER
1231 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1227 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1232 1228
1233 if (flags & tintSet) 1229 if (flags & tintSet)
1234 tint.get (c); 1230 tint.get (c);
1235 1231
… …
1281 } 1277 }
1282 1278
1283 XRenderFreePicture (dpy, mask_pic); 1279 XRenderFreePicture (dpy, mask_pic);
1284 XRenderFreePicture (dpy, overlay_pic); 1280 XRenderFreePicture (dpy, overlay_pic);
1285 XRenderFreePicture (dpy, back_pic); 1281 XRenderFreePicture (dpy, back_pic);
1286# if DO_TIMING_TEST
1287 XSync (dpy, False);
1288# endif
1289# endif 1282# endif
1290 } 1283 }
1291 1284
1292 return ret; 1285 return ret;
1293} 1286}
1294 1287
1295/* make_transparency_pixmap() 1288/* make_transparency_pixmap()
1296 * 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
1297 * 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
1298 * our window. 1291 * our window.
1299 */ 1292 */
1300unsigned long 1293unsigned long
1301bgPixmap_t::make_transparency_pixmap () 1294bgPixmap_t::make_transparency_pixmap ()
1302{ 1295{
… …
1306 return 0; 1299 return 0;
1307 1300
1308 /* 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
1309 * be always up-to-date, so let's use it : 1302 * be always up-to-date, so let's use it :
1310 */ 1303 */
1311 Window root = target->display->root;
1312 int screen = target->display->screen; 1304 int screen = target->display->screen;
1313 Display *dpy = target->dpy; 1305 Display *dpy = target->dpy;
1306 int root_depth = DefaultDepth (dpy, screen);
1314 int root_width = DisplayWidth (dpy, screen); 1307 int root_width = DisplayWidth (dpy, screen);
1315 int root_height = DisplayHeight (dpy, screen); 1308 int root_height = DisplayHeight (dpy, screen);
1316 unsigned int root_pmap_width, root_pmap_height; 1309 unsigned int root_pmap_width, root_pmap_height;
1317 int window_width = target->szHint.width; 1310 int window_width = target->szHint.width;
1318 int window_height = target->szHint.height; 1311 int window_height = target->szHint.height;
1319 int sx, sy; 1312 int sx, sy;
1320 XGCValues gcv; 1313 XGCValues gcv;
1314 GC gc;
1321 1315
1322 TIMING_TEST_START (tp);
1323 target->get_window_origin (sx, sy); 1316 target->get_window_origin (sx, sy);
1324 1317
1325 /* 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 : */
1326 if (sx + window_width <= 0 || sy + window_height <= 0 1319 if (sx + window_width <= 0 || sy + window_height <= 0
1327 || sx >= root_width || sy >= root_height) 1320 || sx >= root_width || sy >= root_height)
1328 return 0; 1321 return 0;
1329 1322
1323 // validate root pixmap and get its size
1330 if (root_pixmap != None) 1324 if (root_pixmap != None)
1331 { 1325 {
1332 /* we want to validate the pixmap and get its size at the same time : */ 1326 Window wdummy;
1333 int junk; 1327 int idummy;
1334 unsigned int ujunk; 1328 unsigned int udummy;
1335 /* root pixmap may be bad - allow a error */ 1329
1336 target->allowedxerror = -1; 1330 target->allowedxerror = -1;
1337 1331
1338 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))
1339 root_pixmap = None; 1333 root_pixmap = None;
1340 1334
1341 target->allowedxerror = 0; 1335 target->allowedxerror = 0;
1342 } 1336 }
1343 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
1344 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);
1345 GC gc = NULL;
1346 1371
1347 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1372 if (tiled_root_pmap == None) /* something really bad happened - abort */
1348 return 0; 1373 return 0;
1349 1374
1350 if (root_pixmap == None)
1351 {
1352 /* use tricks to obtain the root background image :*/
1353 /* we want to create Overrideredirect window overlapping out window
1354 with background type of Parent Relative and then grab it */
1355 XSetWindowAttributes attr;
1356 Window src;
1357 bool success = false;
1358
1359 attr.background_pixmap = ParentRelative;
1360 attr.backing_store = Always;
1361 attr.event_mask = ExposureMask;
1362 attr.override_redirect = True;
1363 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
1364 CopyFromParent, CopyFromParent, CopyFromParent,
1365 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
1366 &attr);
1367
1368 if (src != None)
1369 {
1370 XEvent event;
1371 int ev_count = 0;
1372 XGrabServer (dpy);
1373 XMapRaised (dpy, src);
1374 XSync (dpy, False);
1375
1376 /* XSync should get window where it's properly exposed,
1377 * but to be on the safe side - let's check for the actual event to arrive : */
1378 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
1379 ++ev_count;
1380
1381 if (ev_count > 0);
1382 {
1383 /* hooray! - we can grab the image! */
1384 gc = XCreateGC (dpy, root, 0, NULL);
1385 if (gc)
1386 {
1387 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
1388 success = true;
1389 }
1390 }
1391
1392 XDestroyWindow (dpy, src);
1393 XUngrabServer (dpy);
1394 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
1395 }
1396
1397 if (!success)
1398 {
1399 XFreePixmap (dpy, tiled_root_pmap);
1400 tiled_root_pmap = None;
1401 }
1402 else
1403 result |= transpPmapTiled;
1404 }
1405 else
1406 {
1407 /* straightforward pixmap copy */ 1375 /* straightforward pixmap copy */
1408 gcv.tile = root_pixmap; 1376 gcv.tile = recoded_root_pmap;
1409 gcv.fill_style = FillTiled; 1377 gcv.fill_style = FillTiled;
1410 1378
1411 while (sx < 0) sx += (int)root_width; 1379 while (sx < 0) sx += (int)root_width;
1412 while (sy < 0) sy += (int)root_height; 1380 while (sy < 0) sy += (int)root_height;
1413 1381
1414 gcv.ts_x_origin = -sx; 1382 gcv.ts_x_origin = -sx;
1415 gcv.ts_y_origin = -sy; 1383 gcv.ts_y_origin = -sy;
1416 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1384 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1417 1385
1418 if (gc) 1386 if (gc)
1419 { 1387 {
1420 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);
1421 result |= transpPmapTiled; 1389 result |= transpPmapTiled;
1422 } 1390 XFreeGC (dpy, gc);
1423 } 1391 }
1424 TIMING_TEST_PRINT_RESULT (tp);
1425 1392
1426 if (tiled_root_pmap != None) 1393 if (tiled_root_pmap != None)
1427 { 1394 {
1428 if (!need_client_side_rendering ()) 1395 if (!need_client_side_rendering ())
1429 { 1396 {
1430 if ((flags & blurNeeded)) 1397 if ((flags & blurNeeded)
1398 && (flags & blurServerSide))
1431 { 1399 {
1432 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height)) 1400 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1433 result |= transpPmapBlurred; 1401 result |= transpPmapBlurred;
1434 } 1402 }
1435 if ((flags & tintNeeded)) 1403 if ((flags & tintNeeded)
1404 && (flags & tintServerSide))
1436 { 1405 {
1437 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height)) 1406 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1438 result |= transpPmapTinted; 1407 result |= transpPmapTinted;
1439 } 1408 }
1440 } /* server side rendering completed */ 1409 } /* server side rendering completed */
1441 1410
1442 if (pixmap) 1411 if (pixmap)
1443 XFreePixmap (dpy, pixmap); 1412 XFreePixmap (dpy, pixmap);
1444 1413
1445 pixmap = tiled_root_pmap; 1414 pixmap = tiled_root_pmap;
1446 pmap_width = window_width; 1415 pmap_width = window_width;
1447 pmap_height = window_height; 1416 pmap_height = window_height;
1448 pmap_depth = root_depth; 1417 pmap_depth = target->depth;
1449 } 1418 }
1450 1419
1451 if (gc) 1420 if (recoded_root_pmap != root_pixmap)
1452 XFreeGC (dpy, gc); 1421 XFreePixmap (dpy, recoded_root_pmap);
1453
1454 TIMING_TEST_PRINT_RESULT (tp);
1455 1422
1456 return result; 1423 return result;
1457} 1424}
1458 1425
1459bool 1426void
1460bgPixmap_t::set_root_pixmap () 1427bgPixmap_t::set_root_pixmap ()
1461{ 1428{
1462 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1429 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1463 if (new_root_pixmap == None) 1430 if (new_root_pixmap == None)
1464 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1431 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1465 1432
1466 if (new_root_pixmap != root_pixmap)
1467 {
1468 root_pixmap = new_root_pixmap; 1433 root_pixmap = new_root_pixmap;
1469 return true;
1470 }
1471
1472 return false;
1473} 1434}
1474# endif /* ENABLE_TRANSPARENCY */ 1435# endif /* ENABLE_TRANSPARENCY */
1475 1436
1476# ifndef HAVE_AFTERIMAGE 1437# ifndef HAVE_AFTERIMAGE
1477static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm); 1438static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm);
1478# endif 1439# endif
1479 1440
1480bool 1441bool
1481bgPixmap_t::render () 1442bgPixmap_t::render ()
1482{ 1443{
1483 unsigned long background_flags = 0; 1444 unsigned long background_flags = 0;
1484 1445
1485 if (target == NULL) 1446 if (target == NULL)
1486 return false; 1447 return false;
1487
1488 TIMING_TEST_START (tp);
1489 1448
1490 invalidate (); 1449 invalidate ();
1491# ifdef ENABLE_TRANSPARENCY 1450# ifdef ENABLE_TRANSPARENCY
1492 if (flags & isTransparent) 1451 if (flags & isTransparent)
1493 { 1452 {
1494 /* we need to re-generate transparency pixmap in that case ! */ 1453 /* we need to re-generate transparency pixmap in that case ! */
1495 background_flags = make_transparency_pixmap (); 1454 background_flags = make_transparency_pixmap ();
1496 if (background_flags == 0) 1455 if (background_flags == 0)
1497 return false; 1456 return false;
1498 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1457 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1499 && pmap_depth == target->depth)
1500 flags = flags & ~isInvalid; 1458 flags = flags & ~isInvalid;
1501 } 1459 }
1502# endif 1460# endif
1503 1461
1504# ifdef BG_IMAGE_FROM_FILE 1462# ifdef BG_IMAGE_FROM_FILE
… …
1517 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1475 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1518 } 1476 }
1519 1477
1520 if (result) 1478 if (result)
1521 { 1479 {
1522# if !defined(HAVE_AFTERIMAGE) && !XFT 1480# if !defined(HAVE_AFTERIMAGE) && !XRENDER
1523 /* our own client-side tinting */ 1481 /* our own client-side tinting */
1524 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1525 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1526 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1482 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1527 { 1483 {
1528 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1484 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1529 if (flags & tintSet) 1485 if (flags & tintSet)
1530 tint.get (c); 1486 tint.get (c);
1531 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1487 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b);
1532 } 1488 }
1533# endif 1489# endif
1534 1490
1535 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1491 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1536 1492
1537 if (gc) 1493 if (gc)
1538 { 1494 {
1539 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1540 {
1541 XFreePixmap (target->dpy, pixmap);
1542 pixmap = None;
1543 }
1544
1545 if (pixmap == None)
1546 {
1547 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1548 pmap_width = result->width;
1549 pmap_height = result->height;
1550 pmap_depth = target->depth;
1551 }
1552
1553 if (pmap_depth != result->depth)
1554 {
1555 /* Bad Match error will ensue ! stupid X !!!! */
1556 if (result->depth == 24 && pmap_depth == 32)
1557 result->depth = 32;
1558 else if (result->depth == 32 && pmap_depth == 24)
1559 result->depth = 24;
1560 else
1561 {
1562 /* TODO: implement image recoding */
1563 }
1564 }
1565
1566 if (pmap_depth == result->depth)
1567 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1495 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1568 1496
1569 XFreeGC (target->dpy, gc); 1497 XFreeGC (target->dpy, gc);
1570 flags = flags & ~isInvalid; 1498 flags = flags & ~isInvalid;
1571 } 1499 }
1572 1500
… …
1582 } 1510 }
1583 } 1511 }
1584 1512
1585 apply (); 1513 apply ();
1586 1514
1587 XSync (target->dpy, False);
1588 valid_since = ev::now (); 1515 valid_since = ev::now ();
1589 1516
1590 TIMING_TEST_PRINT_RESULT (tp);
1591
1592 return true; 1517 return true;
1593} 1518}
1594 1519
1595bool 1520void
1596bgPixmap_t::set_target (rxvt_term *new_target) 1521bgPixmap_t::set_target (rxvt_term *new_target)
1597{ 1522{
1598 if (new_target)
1599 if (target != new_target)
1600 {
1601 target = new_target; 1523 target = new_target;
1602# ifdef ENABLE_TRANSPARENCY
1603 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1604# endif
1605 return true;
1606 }
1607
1608 return false;
1609} 1524}
1610 1525
1611void 1526void
1612bgPixmap_t::apply () 1527bgPixmap_t::apply ()
1613{ 1528{
1614 if (target) 1529 if (target)
1615 { 1530 {
1616 flags &= ~isVtOrigin;
1617
1618 if (pixmap != None) 1531 if (pixmap != None)
1619 { 1532 {
1620 /* set target's background to pixmap */ 1533 /* set target's background to pixmap */
1621# ifdef ENABLE_TRANSPARENCY 1534# ifdef ENABLE_TRANSPARENCY
1622 if (flags & isTransparent) 1535 if (flags & isTransparent)
… …
1628 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1541 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1629 } 1542 }
1630 else 1543 else
1631# endif 1544# endif
1632 { 1545 {
1633 flags |= isVtOrigin;
1634 /* force old pixmap dereference in case it was transparent before :*/ 1546 /* force old pixmap dereference in case it was transparent before :*/
1635 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1547 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1636 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1548 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1637 /* do we also need to set scrollbar's background here ? */ 1549 /* do we also need to set scrollbar's background here ? */
1638 1550
… …
1665 } 1577 }
1666} 1578}
1667 1579
1668#endif /* HAVE_BG_PIXMAP */ 1580#endif /* HAVE_BG_PIXMAP */
1669 1581
1670#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1582#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XRENDER
1671/* taken from aterm-0.4.2 */ 1583/* taken from aterm-0.4.2 */
1672 1584
1673typedef uint32_t RUINT32T;
1674
1675static void 1585static void
1676ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm) 1586ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm)
1677{ 1587{
1678 int sh_r, sh_g, sh_b; 1588 int sh_r, sh_g, sh_b;
1679 RUINT32T mask_r, mask_g, mask_b; 1589 uint32_t mask_r, mask_g, mask_b;
1680 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1590 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1681 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1591 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1682 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1592 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1683 int i; 1593 int i;
1594 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1684 1595
1685 Visual *visual = term->visual;
1686
1687 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1596 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1688 1597
1689 /* for convenience */ 1598 /* for convenience */
1690 mask_r = visual->red_mask; 1599 mask_r = visual->red_mask;
1691 mask_g = visual->green_mask; 1600 mask_g = visual->green_mask;
1692 mask_b = visual->blue_mask; 1601 mask_b = visual->blue_mask;
1693 1602
1694 /* boring lookup table pre-initialization */ 1603 /* boring lookup table pre-initialization */
1695 switch (srcImage->bits_per_pixel) { 1604 switch (srcImage->depth)
1605 {
1696 case 15: 1606 case 15:
1697 if ((mask_r != 0x7c00) || 1607 if ((mask_r != 0x7c00) ||
1698 (mask_g != 0x03e0) || 1608 (mask_g != 0x03e0) ||
1699 (mask_b != 0x001f)) 1609 (mask_b != 0x001f))
1700 return; 1610 return;
1701 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1611 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32));
1702 lookup_r = lookup; 1612 lookup_r = lookup;
1703 lookup_g = lookup+32; 1613 lookup_g = lookup+32;
1704 lookup_b = lookup+32+32; 1614 lookup_b = lookup+32+32;
1705 sh_r = 10; 1615 sh_r = 10;
1706 sh_g = 5; 1616 sh_g = 5;
1707 sh_b = 0; 1617 sh_b = 0;
1708 break; 1618 break;
1709 case 16: 1619 case 16:
1710 if ((mask_r != 0xf800) || 1620 if ((mask_r != 0xf800) ||
1711 (mask_g != 0x07e0) || 1621 (mask_g != 0x07e0) ||
1712 (mask_b != 0x001f)) 1622 (mask_b != 0x001f))
1713 return; 1623 return;
1714 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1624 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1715 lookup_r = lookup; 1625 lookup_r = lookup;
1716 lookup_g = lookup+32; 1626 lookup_g = lookup+32;
1717 lookup_b = lookup+32+64; 1627 lookup_b = lookup+32+64;
1718 sh_r = 11; 1628 sh_r = 11;
1719 sh_g = 5; 1629 sh_g = 5;
1720 sh_b = 0; 1630 sh_b = 0;
1721 break; 1631 break;
1722 case 24: 1632 case 24:
1723 if ((mask_r != 0xff0000) || 1633 if ((mask_r != 0xff0000) ||
1724 (mask_g != 0x00ff00) || 1634 (mask_g != 0x00ff00) ||
1725 (mask_b != 0x0000ff)) 1635 (mask_b != 0x0000ff))
1726 return; 1636 return;
1727 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1637 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1728 lookup_r = lookup; 1638 lookup_r = lookup;
1729 lookup_g = lookup+256; 1639 lookup_g = lookup+256;
1730 lookup_b = lookup+256+256; 1640 lookup_b = lookup+256+256;
1731 sh_r = 16; 1641 sh_r = 16;
1732 sh_g = 8; 1642 sh_g = 8;
1733 sh_b = 0; 1643 sh_b = 0;
1734 break; 1644 break;
1735 case 32: 1645 case 32:
1736 if ((mask_r != 0xff0000) || 1646 if ((mask_r != 0xff0000) ||
1737 (mask_g != 0x00ff00) || 1647 (mask_g != 0x00ff00) ||
1738 (mask_b != 0x0000ff)) 1648 (mask_b != 0x0000ff))
1739 return; 1649 return;
1740 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1650 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1741 lookup_r = lookup; 1651 lookup_r = lookup;
1742 lookup_g = lookup+256; 1652 lookup_g = lookup+256;
1743 lookup_b = lookup+256+256; 1653 lookup_b = lookup+256+256;
1744 sh_r = 16; 1654 sh_r = 16;
1745 sh_g = 8; 1655 sh_g = 8;
1746 sh_b = 0; 1656 sh_b = 0;
1747 break; 1657 break;
1748 default: 1658 default:
1749 return; /* we do not support this color depth */ 1659 return; /* we do not support this color depth */
1750 } 1660 }
1751 1661
1752 /* prepare limits for color transformation (each channel is handled separately) */ 1662 /* prepare limits for color transformation (each channel is handled separately) */
1753 if (shade > 100) { 1663 if (shade > 100)
1664 {
1754 shade = 200 - shade; 1665 shade = 200 - shade;
1755 1666
1756 lower_lim_r = 65535-rm; 1667 lower_lim_r = 65535-rm;
1757 lower_lim_g = 65535-gm; 1668 lower_lim_g = 65535-gm;
1758 lower_lim_b = 65535-bm; 1669 lower_lim_b = 65535-bm;
1759 1670
1760 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1671 lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100);
1761 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1672 lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100);
1762 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1673 lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100);
1763 1674
1764 upper_lim_r = upper_lim_g = upper_lim_b = 65535; 1675 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1676 }
1765 } else { 1677 else
1678 {
1766 1679
1767 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1680 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1768 1681
1769 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100); 1682 upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1770 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100); 1683 upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1771 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100); 1684 upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1772 } 1685 }
1773
1774 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1775 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1776 {
1777 unsigned int tmp;
1778
1779 tmp = lower_lim_r;
1780 lower_lim_r = lower_lim_b;
1781 lower_lim_b = tmp;
1782
1783 tmp = upper_lim_r;
1784 upper_lim_r = upper_lim_b;
1785 upper_lim_b = tmp;
1786 }
1787 1686
1788 /* fill our lookup tables */ 1687 /* fill our lookup tables */
1789 for (i = 0; i <= mask_r>>sh_r; i++) 1688 for (i = 0; i <= mask_r>>sh_r; i++)
1790 { 1689 {
1791 RUINT32T tmp; 1690 uint32_t tmp;
1792 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1691 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r));
1793 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1692 tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r);
1794 lookup_r[i] = (tmp/65535)<<sh_r; 1693 lookup_r[i] = (tmp/65535)<<sh_r;
1795 } 1694 }
1796 for (i = 0; i <= mask_g>>sh_g; i++) 1695 for (i = 0; i <= mask_g>>sh_g; i++)
1797 { 1696 {
1798 RUINT32T tmp; 1697 uint32_t tmp;
1799 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1698 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g));
1800 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1699 tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g);
1801 lookup_g[i] = (tmp/65535)<<sh_g; 1700 lookup_g[i] = (tmp/65535)<<sh_g;
1802 } 1701 }
1803 for (i = 0; i <= mask_b>>sh_b; i++) 1702 for (i = 0; i <= mask_b>>sh_b; i++)
1804 { 1703 {
1805 RUINT32T tmp; 1704 uint32_t tmp;
1806 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1705 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b));
1807 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1706 tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b);
1808 lookup_b[i] = (tmp/65535)<<sh_b; 1707 lookup_b[i] = (tmp/65535)<<sh_b;
1809 } 1708 }
1810 1709
1811 /* apply table to input image (replacing colors by newly calculated ones) */ 1710 /* apply table to input image (replacing colors by newly calculated ones) */
1812 switch (srcImage->bits_per_pixel) 1711 if (srcImage->bits_per_pixel == 32
1712 && (srcImage->depth == 24 || srcImage->depth == 32)
1713 && srcImage->byte_order == host_byte_order)
1813 { 1714 {
1814 case 15:
1815 {
1816 unsigned short *p1, *pf, *p, *pl; 1715 uint32_t *p1, *pf, *p, *pl;
1817 p1 = (unsigned short *) srcImage->data; 1716 p1 = (uint32_t *) srcImage->data;
1818 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1717 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1718
1819 while (p1 < pf) 1719 while (p1 < pf)
1820 { 1720 {
1821 p = p1; 1721 p = p1;
1822 pl = p1 + srcImage->width; 1722 pl = p1 + srcImage->width;
1823 for (; p < pl; p++) 1723 for (; p < pl; p++)
1824 { 1724 {
1825 *p = lookup_r[(*p & 0x7c00)>>10] |
1826 lookup_g[(*p & 0x03e0)>> 5] |
1827 lookup_b[(*p & 0x001f)];
1828 }
1829 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1830 }
1831 break;
1832 }
1833 case 16:
1834 {
1835 unsigned short *p1, *pf, *p, *pl;
1836 p1 = (unsigned short *) srcImage->data;
1837 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1838 while (p1 < pf)
1839 {
1840 p = p1;
1841 pl = p1 + srcImage->width;
1842 for (; p < pl; p++)
1843 {
1844 *p = lookup_r[(*p & 0xf800)>>11] |
1845 lookup_g[(*p & 0x07e0)>> 5] |
1846 lookup_b[(*p & 0x001f)];
1847 }
1848 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1849 }
1850 break;
1851 }
1852 case 24:
1853 {
1854 unsigned char *p1, *pf, *p, *pl;
1855 p1 = (unsigned char *) srcImage->data;
1856 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1857 while (p1 < pf)
1858 {
1859 p = p1;
1860 pl = p1 + srcImage->width * 3;
1861 for (; p < pl; p += 3)
1862 {
1863 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1864 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1865 p[2] = lookup_r[(p[2] & 0x0000ff)];
1866 }
1867 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1868 }
1869 break;
1870 }
1871 case 32:
1872 {
1873 RUINT32T *p1, *pf, *p, *pl;
1874 p1 = (RUINT32T *) srcImage->data;
1875 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1876
1877 while (p1 < pf)
1878 {
1879 p = p1;
1880 pl = p1 + srcImage->width;
1881 for (; p < pl; p++)
1882 {
1883 *p = lookup_r[(*p & 0xff0000)>>16] | 1725 *p = lookup_r[(*p & 0xff0000) >> 16] |
1884 lookup_g[(*p & 0x00ff00)>> 8] | 1726 lookup_g[(*p & 0x00ff00) >> 8] |
1885 lookup_b[(*p & 0x0000ff)] | 1727 lookup_b[(*p & 0x0000ff)] |
1886 (*p & ~0xffffff); 1728 (*p & 0xff000000);
1729 }
1730 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line);
1731 }
1732 }
1733 else
1734 {
1735 for (int y = 0; y < srcImage->height; y++)
1736 for (int x = 0; x < srcImage->width; x++)
1737 {
1738 unsigned long pixel = XGetPixel (srcImage, x, y);
1739 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1740 lookup_g[(pixel & mask_g) >> sh_g] |
1741 lookup_b[(pixel & mask_b) >> sh_b];
1742 XPutPixel (srcImage, x, y, pixel);
1887 } 1743 }
1888 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1889 } 1744 }
1890 break;
1891 }
1892 }
1893 1745
1894 free (lookup); 1746 free (lookup);
1895} 1747}
1896#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1748#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */

Diff Legend

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