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.64 by sf-exg, Mon Oct 4 14:31:00 2010 UTC vs.
Revision 1.91 by sf-exg, Mon Oct 18 16:10:35 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
… …
104#ifdef BG_IMAGE_FROM_FILE 106#ifdef BG_IMAGE_FROM_FILE
105 have_image = false; 107 have_image = false;
106 h_scale = v_scale = 0; 108 h_scale = v_scale = 0;
107 h_align = v_align = 0; 109 h_align = v_align = 0;
108#endif 110#endif
111#ifdef ENABLE_TRANSPARENCY
112 shade = 100;
113#endif
109 flags = 0; 114 flags = 0;
110 pixmap = None; 115 pixmap = None;
111 valid_since = invalid_since = 0; 116 valid_since = invalid_since = 0;
112 target = 0; 117 target = 0;
113} 118}
… …
170bool bgPixmap_t::need_client_side_rendering () 175bool bgPixmap_t::need_client_side_rendering ()
171{ 176{
172# ifdef HAVE_AFTERIMAGE 177# ifdef HAVE_AFTERIMAGE
173 if (original_asim) 178 if (original_asim)
174 return true; 179 return true;
175# endif
176# ifdef ENABLE_TRANSPARENCY
177 if (flags & isTransparent)
178 {
179# ifdef HAVE_AFTERIMAGE // can't blur without libAI anyways
180 if ((flags & blurNeeded) && !(flags & blurServerSide))
181 return true;
182# endif
183 if ((flags & tintNeeded) && !(flags & tintServerSide))
184 return true;
185 }
186# endif 180# endif
187 return false; 181 return false;
188} 182}
189 183
190# ifdef BG_IMAGE_FROM_FILE 184# ifdef BG_IMAGE_FROM_FILE
… …
226make_align_position (int align, int window_size, int image_size) 220make_align_position (int align, int window_size, int image_size)
227{ 221{
228 int diff = window_size - image_size; 222 int diff = window_size - image_size;
229 int smaller = min (image_size, window_size); 223 int smaller = min (image_size, window_size);
230 224
231 if (align >= 0 && align <= 50) 225 if (align >= 0 && align <= 100)
232 return diff * align / 100; 226 return diff * align / 100;
233 else if (align > 50 && align <= 100)
234 return window_size - image_size - diff * (100 - align) / 100;
235 else if (align > 100 && align <= 200 ) 227 else if (align > 100 && align <= 200)
236 return ((align - 100) * smaller / 100) + window_size - smaller; 228 return ((align - 100) * smaller / 100) + window_size - smaller;
237 else if (align > -100 && align < 0) 229 else if (align >= -100 && align < 0)
238 return ((align + 100) * smaller / 100) - image_size; 230 return ((align + 100) * smaller / 100) - image_size;
239 return 0; 231 return 0;
240} 232}
241 233
242static inline int 234static inline int
243make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 235make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
244{ 236{
245 int src_pos = 0; 237 int src_pos = 0;
246 dst_pos = 0; 238 dst_pos = pos;
247 dst_size = size; 239 dst_size = size;
248 if (pos < 0) 240 if (pos < 0)
249 { 241 {
250 src_pos = -pos; 242 src_pos = -pos;
243 dst_pos = 0;
251 dst_size += pos; 244 dst_size += pos;
252 } 245 }
253 else if (pos > 0)
254 dst_pos = pos;
255 246
256 if (dst_pos + dst_size > target_size) 247 if (dst_pos + dst_size > target_size)
257 dst_size = target_size - dst_pos; 248 dst_size = target_size - dst_pos;
258 return src_pos; 249 return src_pos;
259} 250}
… …
461 { 452 {
462 w = h_scale * target_width / 100; 453 w = h_scale * target_width / 100;
463 h = v_scale * target_height / 100; 454 h = v_scale * target_height / 100;
464 } 455 }
465 456
457 if (!w) w = image_width;
458 if (!h) h = image_height;
459
466 if (flags & rootAlign) 460 if (flags & rootAlign)
467 { 461 {
468 target->get_window_origin (x, y); 462 target->get_window_origin (x, y);
469 x = -x; 463 x = -x;
470 y = -y; 464 y = -y;
471 } 465 }
472 else 466 else
473 { 467 {
474 x = make_align_position (h_align, target_width, w > 0 ? w : image_width); 468 x = make_align_position (h_align, target_width, w);
475 y = make_align_position (v_align, target_height, h > 0 ? h : image_height); 469 y = make_align_position (v_align, target_height, h);
476 } 470 }
477 471
478 flags &= ~sizeSensitive; 472 flags &= ~sizeSensitive;
479 if (h_scale != 0 || v_scale != 0 473 if ((flags & propScale) || h_scale || v_scale
480 || h_align != 0 || v_align != 0 474 || (!(flags & rootAlign) && (h_align || v_align))
481 || image_width > target_width || image_height > target_height) 475 || w > target_width || h > target_height)
482 flags |= sizeSensitive; 476 flags |= sizeSensitive;
483} 477}
484 478
485# ifdef HAVE_AFTERIMAGE 479# ifdef HAVE_AFTERIMAGE
486bool 480bool
… …
499 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); 493 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
500 494
501 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 495 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
502 { 496 {
503 ShadingInfo as_shade; 497 ShadingInfo as_shade;
504 as_shade.shading = (shade == 0) ? 100 : shade; 498 as_shade.shading = shade;
505 499
506 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 500 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
507 if (flags & tintSet) 501 if (flags & tintSet)
508 tint.get (c); 502 tint.get (c);
509 as_shade.tintColor.red = c.r; 503 as_shade.tintColor.red = c.r;
… …
511 as_shade.tintColor.blue = c.b; 505 as_shade.tintColor.blue = c.b;
512 506
513 background_tint = shading2tint32 (&as_shade); 507 background_tint = shading2tint32 (&as_shade);
514 } 508 }
515 509
516 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL) 510 if (!(background_flags & transpPmapBlurred) && (flags & blurNeeded) && background != NULL)
517 { 511 {
518 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 512 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
519 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 513 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
520 100, ASIMAGE_QUALITY_DEFAULT); 514 100, ASIMAGE_QUALITY_DEFAULT);
521 if (tmp) 515 if (tmp)
… …
542 536
543 if (original_asim) 537 if (original_asim)
544 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y); 538 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
545 539
546 if (!original_asim 540 if (!original_asim
541 || (!(flags & rootAlign)
547 || x >= target_width 542 && (x >= target_width
548 || y >= target_height 543 || y >= target_height
549 || (w > 0 && x + w <= 0) 544 || (x + w <= 0)
550 || (h > 0 && y + h <= 0)) 545 || (y + h <= 0))))
551 { 546 {
552 if (background) 547 if (background)
553 { 548 {
554 new_pmap_width = background->width; 549 new_pmap_width = background->width;
555 new_pmap_height = background->height; 550 new_pmap_height = background->height;
… …
569 } 564 }
570 else 565 else
571 { 566 {
572 result = original_asim; 567 result = original_asim;
573 568
574 if ((w > 0 && w != original_asim->width) 569 if ((w != original_asim->width)
575 || (h > 0 && h != original_asim->height)) 570 || (h != original_asim->height))
576 { 571 {
577 result = scale_asimage (target->asv, original_asim, 572 result = scale_asimage (target->asv, original_asim,
578 w > 0 ? w : original_asim->width, 573 w, h,
579 h > 0 ? h : original_asim->height,
580 background ? ASA_ASImage : ASA_XImage, 574 background ? ASA_ASImage : ASA_XImage,
581 100, ASIMAGE_QUALITY_DEFAULT); 575 100, ASIMAGE_QUALITY_DEFAULT);
582 } 576 }
583 577
584 if (background == NULL) 578 if (background == NULL)
… …
616 layers[0].clip_width = target_width; 610 layers[0].clip_width = target_width;
617 layers[0].clip_height = target_height; 611 layers[0].clip_height = target_height;
618 layers[0].tint = background_tint; 612 layers[0].tint = background_tint;
619 layers[1].im = result; 613 layers[1].im = result;
620 614
621 if (w <= 0) 615 if (h_scale == 0 || v_scale == 0)
622 { 616 {
623 /* tile horizontally */ 617 /* tile horizontally */
624 while (x > 0) x -= (int)result->width; 618 while (x > 0) x -= (int)result->width;
625 layers[1].dst_x = x; 619 layers[1].dst_x = x;
626 layers[1].clip_width = result->width+target_width; 620 layers[1].clip_width = result->width+target_width;
… …
630 /* clip horizontally */ 624 /* clip horizontally */
631 layers[1].dst_x = x; 625 layers[1].dst_x = x;
632 layers[1].clip_width = result->width; 626 layers[1].clip_width = result->width;
633 } 627 }
634 628
635 if (h <= 0) 629 if (h_scale == 0 || v_scale == 0)
636 { 630 {
637 while (y > 0) y -= (int)result->height; 631 while (y > 0) y -= (int)result->height;
638 layers[1].dst_y = y; 632 layers[1].dst_y = y;
639 layers[1].clip_height = result->height + target_height; 633 layers[1].clip_height = result->height + target_height;
640 } 634 }
… …
741 return false; 735 return false;
742 736
743 if (!pixbuf) 737 if (!pixbuf)
744 return false; 738 return false;
745 739
746 // TODO: add alpha blending 740#if !XFT
747 if (background_flags) 741 if (background_flags)
748 return false; 742 return false;
743#endif
749 744
750 GdkPixbuf *result; 745 GdkPixbuf *result;
751 746
752 int image_width = gdk_pixbuf_get_width (pixbuf); 747 int image_width = gdk_pixbuf_get_width (pixbuf);
753 int image_height = gdk_pixbuf_get_height (pixbuf); 748 int image_height = gdk_pixbuf_get_height (pixbuf);
… …
762 int w = 0; 757 int w = 0;
763 int h = 0; 758 int h = 0;
764 759
765 get_image_geometry (image_width, image_height, w, h, x, y); 760 get_image_geometry (image_width, image_height, w, h, x, y);
766 761
762 if (!(flags & rootAlign)
767 if (x >= target_width 763 && (x >= target_width
768 || y >= target_height 764 || y >= target_height
769 || (w > 0 && x + w <= 0) 765 || (x + w <= 0)
770 || (h > 0 && y + h <= 0)) 766 || (y + h <= 0)))
771 return false; 767 return false;
772 768
773 result = pixbuf; 769 result = pixbuf;
774 770
775 if ((w > 0 && w != image_width) 771 if ((w != image_width)
776 || (h > 0 && h != image_height)) 772 || (h != image_height))
777 { 773 {
778 result = gdk_pixbuf_scale_simple (pixbuf, 774 result = gdk_pixbuf_scale_simple (pixbuf,
779 w > 0 ? w : image_width, 775 w, h,
780 h > 0 ? h : image_height,
781 GDK_INTERP_BILINEAR); 776 GDK_INTERP_BILINEAR);
782 } 777 }
783 778
784 bool ret = false; 779 bool ret = false;
785 780
786 if (result) 781 if (result)
787 { 782 {
788 XGCValues gcv; 783 XGCValues gcv;
789 GC gc; 784 GC gc;
785 Pixmap root_pmap;
790 786
791 image_width = gdk_pixbuf_get_width (result); 787 image_width = gdk_pixbuf_get_width (result);
792 image_height = gdk_pixbuf_get_height (result); 788 image_height = gdk_pixbuf_get_height (result);
793 789
790 if (background_flags)
791 {
792 root_pmap = pixmap;
793 pixmap = None;
794 }
795 else
796 {
794 if (h_scale == 0 || v_scale == 0) 797 if (h_scale == 0 || v_scale == 0)
795 { 798 {
796 new_pmap_width = min (image_width, target_width); 799 new_pmap_width = min (image_width, target_width);
797 new_pmap_height = min (image_height, target_height); 800 new_pmap_height = min (image_height, target_height);
801 }
798 } 802 }
799 803
800 if (pixmap) 804 if (pixmap)
801 { 805 {
802 if (pmap_width != new_pmap_width 806 if (pmap_width != new_pmap_width
… …
858 dst_width, dst_height, 862 dst_width, dst_height,
859 XLIB_RGB_DITHER_NONE, 863 XLIB_RGB_DITHER_NONE,
860 0, 0); 864 0, 0);
861 } 865 }
862 866
867#if XFT
868 if (background_flags)
869 {
870 Display *dpy = target->dpy;
871 XRenderPictureAttributes pa;
872
873 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen));
874 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
875
876 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
877 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
878
879 pa.repeat = True;
880 Pixmap mask_pmap = XCreatePixmap (dpy, target->vt, 1, 1, 8);
881 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
882 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
883 XFreePixmap (dpy, mask_pmap);
884
885 if (src && dst && mask)
886 {
887 XRenderColor mask_c;
888
889 mask_c.alpha = 0x8000;
890 mask_c.red = 0;
891 mask_c.green = 0;
892 mask_c.blue = 0;
893 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
894 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
895 }
896
897 XRenderFreePicture (dpy, src);
898 XRenderFreePicture (dpy, dst);
899 XRenderFreePicture (dpy, mask);
900
901 XFreePixmap (dpy, root_pmap);
902 }
903#endif
904
863 if (result != pixbuf) 905 if (result != pixbuf)
864 g_object_unref (result); 906 g_object_unref (result);
865 907
866 XFreeGC (target->dpy, gc); 908 XFreeGC (target->dpy, gc);
867 909
… …
889 } 931 }
890 932
891# ifdef HAVE_AFTERIMAGE 933# ifdef HAVE_AFTERIMAGE
892 if (!target->asimman) 934 if (!target->asimman)
893 target->asimman = create_generic_imageman (target->rs[Rs_path]); 935 target->asimman = create_generic_imageman (target->rs[Rs_path]);
894 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 936 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
937 if (image)
938 {
895 if (original_asim) 939 if (original_asim)
940 safe_asimage_destroy (original_asim);
941 original_asim = image;
896 have_image = true; 942 have_image = true;
897 return have_image; 943 return true;
944 }
898# endif 945# endif
899 946
900# ifdef HAVE_PIXBUF 947# ifdef HAVE_PIXBUF
901 pixbuf = gdk_pixbuf_new_from_file (file, NULL); 948 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
949 if (image)
950 {
902 if (pixbuf) 951 if (pixbuf)
952 g_object_unref (pixbuf);
953 pixbuf = image;
903 have_image = true; 954 have_image = true;
904 return have_image; 955 return true;
956 }
905# endif 957# endif
906 } 958 }
907 959
908 return false; 960 return false;
909} 961}
… …
934 if (!(geom_flags & WidthValue)) 986 if (!(geom_flags & WidthValue))
935 hr = 1; 987 hr = 1;
936 if (!(geom_flags & HeightValue)) 988 if (!(geom_flags & HeightValue))
937 vr = hr; 989 vr = hr;
938 990
991 min_it (hr, 128);
992 min_it (vr, 128);
993
939 if (h_blurRadius != hr) 994 if (h_blurRadius != hr)
940 { 995 {
941 ++changed; 996 ++changed;
942 h_blurRadius = hr; 997 h_blurRadius = hr;
943 } 998 }
… …
951 if (v_blurRadius == 0 && h_blurRadius == 0) 1006 if (v_blurRadius == 0 && h_blurRadius == 0)
952 flags &= ~blurNeeded; 1007 flags &= ~blurNeeded;
953 else 1008 else
954 flags |= blurNeeded; 1009 flags |= blurNeeded;
955 1010
1011#if XFT
1012 XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root);
1013 if (filters)
1014 {
1015 for (int i = 0; i < filters->nfilter; i++)
1016 if (!strcmp (filters->filter[i], FilterConvolution))
1017 flags |= bgPixmap_t::blurServerSide;
1018
1019 XFree (filters);
1020 }
1021#endif
1022
956 return (changed > 0); 1023 return (changed > 0);
957} 1024}
958 1025
959static inline unsigned long 1026static inline unsigned long
960compute_tint_shade_flags (rxvt_color *tint, int shade) 1027compute_tint_shade_flags (rxvt_color *tint, int shade)
961{ 1028{
962 unsigned long flags = 0; 1029 unsigned long flags = 0;
963 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1030 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
964 bool has_shade = (shade > 0 && shade < 100) || (shade > 100 && shade < 200); 1031 bool has_shade = shade != 100;
965 1032
966 if (tint) 1033 if (tint)
967 { 1034 {
968 tint->get (c); 1035 tint->get (c);
969# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 1036# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
… …
1001} 1068}
1002 1069
1003bool 1070bool
1004bgPixmap_t::set_tint (rxvt_color &new_tint) 1071bgPixmap_t::set_tint (rxvt_color &new_tint)
1005{ 1072{
1006 if (tint != new_tint) 1073 if (!(flags & tintSet) || tint != new_tint)
1007 { 1074 {
1008 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1075 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
1009 tint = new_tint; 1076 tint = new_tint;
1010 flags = (flags & ~tintFlags) | new_flags | tintSet; 1077 flags = (flags & ~tintFlags) | new_flags | tintSet;
1011 return true; 1078 return true;
… …
1029} 1096}
1030 1097
1031bool 1098bool
1032bgPixmap_t::set_shade (const char *shade_str) 1099bgPixmap_t::set_shade (const char *shade_str)
1033{ 1100{
1034 int new_shade = (shade_str) ? atoi (shade_str) : 0; 1101 int new_shade = (shade_str) ? atoi (shade_str) : 100;
1035 1102
1036 if (new_shade < 0 && new_shade > -100) 1103 clamp_it (new_shade, -100, 200);
1104 if (new_shade < 0)
1037 new_shade = 200 - (100 + new_shade); 1105 new_shade = 200 - (100 + new_shade);
1038 else if (new_shade == 100)
1039 new_shade = 0;
1040 1106
1041 if (new_shade != shade) 1107 if (new_shade != shade)
1042 { 1108 {
1043 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 1109 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
1044 shade = new_shade; 1110 shade = new_shade;
… …
1047 } 1113 }
1048 1114
1049 return false; 1115 return false;
1050} 1116}
1051 1117
1118#if XFT
1119static void
1120get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1121{
1122 double sigma = radius / 2.0;
1123 double scale = sqrt (2.0 * M_PI) * sigma;
1124 double sum = 0.0;
1125
1126 for (int i = 0; i < width; i++)
1127 {
1128 double x = i - width / 2;
1129 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1130 sum += kernel[i];
1131 }
1132
1133 params[0] = XDoubleToFixed (width);
1134 params[1] = XDoubleToFixed (1);
1135
1136 for (int i = 0; i < width; i++)
1137 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1138}
1139#endif
1140
1052bool 1141bool
1053bgPixmap_t::tint_pixmap (Pixmap pixmap) 1142bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1054{ 1143{
1055 Window root = target->display->root; 1144 bool ret = false;
1145#if XFT
1146 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1147 double *kernel = (double *)malloc (size * sizeof (double));
1148 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1149
1056 Display *dpy = target->dpy; 1150 Display *dpy = target->dpy;
1057 int window_width = target->szHint.width; 1151 XRenderPictureAttributes pa;
1058 int window_height = target->szHint.height; 1152 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1153
1154 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1155 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1156
1157 if (kernel && params && src && dst)
1158 {
1159 if (h_blurRadius)
1160 {
1161 size = h_blurRadius * 2 + 1;
1162 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1163
1164 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1165 XRenderComposite (dpy,
1166 PictOpSrc,
1167 src,
1168 None,
1169 dst,
1170 0, 0,
1171 0, 0,
1172 0, 0,
1173 width, height);
1174 }
1175
1176 if (v_blurRadius)
1177 {
1178 size = v_blurRadius * 2 + 1;
1179 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1180 swap (params[0], params[1]);
1181
1182 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1183 XRenderComposite (dpy,
1184 PictOpSrc,
1185 src,
1186 None,
1187 dst,
1188 0, 0,
1189 0, 0,
1190 0, 0,
1191 width, height);
1192 }
1193
1194 ret = true;
1195 }
1196
1197 free (kernel);
1198 free (params);
1199 XRenderFreePicture (dpy, src);
1200 XRenderFreePicture (dpy, dst);
1201#endif
1202 return ret;
1203}
1204
1205bool
1206bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1207{
1208 Display *dpy = target->dpy;
1059 bool ret = false; 1209 bool ret = false;
1060 1210
1061 if (flags & tintWholesome) 1211 if (flags & tintWholesome)
1062 { 1212 {
1063 XGCValues gcv; 1213 XGCValues gcv;
… …
1067 * performance improvements, as we eliminate XImage transfer 1217 * performance improvements, as we eliminate XImage transfer
1068 */ 1218 */
1069 gcv.foreground = Pixel (tint); 1219 gcv.foreground = Pixel (tint);
1070 gcv.function = GXand; 1220 gcv.function = GXand;
1071 gcv.fill_style = FillSolid; 1221 gcv.fill_style = FillSolid;
1072 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv); 1222 gc = XCreateGC (dpy, pixmap, GCFillStyle | GCForeground | GCFunction, &gcv);
1073 if (gc) 1223 if (gc)
1074 { 1224 {
1075 XFillRectangle (dpy, pixmap, gc, 0, 0, window_width, window_height); 1225 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1076 ret = true; 1226 ret = true;
1077 XFreeGC (dpy, gc); 1227 XFreeGC (dpy, gc);
1078 } 1228 }
1079 } 1229 }
1080 else 1230 else
… …
1083 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1233 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1084 1234
1085 if (flags & tintSet) 1235 if (flags & tintSet)
1086 tint.get (c); 1236 tint.get (c);
1087 1237
1088 if (shade > 0 && shade < 100) 1238 if (shade <= 100)
1089 { 1239 {
1090 c.r = (c.r * shade) / 100; 1240 c.r = (c.r * shade) / 100;
1091 c.g = (c.g * shade) / 100; 1241 c.g = (c.g * shade) / 100;
1092 c.b = (c.b * shade) / 100; 1242 c.b = (c.b * shade) / 100;
1093 } 1243 }
1094 else if (shade > 100 && shade < 200) 1244 else
1095 {
1096 c.r = (c.r * (200 - shade)) / 100;
1097 c.g = (c.g * (200 - shade)) / 100;
1098 c.b = (c.b * (200 - shade)) / 100;
1099 } 1245 {
1246 c.r = ((0xffff - c.r) * (200 - shade)) / 100;
1247 c.g = ((0xffff - c.g) * (200 - shade)) / 100;
1248 c.b = ((0xffff - c.b) * (200 - shade)) / 100;
1249 }
1100 1250
1101 XRenderPictFormat pf; 1251 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1102 pf.type = PictTypeDirect;
1103 pf.depth = 32;
1104 pf.direct.redMask = 0xff;
1105 pf.direct.greenMask = 0xff;
1106 pf.direct.blueMask = 0xff;
1107 pf.direct.alphaMask = 0xff;
1108
1109 XRenderPictFormat *solid_format = XRenderFindFormat (dpy, 1252 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1110 (PictFormatType|
1111 PictFormatDepth|
1112 PictFormatRedMask|
1113 PictFormatGreenMask|
1114 PictFormatBlueMask|
1115 PictFormatAlphaMask),
1116 &pf,
1117 0);
1118 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
1119 XRenderPictureAttributes pa; 1253 XRenderPictureAttributes pa;
1120 1254
1121 Picture back_pic = XRenderCreatePicture (dpy, pixmap, root_format, 0, &pa); 1255 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1122 1256
1123 pa.repeat = True; 1257 pa.repeat = True;
1124 1258
1125 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32); 1259 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1126 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa); 1260 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1127 XFreePixmap (dpy, overlay_pmap); 1261 XFreePixmap (dpy, overlay_pmap);
1128 1262
1129 pa.component_alpha = True; 1263 pa.component_alpha = True;
1130 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32); 1264 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1131 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa); 1265 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1132 XFreePixmap (dpy, mask_pmap); 1266 XFreePixmap (dpy, mask_pmap);
1133 1267
1134 if (mask_pic && overlay_pic && back_pic) 1268 if (mask_pic && overlay_pic && back_pic)
1135 { 1269 {
… …
1142 mask_c.alpha = 0; 1276 mask_c.alpha = 0;
1143 mask_c.red = 0xffff - c.r; 1277 mask_c.red = 0xffff - c.r;
1144 mask_c.green = 0xffff - c.g; 1278 mask_c.green = 0xffff - c.g;
1145 mask_c.blue = 0xffff - c.b; 1279 mask_c.blue = 0xffff - c.b;
1146 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1280 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1147 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height); 1281 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1148 ret = true; 1282 ret = true;
1149 } 1283 }
1150 1284
1151 XRenderFreePicture (dpy, mask_pic); 1285 XRenderFreePicture (dpy, mask_pic);
1152 XRenderFreePicture (dpy, overlay_pic); 1286 XRenderFreePicture (dpy, overlay_pic);
… …
1184 unsigned int root_pmap_width, root_pmap_height; 1318 unsigned int root_pmap_width, root_pmap_height;
1185 int window_width = target->szHint.width; 1319 int window_width = target->szHint.width;
1186 int window_height = target->szHint.height; 1320 int window_height = target->szHint.height;
1187 int sx, sy; 1321 int sx, sy;
1188 XGCValues gcv; 1322 XGCValues gcv;
1323 GC gc;
1189 1324
1190 TIMING_TEST_START (tp); 1325 TIMING_TEST_START (tp);
1191 target->get_window_origin (sx, sy); 1326 target->get_window_origin (sx, sy);
1192 1327
1193 /* check if we are outside of the visible part of the virtual screen : */ 1328 /* check if we are outside of the visible part of the virtual screen : */
… …
1195 || sx >= root_width || sy >= root_height) 1330 || sx >= root_width || sy >= root_height)
1196 return 0; 1331 return 0;
1197 1332
1198 if (root_pixmap != None) 1333 if (root_pixmap != None)
1199 { 1334 {
1200 /* we want to validate the pixmap and get it's size at the same time : */ 1335 /* we want to validate the pixmap and get its size at the same time : */
1201 int junk; 1336 int junk;
1202 unsigned int ujunk; 1337 unsigned int ujunk;
1203 /* root pixmap may be bad - allow a error */ 1338 /* root pixmap may be bad - allow a error */
1204 target->allowedxerror = -1; 1339 target->allowedxerror = -1;
1205 1340
… …
1207 root_pixmap = None; 1342 root_pixmap = None;
1208 1343
1209 target->allowedxerror = 0; 1344 target->allowedxerror = 0;
1210 } 1345 }
1211 1346
1347 if (root_pixmap == None)
1348 return 0;
1349
1212 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1350 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth);
1213 GC gc = NULL;
1214 1351
1215 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1352 if (tiled_root_pmap == None) /* something really bad happened - abort */
1216 return 0; 1353 return 0;
1217 1354
1218 if (root_pixmap == None)
1219 {
1220 /* use tricks to obtain the root background image :*/
1221 /* we want to create Overrideredirect window overlapping out window
1222 with background type of Parent Relative and then grab it */
1223 XSetWindowAttributes attr;
1224 Window src;
1225 bool success = false;
1226
1227 attr.background_pixmap = ParentRelative;
1228 attr.backing_store = Always;
1229 attr.event_mask = ExposureMask;
1230 attr.override_redirect = True;
1231 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
1232 CopyFromParent, CopyFromParent, CopyFromParent,
1233 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
1234 &attr);
1235
1236 if (src != None)
1237 {
1238 XEvent event;
1239 int ev_count = 0;
1240 XGrabServer (dpy);
1241 XMapRaised (dpy, src);
1242 XSync (dpy, False);
1243
1244 /* XSync should get window where it's properly exposed,
1245 * but to be on the safe side - let's check for the actual event to arrive : */
1246 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
1247 ++ev_count;
1248
1249 if (ev_count > 0);
1250 {
1251 /* hooray! - we can grab the image! */
1252 gc = XCreateGC (dpy, root, 0, NULL);
1253 if (gc)
1254 {
1255 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
1256 success = true;
1257 }
1258 }
1259
1260 XDestroyWindow (dpy, src);
1261 XUngrabServer (dpy);
1262 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
1263 }
1264
1265 if (!success)
1266 {
1267 XFreePixmap (dpy, tiled_root_pmap);
1268 tiled_root_pmap = None;
1269 }
1270 else
1271 result |= transpPmapTiled;
1272 }
1273 else
1274 {
1275 /* straightforward pixmap copy */ 1355 /* straightforward pixmap copy */
1276 gcv.tile = root_pixmap; 1356 gcv.tile = root_pixmap;
1277 gcv.fill_style = FillTiled; 1357 gcv.fill_style = FillTiled;
1278 1358
1279 while (sx < 0) sx += (int)root_width; 1359 while (sx < 0) sx += (int)root_width;
1280 while (sy < 0) sy += (int)root_height; 1360 while (sy < 0) sy += (int)root_height;
1281 1361
1282 gcv.ts_x_origin = -sx; 1362 gcv.ts_x_origin = -sx;
1283 gcv.ts_y_origin = -sy; 1363 gcv.ts_y_origin = -sy;
1284 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1364 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1285 1365
1286 if (gc) 1366 if (gc)
1287 { 1367 {
1288 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1368 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1289 result |= transpPmapTiled; 1369 result |= transpPmapTiled;
1290 } 1370 XFreeGC (dpy, gc);
1291 } 1371 }
1292 TIMING_TEST_PRINT_RESULT (tp); 1372 TIMING_TEST_PRINT_RESULT (tp);
1293 1373
1294 if (tiled_root_pmap != None) 1374 if (tiled_root_pmap != None)
1295 { 1375 {
1296 if (!need_client_side_rendering ()) 1376 if (!need_client_side_rendering ())
1297 { 1377 {
1298 if ((flags & tintNeeded)) 1378 if (flags & (blurNeeded | blurServerSide))
1379 {
1380 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height))
1381 result |= transpPmapBlurred;
1299 { 1382 }
1300 if (tint_pixmap (tiled_root_pmap)) 1383 if (flags & (tintNeeded | tintServerSide))
1384 {
1385 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height))
1301 result |= transpPmapTinted; 1386 result |= transpPmapTinted;
1302 } 1387 }
1303 } /* server side rendering completed */ 1388 } /* server side rendering completed */
1304 1389
1305 if (pixmap) 1390 if (pixmap)
… …
1309 pmap_width = window_width; 1394 pmap_width = window_width;
1310 pmap_height = window_height; 1395 pmap_height = window_height;
1311 pmap_depth = root_depth; 1396 pmap_depth = root_depth;
1312 } 1397 }
1313 1398
1314 if (gc)
1315 XFreeGC (dpy, gc);
1316
1317 TIMING_TEST_PRINT_RESULT (tp); 1399 TIMING_TEST_PRINT_RESULT (tp);
1318 1400
1319 return result; 1401 return result;
1320} 1402}
1321 1403
… …
1335 return false; 1417 return false;
1336} 1418}
1337# endif /* ENABLE_TRANSPARENCY */ 1419# endif /* ENABLE_TRANSPARENCY */
1338 1420
1339# ifndef HAVE_AFTERIMAGE 1421# ifndef HAVE_AFTERIMAGE
1340static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm); 1422static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm);
1341# endif 1423# endif
1342 1424
1343bool 1425bool
1344bgPixmap_t::render () 1426bgPixmap_t::render ()
1345{ 1427{
… …
1389 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1471 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1390 { 1472 {
1391 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1473 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1392 if (flags & tintSet) 1474 if (flags & tintSet)
1393 tint.get (c); 1475 tint.get (c);
1394 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1476 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b);
1395 } 1477 }
1396# endif 1478# endif
1397 1479
1398 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1480 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1399 1481
… …
1534/* taken from aterm-0.4.2 */ 1616/* taken from aterm-0.4.2 */
1535 1617
1536typedef uint32_t RUINT32T; 1618typedef uint32_t RUINT32T;
1537 1619
1538static void 1620static void
1539ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm) 1621ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm)
1540{ 1622{
1541 int sh_r, sh_g, sh_b; 1623 int sh_r, sh_g, sh_b;
1542 RUINT32T mask_r, mask_g, mask_b; 1624 RUINT32T mask_r, mask_g, mask_b;
1543 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1625 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1544 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1626 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1545 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1627 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1546 int i; 1628 int i;
1547 1629
1548 Visual *visual = term->visual;
1549
1550 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1630 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1551
1552 if (shade == 0)
1553 shade = 100;
1554 1631
1555 /* for convenience */ 1632 /* for convenience */
1556 mask_r = visual->red_mask; 1633 mask_r = visual->red_mask;
1557 mask_g = visual->green_mask; 1634 mask_g = visual->green_mask;
1558 mask_b = visual->blue_mask; 1635 mask_b = visual->blue_mask;
1559 1636
1560 /* boring lookup table pre-initialization */ 1637 /* boring lookup table pre-initialization */
1561 switch (srcImage->bits_per_pixel) { 1638 switch (srcImage->bits_per_pixel)
1639 {
1562 case 15: 1640 case 15:
1563 if ((mask_r != 0x7c00) || 1641 if ((mask_r != 0x7c00) ||
1564 (mask_g != 0x03e0) || 1642 (mask_g != 0x03e0) ||
1565 (mask_b != 0x001f)) 1643 (mask_b != 0x001f))
1566 return; 1644 return;
1567 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1645 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
1568 lookup_r = lookup; 1646 lookup_r = lookup;
1569 lookup_g = lookup+32; 1647 lookup_g = lookup+32;
1570 lookup_b = lookup+32+32; 1648 lookup_b = lookup+32+32;
1571 sh_r = 10; 1649 sh_r = 10;
1572 sh_g = 5; 1650 sh_g = 5;
1573 sh_b = 0; 1651 sh_b = 0;
1574 break; 1652 break;
1575 case 16: 1653 case 16:
1576 if ((mask_r != 0xf800) || 1654 if ((mask_r != 0xf800) ||
1577 (mask_g != 0x07e0) || 1655 (mask_g != 0x07e0) ||
1578 (mask_b != 0x001f)) 1656 (mask_b != 0x001f))
1579 return; 1657 return;
1580 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1658 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
1581 lookup_r = lookup; 1659 lookup_r = lookup;
1582 lookup_g = lookup+32; 1660 lookup_g = lookup+32;
1583 lookup_b = lookup+32+64; 1661 lookup_b = lookup+32+64;
1584 sh_r = 11; 1662 sh_r = 11;
1585 sh_g = 5; 1663 sh_g = 5;
1586 sh_b = 0; 1664 sh_b = 0;
1587 break; 1665 break;
1588 case 24: 1666 case 24:
1589 if ((mask_r != 0xff0000) || 1667 if ((mask_r != 0xff0000) ||
1590 (mask_g != 0x00ff00) || 1668 (mask_g != 0x00ff00) ||
1591 (mask_b != 0x0000ff)) 1669 (mask_b != 0x0000ff))
1592 return; 1670 return;
1593 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1671 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
1594 lookup_r = lookup; 1672 lookup_r = lookup;
1595 lookup_g = lookup+256; 1673 lookup_g = lookup+256;
1596 lookup_b = lookup+256+256; 1674 lookup_b = lookup+256+256;
1597 sh_r = 16; 1675 sh_r = 16;
1598 sh_g = 8; 1676 sh_g = 8;
1599 sh_b = 0; 1677 sh_b = 0;
1600 break; 1678 break;
1601 case 32: 1679 case 32:
1602 if ((mask_r != 0xff0000) || 1680 if ((mask_r != 0xff0000) ||
1603 (mask_g != 0x00ff00) || 1681 (mask_g != 0x00ff00) ||
1604 (mask_b != 0x0000ff)) 1682 (mask_b != 0x0000ff))
1605 return; 1683 return;
1606 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1684 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
1607 lookup_r = lookup; 1685 lookup_r = lookup;
1608 lookup_g = lookup+256; 1686 lookup_g = lookup+256;
1609 lookup_b = lookup+256+256; 1687 lookup_b = lookup+256+256;
1610 sh_r = 16; 1688 sh_r = 16;
1611 sh_g = 8; 1689 sh_g = 8;
1612 sh_b = 0; 1690 sh_b = 0;
1613 break; 1691 break;
1614 default: 1692 default:
1615 return; /* we do not support this color depth */ 1693 return; /* we do not support this color depth */
1616 } 1694 }
1617 1695
1618 /* prepare limits for color transformation (each channel is handled separately) */ 1696 /* prepare limits for color transformation (each channel is handled separately) */
1619 if (shade < 0) { 1697 if (shade > 100)
1698 {
1620 shade = -shade; 1699 shade = 200 - shade;
1621 if (shade < 0) shade = 0;
1622 if (shade > 100) shade = 100;
1623 1700
1624 lower_lim_r = 65535-rm; 1701 lower_lim_r = 65535-rm;
1625 lower_lim_g = 65535-gm; 1702 lower_lim_g = 65535-gm;
1626 lower_lim_b = 65535-bm; 1703 lower_lim_b = 65535-bm;
1627 1704
1628 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1705 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
1629 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1706 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
1630 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1707 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
1631 1708
1632 upper_lim_r = upper_lim_g = upper_lim_b = 65535; 1709 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1710 }
1633 } else { 1711 else
1634 if (shade < 0) shade = 0; 1712 {
1635 if (shade > 100) shade = 100;
1636 1713
1637 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1714 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1638 1715
1639 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100); 1716 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1640 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100); 1717 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1641 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100); 1718 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1642 } 1719 }
1643 1720
1644 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */ 1721 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1645 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 )) 1722 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000))
1646 { 1723 {
1647 unsigned int tmp; 1724 unsigned int tmp;
1648 1725
1649 tmp = lower_lim_r; 1726 tmp = lower_lim_r;
1650 lower_lim_r = lower_lim_b; 1727 lower_lim_r = lower_lim_b;
1651 lower_lim_b = tmp; 1728 lower_lim_b = tmp;
1652 1729
1653 tmp = upper_lim_r; 1730 tmp = upper_lim_r;
1654 upper_lim_r = upper_lim_b; 1731 upper_lim_r = upper_lim_b;
1655 upper_lim_b = tmp; 1732 upper_lim_b = tmp;
1656 } 1733 }
1657 1734
1658 /* fill our lookup tables */ 1735 /* fill our lookup tables */
1659 for (i = 0; i <= mask_r>>sh_r; i++) 1736 for (i = 0; i <= mask_r>>sh_r; i++)
1660 { 1737 {
1661 RUINT32T tmp; 1738 RUINT32T tmp;
1662 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1739 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
1663 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1740 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
1664 lookup_r[i] = (tmp/65535)<<sh_r; 1741 lookup_r[i] = (tmp/65535)<<sh_r;
1665 } 1742 }
1666 for (i = 0; i <= mask_g>>sh_g; i++) 1743 for (i = 0; i <= mask_g>>sh_g; i++)
1667 { 1744 {
1668 RUINT32T tmp; 1745 RUINT32T tmp;
1669 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1746 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
1670 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1747 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
1671 lookup_g[i] = (tmp/65535)<<sh_g; 1748 lookup_g[i] = (tmp/65535)<<sh_g;
1672 } 1749 }
1673 for (i = 0; i <= mask_b>>sh_b; i++) 1750 for (i = 0; i <= mask_b>>sh_b; i++)
1674 { 1751 {
1675 RUINT32T tmp; 1752 RUINT32T tmp;
1676 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1753 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
1677 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1754 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
1678 lookup_b[i] = (tmp/65535)<<sh_b; 1755 lookup_b[i] = (tmp/65535)<<sh_b;
1679 } 1756 }
1680 1757
1681 /* apply table to input image (replacing colors by newly calculated ones) */ 1758 /* apply table to input image (replacing colors by newly calculated ones) */
1682 switch (srcImage->bits_per_pixel) 1759 switch (srcImage->bits_per_pixel)
1683 { 1760 {
1684 case 15: 1761 case 15:
1685 { 1762 {
1686 unsigned short *p1, *pf, *p, *pl; 1763 unsigned short *p1, *pf, *p, *pl;
1687 p1 = (unsigned short *) srcImage->data; 1764 p1 = (unsigned short *) srcImage->data;
1688 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1765 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1689 while (p1 < pf) 1766 while (p1 < pf)
1690 { 1767 {
1691 p = p1; 1768 p = p1;
1692 pl = p1 + srcImage->width; 1769 pl = p1 + srcImage->width;
1693 for (; p < pl; p++) 1770 for (; p < pl; p++)
1694 { 1771 {
1695 *p = lookup_r[(*p & 0x7c00)>>10] | 1772 *p = lookup_r[(*p & 0x7c00)>>10] |
1696 lookup_g[(*p & 0x03e0)>> 5] | 1773 lookup_g[(*p & 0x03e0)>> 5] |
1697 lookup_b[(*p & 0x001f)]; 1774 lookup_b[(*p & 0x001f)];
1698 } 1775 }
1699 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line); 1776 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1777 }
1778 break;
1700 } 1779 }
1701 break;
1702 }
1703 case 16: 1780 case 16:
1704 { 1781 {
1705 unsigned short *p1, *pf, *p, *pl; 1782 unsigned short *p1, *pf, *p, *pl;
1706 p1 = (unsigned short *) srcImage->data; 1783 p1 = (unsigned short *) srcImage->data;
1707 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1784 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1708 while (p1 < pf) 1785 while (p1 < pf)
1709 { 1786 {
1710 p = p1; 1787 p = p1;
1711 pl = p1 + srcImage->width; 1788 pl = p1 + srcImage->width;
1712 for (; p < pl; p++) 1789 for (; p < pl; p++)
1713 { 1790 {
1714 *p = lookup_r[(*p & 0xf800)>>11] | 1791 *p = lookup_r[(*p & 0xf800)>>11] |
1715 lookup_g[(*p & 0x07e0)>> 5] | 1792 lookup_g[(*p & 0x07e0)>> 5] |
1716 lookup_b[(*p & 0x001f)]; 1793 lookup_b[(*p & 0x001f)];
1717 } 1794 }
1718 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line); 1795 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1796 }
1797 break;
1719 } 1798 }
1720 break;
1721 }
1722 case 24: 1799 case 24:
1723 { 1800 {
1724 unsigned char *p1, *pf, *p, *pl; 1801 unsigned char *p1, *pf, *p, *pl;
1725 p1 = (unsigned char *) srcImage->data; 1802 p1 = (unsigned char *) srcImage->data;
1726 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1803 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1727 while (p1 < pf) 1804 while (p1 < pf)
1728 { 1805 {
1729 p = p1; 1806 p = p1;
1730 pl = p1 + srcImage->width * 3; 1807 pl = p1 + srcImage->width * 3;
1731 for (; p < pl; p += 3) 1808 for (; p < pl; p += 3)
1732 { 1809 {
1733 p[0] = lookup_r[(p[0] & 0xff0000)>>16]; 1810 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1734 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8]; 1811 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1735 p[2] = lookup_r[(p[2] & 0x0000ff)]; 1812 p[2] = lookup_r[(p[2] & 0x0000ff)];
1736 } 1813 }
1737 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line); 1814 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1815 }
1816 break;
1738 } 1817 }
1739 break;
1740 }
1741 case 32: 1818 case 32:
1742 { 1819 {
1743 RUINT32T *p1, *pf, *p, *pl; 1820 RUINT32T *p1, *pf, *p, *pl;
1744 p1 = (RUINT32T *) srcImage->data; 1821 p1 = (RUINT32T *) srcImage->data;
1745 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1822 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1746 1823
1747 while (p1 < pf) 1824 while (p1 < pf)
1748 { 1825 {
1749 p = p1; 1826 p = p1;
1750 pl = p1 + srcImage->width; 1827 pl = p1 + srcImage->width;
1751 for (; p < pl; p++) 1828 for (; p < pl; p++)
1752 { 1829 {
1753 *p = lookup_r[(*p & 0xff0000)>>16] | 1830 *p = lookup_r[(*p & 0xff0000)>>16] |
1754 lookup_g[(*p & 0x00ff00)>> 8] | 1831 lookup_g[(*p & 0x00ff00)>> 8] |
1755 lookup_b[(*p & 0x0000ff)] | 1832 lookup_b[(*p & 0x0000ff)] |
1756 (*p & ~0xffffff); 1833 (*p & ~0xffffff);
1757 } 1834 }
1758 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line); 1835 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1836 }
1837 break;
1759 } 1838 }
1760 break;
1761 }
1762 } 1839 }
1763 1840
1764 free (lookup); 1841 free (lookup);
1765} 1842}
1766#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1843#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */

Diff Legend

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