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.95 by sf-exg, Fri Oct 22 16:21:05 2010 UTC

… …
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com>
7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net> 7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net>
8 * Copyright (c) 2010 Emanuele Giaquinta <e.giaquinta@glauco.it>
8 * 9 *
9 * This program is free software; you can redistribute it and/or modify 10 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by 11 * it under the terms of the GNU General Public License as published by
11 * the Free Software Foundation; either version 2 of the License, or 12 * the Free Software Foundation; either version 2 of the License, or
12 * (at your option) any later version. 13 * (at your option) any later version.
… …
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}
… …
478 x = make_align_position (h_align, target_width, w); 468 x = make_align_position (h_align, target_width, w);
479 y = make_align_position (v_align, target_height, h); 469 y = make_align_position (v_align, target_height, h);
480 } 470 }
481 471
482 flags &= ~sizeSensitive; 472 flags &= ~sizeSensitive;
483 if (h_scale != 0 || v_scale != 0 473 if ((flags & propScale) || h_scale || v_scale
484 || h_align != 0 || v_align != 0 474 || (!(flags & rootAlign) && (h_align || v_align))
485 || w > target_width || h > target_height) 475 || w > target_width || h > target_height)
486 flags |= sizeSensitive; 476 flags |= sizeSensitive;
487} 477}
488 478
489# ifdef HAVE_AFTERIMAGE 479# ifdef HAVE_AFTERIMAGE
… …
539 529
540 int x = 0; 530 int x = 0;
541 int y = 0; 531 int y = 0;
542 int w = 0; 532 int w = 0;
543 int h = 0; 533 int h = 0;
544
545 TIMING_TEST_START (asim);
546 534
547 if (original_asim) 535 if (original_asim)
548 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y); 536 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
549 537
550 if (!original_asim 538 if (!original_asim
… …
667 } 655 }
668 656
669 free (layers); 657 free (layers);
670 } 658 }
671 } 659 }
672 TIMING_TEST_PRINT_RESULT (asim);
673 660
674 bool ret = false; 661 bool ret = false;
675 662
676 if (result) 663 if (result)
677 { 664 {
… …
723 710
724 if (result != background && result != original_asim) 711 if (result != background && result != original_asim)
725 destroy_asimage (&result); 712 destroy_asimage (&result);
726 713
727 XFreeGC (target->dpy, gc); 714 XFreeGC (target->dpy, gc);
728 TIMING_TEST_PRINT_RESULT (asim);
729 715
730 ret = true; 716 ret = true;
731 } 717 }
732 718
733 if (background) 719 if (background)
… …
941 } 927 }
942 928
943# ifdef HAVE_AFTERIMAGE 929# ifdef HAVE_AFTERIMAGE
944 if (!target->asimman) 930 if (!target->asimman)
945 target->asimman = create_generic_imageman (target->rs[Rs_path]); 931 target->asimman = create_generic_imageman (target->rs[Rs_path]);
946 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 932 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
933 if (image)
934 {
947 if (original_asim) 935 if (original_asim)
936 safe_asimage_destroy (original_asim);
937 original_asim = image;
948 have_image = true; 938 have_image = true;
949 return have_image; 939 return true;
940 }
950# endif 941# endif
951 942
952# ifdef HAVE_PIXBUF 943# ifdef HAVE_PIXBUF
953 pixbuf = gdk_pixbuf_new_from_file (file, NULL); 944 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
945 if (image)
946 {
954 if (pixbuf) 947 if (pixbuf)
948 g_object_unref (pixbuf);
949 pixbuf = image;
955 have_image = true; 950 have_image = true;
956 return have_image; 951 return true;
952 }
957# endif 953# endif
958 } 954 }
959 955
960 return false; 956 return false;
961} 957}
… …
1007 flags &= ~blurNeeded; 1003 flags &= ~blurNeeded;
1008 else 1004 else
1009 flags |= blurNeeded; 1005 flags |= blurNeeded;
1010 1006
1011#if XFT 1007#if XFT
1012 XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root); 1008 XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root);
1013 if (filters) 1009 if (filters)
1014 { 1010 {
1015 for (int i = 0; i < filters->nfilter; i++) 1011 for (int i = 0; i < filters->nfilter; i++)
1016 if (!strcmp (filters->filter[i], FilterConvolution)) 1012 if (!strcmp (filters->filter[i], FilterConvolution))
1017 flags |= bgPixmap_t::blurServerSide; 1013 flags |= bgPixmap_t::blurServerSide;
1018 1014
1019 XFree (filters); 1015 XFree (filters);
1020 } 1016 }
1021#endif 1017#endif
1022 1018
1023 return (changed > 0); 1019 return (changed > 0);
1024} 1020}
1025 1021
… …
1113 } 1109 }
1114 1110
1115 return false; 1111 return false;
1116} 1112}
1117 1113
1114#if XFT
1118static void 1115static void
1119get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 1116get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1120{ 1117{
1121 double sigma = radius / 2.0; 1118 double sigma = radius / 2.0;
1122 double scale = sqrt (2.0 * M_PI) * sigma; 1119 double scale = sqrt (2.0 * M_PI) * sigma;
1123 double sum = 0.0; 1120 double sum = 0.0;
1124 1121
1125 for (int i = 0; i < width; i++) 1122 for (int i = 0; i < width; i++)
1126 { 1123 {
1127 double x = i - width / 2; 1124 double x = i - width / 2;
1128 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; 1125 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1129 sum += kernel[i]; 1126 sum += kernel[i];
1130 } 1127 }
1131 1128
1132 params[0] = XDoubleToFixed (width); 1129 params[0] = XDoubleToFixed (width);
1133 params[1] = XDoubleToFixed (1); 1130 params[1] = XDoubleToFixed (1);
1134 1131
1135 for (int i = 0; i < width; i++) 1132 for (int i = 0; i < width; i++)
1136 params[i+2] = XDoubleToFixed (kernel[i] / sum); 1133 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1137} 1134}
1135#endif
1138 1136
1139bool 1137bool
1140bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1138bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1141{ 1139{
1142 bool ret = false; 1140 bool ret = false;
… …
1145 double *kernel = (double *)malloc (size * sizeof (double)); 1143 double *kernel = (double *)malloc (size * sizeof (double));
1146 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1144 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1147 1145
1148 Display *dpy = target->dpy; 1146 Display *dpy = target->dpy;
1149 XRenderPictureAttributes pa; 1147 XRenderPictureAttributes pa;
1150 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, target->visual); 1148 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1151 1149
1152 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1150 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1153 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1151 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1154 1152
1155 if (kernel && params && src && dst) 1153 if (kernel && params && src && dst)
… …
1281 } 1279 }
1282 1280
1283 XRenderFreePicture (dpy, mask_pic); 1281 XRenderFreePicture (dpy, mask_pic);
1284 XRenderFreePicture (dpy, overlay_pic); 1282 XRenderFreePicture (dpy, overlay_pic);
1285 XRenderFreePicture (dpy, back_pic); 1283 XRenderFreePicture (dpy, back_pic);
1286# if DO_TIMING_TEST
1287 XSync (dpy, False);
1288# endif
1289# endif 1284# endif
1290 } 1285 }
1291 1286
1292 return ret; 1287 return ret;
1293} 1288}
… …
1316 unsigned int root_pmap_width, root_pmap_height; 1311 unsigned int root_pmap_width, root_pmap_height;
1317 int window_width = target->szHint.width; 1312 int window_width = target->szHint.width;
1318 int window_height = target->szHint.height; 1313 int window_height = target->szHint.height;
1319 int sx, sy; 1314 int sx, sy;
1320 XGCValues gcv; 1315 XGCValues gcv;
1316 GC gc;
1321 1317
1322 TIMING_TEST_START (tp);
1323 target->get_window_origin (sx, sy); 1318 target->get_window_origin (sx, sy);
1324 1319
1325 /* check if we are outside of the visible part of the virtual screen : */ 1320 /* check if we are outside of the visible part of the virtual screen : */
1326 if (sx + window_width <= 0 || sy + window_height <= 0 1321 if (sx + window_width <= 0 || sy + window_height <= 0
1327 || sx >= root_width || sy >= root_height) 1322 || sx >= root_width || sy >= root_height)
… …
1339 root_pixmap = None; 1334 root_pixmap = None;
1340 1335
1341 target->allowedxerror = 0; 1336 target->allowedxerror = 0;
1342 } 1337 }
1343 1338
1339 if (root_pixmap == None)
1340 return 0;
1341
1344 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1342 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth);
1345 GC gc = NULL;
1346 1343
1347 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1344 if (tiled_root_pmap == None) /* something really bad happened - abort */
1348 return 0; 1345 return 0;
1349 1346
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 */ 1347 /* straightforward pixmap copy */
1408 gcv.tile = root_pixmap; 1348 gcv.tile = root_pixmap;
1409 gcv.fill_style = FillTiled; 1349 gcv.fill_style = FillTiled;
1410 1350
1411 while (sx < 0) sx += (int)root_width; 1351 while (sx < 0) sx += (int)root_width;
1412 while (sy < 0) sy += (int)root_height; 1352 while (sy < 0) sy += (int)root_height;
1413 1353
1414 gcv.ts_x_origin = -sx; 1354 gcv.ts_x_origin = -sx;
1415 gcv.ts_y_origin = -sy; 1355 gcv.ts_y_origin = -sy;
1416 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1356 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1417 1357
1418 if (gc) 1358 if (gc)
1419 { 1359 {
1420 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1360 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1421 result |= transpPmapTiled; 1361 result |= transpPmapTiled;
1422 } 1362 XFreeGC (dpy, gc);
1423 } 1363 }
1424 TIMING_TEST_PRINT_RESULT (tp);
1425 1364
1426 if (tiled_root_pmap != None) 1365 if (tiled_root_pmap != None)
1427 { 1366 {
1428 if (!need_client_side_rendering ()) 1367 if (!need_client_side_rendering ())
1429 { 1368 {
1430 if ((flags & blurNeeded)) 1369 if (flags & (blurNeeded | blurServerSide))
1431 { 1370 {
1432 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height)) 1371 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height))
1433 result |= transpPmapBlurred; 1372 result |= transpPmapBlurred;
1434 } 1373 }
1435 if ((flags & tintNeeded)) 1374 if (flags & (tintNeeded | tintServerSide))
1436 { 1375 {
1437 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height)) 1376 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height))
1438 result |= transpPmapTinted; 1377 result |= transpPmapTinted;
1439 } 1378 }
1440 } /* server side rendering completed */ 1379 } /* server side rendering completed */
1441 1380
1442 if (pixmap) 1381 if (pixmap)
… …
1446 pmap_width = window_width; 1385 pmap_width = window_width;
1447 pmap_height = window_height; 1386 pmap_height = window_height;
1448 pmap_depth = root_depth; 1387 pmap_depth = root_depth;
1449 } 1388 }
1450 1389
1451 if (gc)
1452 XFreeGC (dpy, gc);
1453
1454 TIMING_TEST_PRINT_RESULT (tp);
1455
1456 return result; 1390 return result;
1457} 1391}
1458 1392
1459bool 1393bool
1460bgPixmap_t::set_root_pixmap () 1394bgPixmap_t::set_root_pixmap ()
… …
1472 return false; 1406 return false;
1473} 1407}
1474# endif /* ENABLE_TRANSPARENCY */ 1408# endif /* ENABLE_TRANSPARENCY */
1475 1409
1476# ifndef HAVE_AFTERIMAGE 1410# ifndef HAVE_AFTERIMAGE
1477static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm); 1411static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm);
1478# endif 1412# endif
1479 1413
1480bool 1414bool
1481bgPixmap_t::render () 1415bgPixmap_t::render ()
1482{ 1416{
1483 unsigned long background_flags = 0; 1417 unsigned long background_flags = 0;
1484 1418
1485 if (target == NULL) 1419 if (target == NULL)
1486 return false; 1420 return false;
1487
1488 TIMING_TEST_START (tp);
1489 1421
1490 invalidate (); 1422 invalidate ();
1491# ifdef ENABLE_TRANSPARENCY 1423# ifdef ENABLE_TRANSPARENCY
1492 if (flags & isTransparent) 1424 if (flags & isTransparent)
1493 { 1425 {
… …
1526 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1458 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1527 { 1459 {
1528 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1460 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1529 if (flags & tintSet) 1461 if (flags & tintSet)
1530 tint.get (c); 1462 tint.get (c);
1531 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1463 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b);
1532 } 1464 }
1533# endif 1465# endif
1534 1466
1535 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1467 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1536 1468
… …
1582 } 1514 }
1583 } 1515 }
1584 1516
1585 apply (); 1517 apply ();
1586 1518
1587 XSync (target->dpy, False);
1588 valid_since = ev::now (); 1519 valid_since = ev::now ();
1589
1590 TIMING_TEST_PRINT_RESULT (tp);
1591 1520
1592 return true; 1521 return true;
1593} 1522}
1594 1523
1595bool 1524bool
… …
1668#endif /* HAVE_BG_PIXMAP */ 1597#endif /* HAVE_BG_PIXMAP */
1669 1598
1670#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1599#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT
1671/* taken from aterm-0.4.2 */ 1600/* taken from aterm-0.4.2 */
1672 1601
1673typedef uint32_t RUINT32T;
1674
1675static void 1602static void
1676ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm) 1603ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm)
1677{ 1604{
1678 int sh_r, sh_g, sh_b; 1605 int sh_r, sh_g, sh_b;
1679 RUINT32T mask_r, mask_g, mask_b; 1606 uint32_t mask_r, mask_g, mask_b;
1680 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1607 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1681 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1608 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1682 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1609 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1683 int i; 1610 int i;
1611 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1684 1612
1685 Visual *visual = term->visual;
1686
1687 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1613 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1688 1614
1689 /* for convenience */ 1615 /* for convenience */
1690 mask_r = visual->red_mask; 1616 mask_r = visual->red_mask;
1691 mask_g = visual->green_mask; 1617 mask_g = visual->green_mask;
1692 mask_b = visual->blue_mask; 1618 mask_b = visual->blue_mask;
1693 1619
1694 /* boring lookup table pre-initialization */ 1620 /* boring lookup table pre-initialization */
1695 switch (srcImage->bits_per_pixel) { 1621 switch (srcImage->depth)
1622 {
1696 case 15: 1623 case 15:
1697 if ((mask_r != 0x7c00) || 1624 if ((mask_r != 0x7c00) ||
1698 (mask_g != 0x03e0) || 1625 (mask_g != 0x03e0) ||
1699 (mask_b != 0x001f)) 1626 (mask_b != 0x001f))
1700 return; 1627 return;
1701 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1628 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32));
1702 lookup_r = lookup; 1629 lookup_r = lookup;
1703 lookup_g = lookup+32; 1630 lookup_g = lookup+32;
1704 lookup_b = lookup+32+32; 1631 lookup_b = lookup+32+32;
1705 sh_r = 10; 1632 sh_r = 10;
1706 sh_g = 5; 1633 sh_g = 5;
1707 sh_b = 0; 1634 sh_b = 0;
1708 break; 1635 break;
1709 case 16: 1636 case 16:
1710 if ((mask_r != 0xf800) || 1637 if ((mask_r != 0xf800) ||
1711 (mask_g != 0x07e0) || 1638 (mask_g != 0x07e0) ||
1712 (mask_b != 0x001f)) 1639 (mask_b != 0x001f))
1713 return; 1640 return;
1714 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1641 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1715 lookup_r = lookup; 1642 lookup_r = lookup;
1716 lookup_g = lookup+32; 1643 lookup_g = lookup+32;
1717 lookup_b = lookup+32+64; 1644 lookup_b = lookup+32+64;
1718 sh_r = 11; 1645 sh_r = 11;
1719 sh_g = 5; 1646 sh_g = 5;
1720 sh_b = 0; 1647 sh_b = 0;
1721 break; 1648 break;
1722 case 24: 1649 case 24:
1723 if ((mask_r != 0xff0000) || 1650 if ((mask_r != 0xff0000) ||
1724 (mask_g != 0x00ff00) || 1651 (mask_g != 0x00ff00) ||
1725 (mask_b != 0x0000ff)) 1652 (mask_b != 0x0000ff))
1726 return; 1653 return;
1727 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1654 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1728 lookup_r = lookup; 1655 lookup_r = lookup;
1729 lookup_g = lookup+256; 1656 lookup_g = lookup+256;
1730 lookup_b = lookup+256+256; 1657 lookup_b = lookup+256+256;
1731 sh_r = 16; 1658 sh_r = 16;
1732 sh_g = 8; 1659 sh_g = 8;
1733 sh_b = 0; 1660 sh_b = 0;
1734 break; 1661 break;
1735 case 32: 1662 case 32:
1736 if ((mask_r != 0xff0000) || 1663 if ((mask_r != 0xff0000) ||
1737 (mask_g != 0x00ff00) || 1664 (mask_g != 0x00ff00) ||
1738 (mask_b != 0x0000ff)) 1665 (mask_b != 0x0000ff))
1739 return; 1666 return;
1740 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1667 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1741 lookup_r = lookup; 1668 lookup_r = lookup;
1742 lookup_g = lookup+256; 1669 lookup_g = lookup+256;
1743 lookup_b = lookup+256+256; 1670 lookup_b = lookup+256+256;
1744 sh_r = 16; 1671 sh_r = 16;
1745 sh_g = 8; 1672 sh_g = 8;
1746 sh_b = 0; 1673 sh_b = 0;
1747 break; 1674 break;
1748 default: 1675 default:
1749 return; /* we do not support this color depth */ 1676 return; /* we do not support this color depth */
1750 } 1677 }
1751 1678
1752 /* prepare limits for color transformation (each channel is handled separately) */ 1679 /* prepare limits for color transformation (each channel is handled separately) */
1753 if (shade > 100) { 1680 if (shade > 100)
1681 {
1754 shade = 200 - shade; 1682 shade = 200 - shade;
1755 1683
1756 lower_lim_r = 65535-rm; 1684 lower_lim_r = 65535-rm;
1757 lower_lim_g = 65535-gm; 1685 lower_lim_g = 65535-gm;
1758 lower_lim_b = 65535-bm; 1686 lower_lim_b = 65535-bm;
1759 1687
1760 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1688 lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100);
1761 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1689 lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100);
1762 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1690 lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100);
1763 1691
1764 upper_lim_r = upper_lim_g = upper_lim_b = 65535; 1692 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1693 }
1765 } else { 1694 else
1695 {
1766 1696
1767 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1697 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1768 1698
1769 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100); 1699 upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1770 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100); 1700 upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1771 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100); 1701 upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1772 } 1702 }
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 1703
1788 /* fill our lookup tables */ 1704 /* fill our lookup tables */
1789 for (i = 0; i <= mask_r>>sh_r; i++) 1705 for (i = 0; i <= mask_r>>sh_r; i++)
1790 { 1706 {
1791 RUINT32T tmp; 1707 uint32_t tmp;
1792 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1708 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r));
1793 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1709 tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r);
1794 lookup_r[i] = (tmp/65535)<<sh_r; 1710 lookup_r[i] = (tmp/65535)<<sh_r;
1795 } 1711 }
1796 for (i = 0; i <= mask_g>>sh_g; i++) 1712 for (i = 0; i <= mask_g>>sh_g; i++)
1797 { 1713 {
1798 RUINT32T tmp; 1714 uint32_t tmp;
1799 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1715 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g));
1800 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1716 tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g);
1801 lookup_g[i] = (tmp/65535)<<sh_g; 1717 lookup_g[i] = (tmp/65535)<<sh_g;
1802 } 1718 }
1803 for (i = 0; i <= mask_b>>sh_b; i++) 1719 for (i = 0; i <= mask_b>>sh_b; i++)
1804 { 1720 {
1805 RUINT32T tmp; 1721 uint32_t tmp;
1806 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1722 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b));
1807 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1723 tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b);
1808 lookup_b[i] = (tmp/65535)<<sh_b; 1724 lookup_b[i] = (tmp/65535)<<sh_b;
1809 } 1725 }
1810 1726
1811 /* apply table to input image (replacing colors by newly calculated ones) */ 1727 /* apply table to input image (replacing colors by newly calculated ones) */
1812 switch (srcImage->bits_per_pixel) 1728 if (srcImage->bits_per_pixel == 32
1729 && (srcImage->depth == 24 || srcImage->depth == 32)
1730 && srcImage->byte_order == host_byte_order)
1813 { 1731 {
1814 case 15:
1815 {
1816 unsigned short *p1, *pf, *p, *pl; 1732 uint32_t *p1, *pf, *p, *pl;
1817 p1 = (unsigned short *) srcImage->data; 1733 p1 = (uint32_t *) srcImage->data;
1818 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1734 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1735
1819 while (p1 < pf) 1736 while (p1 < pf)
1820 { 1737 {
1821 p = p1; 1738 p = p1;
1822 pl = p1 + srcImage->width; 1739 pl = p1 + srcImage->width;
1823 for (; p < pl; p++) 1740 for (; p < pl; p++)
1824 { 1741 {
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] | 1742 *p = lookup_r[(*p & 0xff0000) >> 16] |
1884 lookup_g[(*p & 0x00ff00)>> 8] | 1743 lookup_g[(*p & 0x00ff00) >> 8] |
1885 lookup_b[(*p & 0x0000ff)] | 1744 lookup_b[(*p & 0x0000ff)] |
1886 (*p & ~0xffffff); 1745 (*p & 0xff000000);
1746 }
1747 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line);
1748 }
1749 }
1750 else
1751 {
1752 for (int y = 0; y < srcImage->height; y++)
1753 for (int x = 0; x < srcImage->width; x++)
1754 {
1755 unsigned long pixel = XGetPixel (srcImage, x, y);
1756 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1757 lookup_g[(pixel & mask_g) >> sh_g] |
1758 lookup_b[(pixel & mask_b) >> sh_b];
1759 XPutPixel (srcImage, x, y, pixel);
1887 } 1760 }
1888 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1889 } 1761 }
1890 break;
1891 }
1892 }
1893 1762
1894 free (lookup); 1763 free (lookup);
1895} 1764}
1896#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1765#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */

Diff Legend

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