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.80 by sf-exg, Wed Oct 13 23:04:57 2010 UTC

… …
19 * You should have received a copy of the GNU General Public License 19 * You should have received a copy of the GNU General Public License
20 * along with this program; if not, write to the Free Software 20 * along with this program; if not, write to the Free Software
21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22 *---------------------------------------------------------------------*/ 22 *---------------------------------------------------------------------*/
23 23
24#include <cmath>
24#include "../config.h" /* NECESSARY */ 25#include "../config.h" /* NECESSARY */
25#include "rxvt.h" /* NECESSARY */ 26#include "rxvt.h" /* NECESSARY */
26 27
27#define DO_TIMING_TEST 0 28#define DO_TIMING_TEST 0
28 29
… …
104#ifdef BG_IMAGE_FROM_FILE 105#ifdef BG_IMAGE_FROM_FILE
105 have_image = false; 106 have_image = false;
106 h_scale = v_scale = 0; 107 h_scale = v_scale = 0;
107 h_align = v_align = 0; 108 h_align = v_align = 0;
108#endif 109#endif
110#ifdef ENABLE_TRANSPARENCY
111 shade = 100;
112#endif
109 flags = 0; 113 flags = 0;
110 pixmap = None; 114 pixmap = None;
111 valid_since = invalid_since = 0; 115 valid_since = invalid_since = 0;
112 target = 0; 116 target = 0;
113} 117}
… …
174 return true; 178 return true;
175# endif 179# endif
176# ifdef ENABLE_TRANSPARENCY 180# ifdef ENABLE_TRANSPARENCY
177 if (flags & isTransparent) 181 if (flags & isTransparent)
178 { 182 {
179# ifdef HAVE_AFTERIMAGE // can't blur without libAI anyways 183# ifdef HAVE_AFTERIMAGE
180 if ((flags & blurNeeded) && !(flags & blurServerSide)) 184 if ((flags & blurNeeded) && !(flags & blurServerSide))
181 return true; 185 return true;
182# endif 186# endif
183 if ((flags & tintNeeded) && !(flags & tintServerSide)) 187 if ((flags & tintNeeded) && !(flags & tintServerSide))
184 return true; 188 return true;
… …
226make_align_position (int align, int window_size, int image_size) 230make_align_position (int align, int window_size, int image_size)
227{ 231{
228 int diff = window_size - image_size; 232 int diff = window_size - image_size;
229 int smaller = min (image_size, window_size); 233 int smaller = min (image_size, window_size);
230 234
231 if (align >= 0 && align <= 50) 235 if (align >= 0 && align <= 100)
232 return diff * align / 100; 236 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 ) 237 else if (align > 100 && align <= 200 )
236 return ((align - 100) * smaller / 100) + window_size - smaller; 238 return ((align - 100) * smaller / 100) + window_size - smaller;
237 else if (align > -100 && align < 0) 239 else if (align >= -100 && align < 0)
238 return ((align + 100) * smaller / 100) - image_size; 240 return ((align + 100) * smaller / 100) - image_size;
239 return 0; 241 return 0;
240} 242}
241 243
242static inline int 244static inline int
243make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 245make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
244{ 246{
245 int src_pos = 0; 247 int src_pos = 0;
246 dst_pos = 0; 248 dst_pos = pos;
247 dst_size = size; 249 dst_size = size;
248 if (pos < 0) 250 if (pos < 0)
249 { 251 {
250 src_pos = -pos; 252 src_pos = -pos;
253 dst_pos = 0;
251 dst_size += pos; 254 dst_size += pos;
252 } 255 }
253 else if (pos > 0)
254 dst_pos = pos;
255 256
256 if (dst_pos + dst_size > target_size) 257 if (dst_pos + dst_size > target_size)
257 dst_size = target_size - dst_pos; 258 dst_size = target_size - dst_pos;
258 return src_pos; 259 return src_pos;
259} 260}
… …
461 { 462 {
462 w = h_scale * target_width / 100; 463 w = h_scale * target_width / 100;
463 h = v_scale * target_height / 100; 464 h = v_scale * target_height / 100;
464 } 465 }
465 466
467 if (!w) w = image_width;
468 if (!h) h = image_height;
469
466 if (flags & rootAlign) 470 if (flags & rootAlign)
467 { 471 {
468 target->get_window_origin (x, y); 472 target->get_window_origin (x, y);
469 x = -x; 473 x = -x;
470 y = -y; 474 y = -y;
471 } 475 }
472 else 476 else
473 { 477 {
474 x = make_align_position (h_align, target_width, w > 0 ? w : image_width); 478 x = make_align_position (h_align, target_width, w);
475 y = make_align_position (v_align, target_height, h > 0 ? h : image_height); 479 y = make_align_position (v_align, target_height, h);
476 } 480 }
477 481
478 flags &= ~sizeSensitive; 482 flags &= ~sizeSensitive;
479 if (h_scale != 0 || v_scale != 0 483 if (h_scale != 0 || v_scale != 0
480 || h_align != 0 || v_align != 0 484 || h_align != 0 || v_align != 0
481 || image_width > target_width || image_height > target_height) 485 || w > target_width || h > target_height)
482 flags |= sizeSensitive; 486 flags |= sizeSensitive;
483} 487}
484 488
485# ifdef HAVE_AFTERIMAGE 489# ifdef HAVE_AFTERIMAGE
486bool 490bool
… …
499 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); 503 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
500 504
501 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 505 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
502 { 506 {
503 ShadingInfo as_shade; 507 ShadingInfo as_shade;
504 as_shade.shading = (shade == 0) ? 100 : shade; 508 as_shade.shading = shade;
505 509
506 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 510 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
507 if (flags & tintSet) 511 if (flags & tintSet)
508 tint.get (c); 512 tint.get (c);
509 as_shade.tintColor.red = c.r; 513 as_shade.tintColor.red = c.r;
… …
511 as_shade.tintColor.blue = c.b; 515 as_shade.tintColor.blue = c.b;
512 516
513 background_tint = shading2tint32 (&as_shade); 517 background_tint = shading2tint32 (&as_shade);
514 } 518 }
515 519
516 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL) 520 if (!(background_flags & transpPmapBlurred) && (flags & blurNeeded) && background != NULL)
517 { 521 {
518 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 522 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, 523 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
520 100, ASIMAGE_QUALITY_DEFAULT); 524 100, ASIMAGE_QUALITY_DEFAULT);
521 if (tmp) 525 if (tmp)
… …
542 546
543 if (original_asim) 547 if (original_asim)
544 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y); 548 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
545 549
546 if (!original_asim 550 if (!original_asim
551 || (!(flags & rootAlign)
547 || x >= target_width 552 && (x >= target_width
548 || y >= target_height 553 || y >= target_height
549 || (w > 0 && x + w <= 0) 554 || (x + w <= 0)
550 || (h > 0 && y + h <= 0)) 555 || (y + h <= 0))))
551 { 556 {
552 if (background) 557 if (background)
553 { 558 {
554 new_pmap_width = background->width; 559 new_pmap_width = background->width;
555 new_pmap_height = background->height; 560 new_pmap_height = background->height;
… …
569 } 574 }
570 else 575 else
571 { 576 {
572 result = original_asim; 577 result = original_asim;
573 578
574 if ((w > 0 && w != original_asim->width) 579 if ((w != original_asim->width)
575 || (h > 0 && h != original_asim->height)) 580 || (h != original_asim->height))
576 { 581 {
577 result = scale_asimage (target->asv, original_asim, 582 result = scale_asimage (target->asv, original_asim,
578 w > 0 ? w : original_asim->width, 583 w, h,
579 h > 0 ? h : original_asim->height,
580 background ? ASA_ASImage : ASA_XImage, 584 background ? ASA_ASImage : ASA_XImage,
581 100, ASIMAGE_QUALITY_DEFAULT); 585 100, ASIMAGE_QUALITY_DEFAULT);
582 } 586 }
583 587
584 if (background == NULL) 588 if (background == NULL)
… …
616 layers[0].clip_width = target_width; 620 layers[0].clip_width = target_width;
617 layers[0].clip_height = target_height; 621 layers[0].clip_height = target_height;
618 layers[0].tint = background_tint; 622 layers[0].tint = background_tint;
619 layers[1].im = result; 623 layers[1].im = result;
620 624
621 if (w <= 0) 625 if (h_scale == 0 || v_scale == 0)
622 { 626 {
623 /* tile horizontally */ 627 /* tile horizontally */
624 while (x > 0) x -= (int)result->width; 628 while (x > 0) x -= (int)result->width;
625 layers[1].dst_x = x; 629 layers[1].dst_x = x;
626 layers[1].clip_width = result->width+target_width; 630 layers[1].clip_width = result->width+target_width;
… …
630 /* clip horizontally */ 634 /* clip horizontally */
631 layers[1].dst_x = x; 635 layers[1].dst_x = x;
632 layers[1].clip_width = result->width; 636 layers[1].clip_width = result->width;
633 } 637 }
634 638
635 if (h <= 0) 639 if (h_scale == 0 || v_scale == 0)
636 { 640 {
637 while (y > 0) y -= (int)result->height; 641 while (y > 0) y -= (int)result->height;
638 layers[1].dst_y = y; 642 layers[1].dst_y = y;
639 layers[1].clip_height = result->height + target_height; 643 layers[1].clip_height = result->height + target_height;
640 } 644 }
… …
741 return false; 745 return false;
742 746
743 if (!pixbuf) 747 if (!pixbuf)
744 return false; 748 return false;
745 749
746 // TODO: add alpha blending 750#if !XFT
747 if (background_flags) 751 if (background_flags)
748 return false; 752 return false;
753#endif
749 754
750 GdkPixbuf *result; 755 GdkPixbuf *result;
751 756
752 int image_width = gdk_pixbuf_get_width (pixbuf); 757 int image_width = gdk_pixbuf_get_width (pixbuf);
753 int image_height = gdk_pixbuf_get_height (pixbuf); 758 int image_height = gdk_pixbuf_get_height (pixbuf);
… …
762 int w = 0; 767 int w = 0;
763 int h = 0; 768 int h = 0;
764 769
765 get_image_geometry (image_width, image_height, w, h, x, y); 770 get_image_geometry (image_width, image_height, w, h, x, y);
766 771
772 if (!(flags & rootAlign)
767 if (x >= target_width 773 && (x >= target_width
768 || y >= target_height 774 || y >= target_height
769 || (w > 0 && x + w <= 0) 775 || (x + w <= 0)
770 || (h > 0 && y + h <= 0)) 776 || (y + h <= 0)))
771 return false; 777 return false;
772 778
773 result = pixbuf; 779 result = pixbuf;
774 780
775 if ((w > 0 && w != image_width) 781 if ((w != image_width)
776 || (h > 0 && h != image_height)) 782 || (h != image_height))
777 { 783 {
778 result = gdk_pixbuf_scale_simple (pixbuf, 784 result = gdk_pixbuf_scale_simple (pixbuf,
779 w > 0 ? w : image_width, 785 w, h,
780 h > 0 ? h : image_height,
781 GDK_INTERP_BILINEAR); 786 GDK_INTERP_BILINEAR);
782 } 787 }
783 788
784 bool ret = false; 789 bool ret = false;
785 790
786 if (result) 791 if (result)
787 { 792 {
788 XGCValues gcv; 793 XGCValues gcv;
789 GC gc; 794 GC gc;
795 Pixmap root_pmap;
790 796
791 image_width = gdk_pixbuf_get_width (result); 797 image_width = gdk_pixbuf_get_width (result);
792 image_height = gdk_pixbuf_get_height (result); 798 image_height = gdk_pixbuf_get_height (result);
793 799
800 if (background_flags)
801 {
802 root_pmap = pixmap;
803 pixmap = None;
804 }
805 else
806 {
794 if (h_scale == 0 || v_scale == 0) 807 if (h_scale == 0 || v_scale == 0)
795 { 808 {
796 new_pmap_width = min (image_width, target_width); 809 new_pmap_width = min (image_width, target_width);
797 new_pmap_height = min (image_height, target_height); 810 new_pmap_height = min (image_height, target_height);
811 }
798 } 812 }
799 813
800 if (pixmap) 814 if (pixmap)
801 { 815 {
802 if (pmap_width != new_pmap_width 816 if (pmap_width != new_pmap_width
… …
857 dst_x, dst_y, 871 dst_x, dst_y,
858 dst_width, dst_height, 872 dst_width, dst_height,
859 XLIB_RGB_DITHER_NONE, 873 XLIB_RGB_DITHER_NONE,
860 0, 0); 874 0, 0);
861 } 875 }
876
877#if XFT
878 if (background_flags)
879 {
880 Display *dpy = target->dpy;
881 XRenderPictureAttributes pa;
882
883 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen));
884 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
885
886 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
887 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
888
889 pa.repeat = True;
890 Pixmap mask_pmap = XCreatePixmap (dpy, target->vt, 1, 1, 8);
891 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
892 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
893 XFreePixmap (dpy, mask_pmap);
894
895 if (src && dst && mask)
896 {
897 XRenderColor mask_c;
898
899 mask_c.alpha = 0x8000;
900 mask_c.red = 0;
901 mask_c.green = 0;
902 mask_c.blue = 0;
903 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
904 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
905 }
906
907 XRenderFreePicture (dpy, src);
908 XRenderFreePicture (dpy, dst);
909 XRenderFreePicture (dpy, mask);
910
911 XFreePixmap (dpy, root_pmap);
912 }
913#endif
862 914
863 if (result != pixbuf) 915 if (result != pixbuf)
864 g_object_unref (result); 916 g_object_unref (result);
865 917
866 XFreeGC (target->dpy, gc); 918 XFreeGC (target->dpy, gc);
… …
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
1118static void
1119get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1120{
1121 double sigma = radius / 2.0;
1122 double scale = sqrt (2.0 * M_PI) * sigma;
1123 double sum = 0.0;
1124
1125 for (int i = 0; i < width; i++)
1126 {
1127 double x = i - width / 2;
1128 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1129 sum += kernel[i];
1130 }
1131
1132 params[0] = XDoubleToFixed (width);
1133 params[1] = XDoubleToFixed (1);
1134
1135 for (int i = 0; i < width; i++)
1136 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1137}
1138
1052bool 1139bool
1053bgPixmap_t::tint_pixmap (Pixmap pixmap) 1140bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1054{ 1141{
1055 Window root = target->display->root; 1142 bool ret = false;
1143#if XFT
1144 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1145 double *kernel = (double *)malloc (size * sizeof (double));
1146 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1147
1056 Display *dpy = target->dpy; 1148 Display *dpy = target->dpy;
1057 int window_width = target->szHint.width; 1149 XRenderPictureAttributes pa;
1058 int window_height = target->szHint.height; 1150 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, target->visual);
1151
1152 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1153 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1154
1155 if (kernel && params && src && dst)
1156 {
1157 if (h_blurRadius)
1158 {
1159 size = h_blurRadius * 2 + 1;
1160 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1161
1162 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1163 XRenderComposite (dpy,
1164 PictOpSrc,
1165 src,
1166 None,
1167 dst,
1168 0, 0,
1169 0, 0,
1170 0, 0,
1171 width, height);
1172 }
1173
1174 if (v_blurRadius)
1175 {
1176 size = v_blurRadius * 2 + 1;
1177 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1178 swap (params[0], params[1]);
1179
1180 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1181 XRenderComposite (dpy,
1182 PictOpSrc,
1183 src,
1184 None,
1185 dst,
1186 0, 0,
1187 0, 0,
1188 0, 0,
1189 width, height);
1190 }
1191
1192 ret = true;
1193 }
1194
1195 free (kernel);
1196 free (params);
1197 XRenderFreePicture (dpy, src);
1198 XRenderFreePicture (dpy, dst);
1199#endif
1200 return ret;
1201}
1202
1203bool
1204bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1205{
1206 Display *dpy = target->dpy;
1059 bool ret = false; 1207 bool ret = false;
1060 1208
1061 if (flags & tintWholesome) 1209 if (flags & tintWholesome)
1062 { 1210 {
1063 XGCValues gcv; 1211 XGCValues gcv;
… …
1067 * performance improvements, as we eliminate XImage transfer 1215 * performance improvements, as we eliminate XImage transfer
1068 */ 1216 */
1069 gcv.foreground = Pixel (tint); 1217 gcv.foreground = Pixel (tint);
1070 gcv.function = GXand; 1218 gcv.function = GXand;
1071 gcv.fill_style = FillSolid; 1219 gcv.fill_style = FillSolid;
1072 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv); 1220 gc = XCreateGC (dpy, pixmap, GCFillStyle | GCForeground | GCFunction, &gcv);
1073 if (gc) 1221 if (gc)
1074 { 1222 {
1075 XFillRectangle (dpy, pixmap, gc, 0, 0, window_width, window_height); 1223 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1076 ret = true; 1224 ret = true;
1077 XFreeGC (dpy, gc); 1225 XFreeGC (dpy, gc);
1078 } 1226 }
1079 } 1227 }
1080 else 1228 else
… …
1083 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1231 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1084 1232
1085 if (flags & tintSet) 1233 if (flags & tintSet)
1086 tint.get (c); 1234 tint.get (c);
1087 1235
1088 if (shade > 0 && shade < 100) 1236 if (shade <= 100)
1089 { 1237 {
1090 c.r = (c.r * shade) / 100; 1238 c.r = (c.r * shade) / 100;
1091 c.g = (c.g * shade) / 100; 1239 c.g = (c.g * shade) / 100;
1092 c.b = (c.b * shade) / 100; 1240 c.b = (c.b * shade) / 100;
1093 } 1241 }
1094 else if (shade > 100 && shade < 200) 1242 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 } 1243 {
1244 c.r = ((0xffff - c.r) * (200 - shade)) / 100;
1245 c.g = ((0xffff - c.g) * (200 - shade)) / 100;
1246 c.b = ((0xffff - c.b) * (200 - shade)) / 100;
1247 }
1100 1248
1101 XRenderPictFormat pf; 1249 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, 1250 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; 1251 XRenderPictureAttributes pa;
1120 1252
1121 Picture back_pic = XRenderCreatePicture (dpy, pixmap, root_format, 0, &pa); 1253 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1122 1254
1123 pa.repeat = True; 1255 pa.repeat = True;
1124 1256
1125 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32); 1257 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1126 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa); 1258 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1127 XFreePixmap (dpy, overlay_pmap); 1259 XFreePixmap (dpy, overlay_pmap);
1128 1260
1129 pa.component_alpha = True; 1261 pa.component_alpha = True;
1130 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32); 1262 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1131 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa); 1263 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1132 XFreePixmap (dpy, mask_pmap); 1264 XFreePixmap (dpy, mask_pmap);
1133 1265
1134 if (mask_pic && overlay_pic && back_pic) 1266 if (mask_pic && overlay_pic && back_pic)
1135 { 1267 {
… …
1142 mask_c.alpha = 0; 1274 mask_c.alpha = 0;
1143 mask_c.red = 0xffff - c.r; 1275 mask_c.red = 0xffff - c.r;
1144 mask_c.green = 0xffff - c.g; 1276 mask_c.green = 0xffff - c.g;
1145 mask_c.blue = 0xffff - c.b; 1277 mask_c.blue = 0xffff - c.b;
1146 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1278 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); 1279 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1148 ret = true; 1280 ret = true;
1149 } 1281 }
1150 1282
1151 XRenderFreePicture (dpy, mask_pic); 1283 XRenderFreePicture (dpy, mask_pic);
1152 XRenderFreePicture (dpy, overlay_pic); 1284 XRenderFreePicture (dpy, overlay_pic);
… …
1195 || sx >= root_width || sy >= root_height) 1327 || sx >= root_width || sy >= root_height)
1196 return 0; 1328 return 0;
1197 1329
1198 if (root_pixmap != None) 1330 if (root_pixmap != None)
1199 { 1331 {
1200 /* we want to validate the pixmap and get it's size at the same time : */ 1332 /* we want to validate the pixmap and get its size at the same time : */
1201 int junk; 1333 int junk;
1202 unsigned int ujunk; 1334 unsigned int ujunk;
1203 /* root pixmap may be bad - allow a error */ 1335 /* root pixmap may be bad - allow a error */
1204 target->allowedxerror = -1; 1336 target->allowedxerror = -1;
1205 1337
… …
1293 1425
1294 if (tiled_root_pmap != None) 1426 if (tiled_root_pmap != None)
1295 { 1427 {
1296 if (!need_client_side_rendering ()) 1428 if (!need_client_side_rendering ())
1297 { 1429 {
1430 if ((flags & blurNeeded))
1431 {
1432 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height))
1433 result |= transpPmapBlurred;
1434 }
1298 if ((flags & tintNeeded)) 1435 if ((flags & tintNeeded))
1299 { 1436 {
1300 if (tint_pixmap (tiled_root_pmap)) 1437 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height))
1301 result |= transpPmapTinted; 1438 result |= transpPmapTinted;
1302 } 1439 }
1303 } /* server side rendering completed */ 1440 } /* server side rendering completed */
1304 1441
1305 if (pixmap) 1442 if (pixmap)
… …
1546 int i; 1683 int i;
1547 1684
1548 Visual *visual = term->visual; 1685 Visual *visual = term->visual;
1549 1686
1550 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1687 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ;
1551
1552 if (shade == 0)
1553 shade = 100;
1554 1688
1555 /* for convenience */ 1689 /* for convenience */
1556 mask_r = visual->red_mask; 1690 mask_r = visual->red_mask;
1557 mask_g = visual->green_mask; 1691 mask_g = visual->green_mask;
1558 mask_b = visual->blue_mask; 1692 mask_b = visual->blue_mask;
… …
1614 default: 1748 default:
1615 return; /* we do not support this color depth */ 1749 return; /* we do not support this color depth */
1616 } 1750 }
1617 1751
1618 /* prepare limits for color transformation (each channel is handled separately) */ 1752 /* prepare limits for color transformation (each channel is handled separately) */
1619 if (shade < 0) { 1753 if (shade > 100) {
1620 shade = -shade; 1754 shade = 200 - shade;
1621 if (shade < 0) shade = 0;
1622 if (shade > 100) shade = 100;
1623 1755
1624 lower_lim_r = 65535-rm; 1756 lower_lim_r = 65535-rm;
1625 lower_lim_g = 65535-gm; 1757 lower_lim_g = 65535-gm;
1626 lower_lim_b = 65535-bm; 1758 lower_lim_b = 65535-bm;
1627 1759
… …
1629 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1761 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); 1762 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
1631 1763
1632 upper_lim_r = upper_lim_g = upper_lim_b = 65535; 1764 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1633 } else { 1765 } else {
1634 if (shade < 0) shade = 0;
1635 if (shade > 100) shade = 100;
1636 1766
1637 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1767 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1638 1768
1639 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100); 1769 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1640 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100); 1770 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);

Diff Legend

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