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

Diff Legend

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