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.118 by sf-exg, Tue Nov 16 15:49:56 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 */
28
29#if XRENDER
30# include <X11/extensions/Xrender.h>
31#endif
32
33#ifndef FilterConvolution
34#define FilterConvolution "convolution"
35#endif
26 36
27#define DO_TIMING_TEST 0 37#define DO_TIMING_TEST 0
28 38
29#if DO_TIMING_TEST 39#if DO_TIMING_TEST
30# include <sys/time.h> 40# include <sys/time.h>
… …
104#ifdef BG_IMAGE_FROM_FILE 114#ifdef BG_IMAGE_FROM_FILE
105 have_image = false; 115 have_image = false;
106 h_scale = v_scale = 0; 116 h_scale = v_scale = 0;
107 h_align = v_align = 0; 117 h_align = v_align = 0;
108#endif 118#endif
119#ifdef ENABLE_TRANSPARENCY
120 shade = 100;
121#endif
109 flags = 0; 122 flags = 0;
110 pixmap = None; 123 pixmap = None;
111 valid_since = invalid_since = 0; 124 valid_since = invalid_since = 0;
112 target = 0; 125 target = 0;
113} 126}
… …
163 return true; 176 return true;
164 } 177 }
165# endif 178# endif
166 179
167 return false; 180 return false;
168}; 181}
169 182
170bool bgPixmap_t::need_client_side_rendering () 183bool bgPixmap_t::need_client_side_rendering ()
171{ 184{
172# ifdef HAVE_AFTERIMAGE 185# ifdef HAVE_AFTERIMAGE
173 if (original_asim) 186 if (original_asim)
174 return true; 187 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 188# endif
187 return false; 189 return false;
188} 190}
189 191
190# ifdef BG_IMAGE_FROM_FILE 192# ifdef BG_IMAGE_FROM_FILE
… …
226make_align_position (int align, int window_size, int image_size) 228make_align_position (int align, int window_size, int image_size)
227{ 229{
228 int diff = window_size - image_size; 230 int diff = window_size - image_size;
229 int smaller = min (image_size, window_size); 231 int smaller = min (image_size, window_size);
230 232
231 if (align >= 0 && align <= 50) 233 if (align >= 0 && align <= 100)
232 return diff * align / 100; 234 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 ) 235 else if (align > 100 && align <= 200)
236 return ((align - 100) * smaller / 100) + window_size - smaller; 236 return ((align - 100) * smaller / 100) + window_size - smaller;
237 else if (align > -100 && align < 0) 237 else if (align >= -100 && align < 0)
238 return ((align + 100) * smaller / 100) - image_size; 238 return ((align + 100) * smaller / 100) - image_size;
239 return 0; 239 return 0;
240} 240}
241 241
242static inline int 242static inline int
243make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 243make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
244{ 244{
245 int src_pos = 0; 245 int src_pos = 0;
246 dst_pos = 0; 246 dst_pos = pos;
247 dst_size = size; 247 dst_size = size;
248 if (pos < 0) 248 if (pos < 0)
249 { 249 {
250 src_pos = -pos; 250 src_pos = -pos;
251 dst_pos = 0;
251 dst_size += pos; 252 dst_size += pos;
252 } 253 }
253 else if (pos > 0)
254 dst_pos = pos;
255 254
256 if (dst_pos + dst_size > target_size) 255 if (dst_pos + dst_size > target_size)
257 dst_size = target_size - dst_pos; 256 dst_size = target_size - dst_pos;
258 return src_pos; 257 return src_pos;
259} 258}
260 259
261bool 260bool
262bgPixmap_t::set_geometry (const char *geom) 261bgPixmap_t::set_geometry (const char *geom)
263{ 262{
263 bool changed = false;
264 int geom_flags = 0, changed = 0; 264 int geom_flags = 0;
265 int x = 0, y = 0; 265 int x = 0, y = 0;
266 unsigned int w = 0, h = 0; 266 unsigned int w = 0, h = 0;
267 unsigned int n; 267 unsigned int n;
268 unsigned long new_flags = (flags & (~geometryFlags)); 268 unsigned long new_flags = (flags & (~geometryFlags));
269 const char *p; 269 const char *p;
… …
425 425
426 while (*ops != ':' && *ops != '\0') ++ops; 426 while (*ops != ':' && *ops != '\0') ++ops;
427 } /* done parsing ops */ 427 } /* done parsing ops */
428 } 428 }
429 429
430 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed; 430 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
431 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed; 431 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
432 if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed; 432 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
433 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed; 433 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
434 } 434 }
435 435
436 if (new_flags != flags) 436 if (new_flags != flags)
437 { 437 {
438 flags = new_flags; 438 flags = new_flags;
439 changed++; 439 changed = true;
440 } 440 }
441 441
442 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
443 // flags, h_scale, v_scale, h_align, v_align);
444 return (changed > 0); 442 return changed;
445} 443}
446 444
447void 445void
448bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 446bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
449{ 447{
… …
461 { 459 {
462 w = h_scale * target_width / 100; 460 w = h_scale * target_width / 100;
463 h = v_scale * target_height / 100; 461 h = v_scale * target_height / 100;
464 } 462 }
465 463
464 if (!w) w = image_width;
465 if (!h) h = image_height;
466
466 if (flags & rootAlign) 467 if (flags & rootAlign)
467 { 468 {
468 target->get_window_origin (x, y); 469 target->get_window_origin (x, y);
469 x = -x; 470 x = -x;
470 y = -y; 471 y = -y;
471 } 472 }
472 else 473 else
473 { 474 {
474 x = make_align_position (h_align, target_width, w > 0 ? w : image_width); 475 x = make_align_position (h_align, target_width, w);
475 y = make_align_position (v_align, target_height, h > 0 ? h : image_height); 476 y = make_align_position (v_align, target_height, h);
476 } 477 }
477 478
478 flags &= ~sizeSensitive; 479 flags &= ~sizeSensitive;
479 if (h_scale != 0 || v_scale != 0 480 if ((flags & propScale) || h_scale || v_scale
480 || h_align != 0 || v_align != 0 481 || (!(flags & rootAlign) && (h_align || v_align))
481 || image_width > target_width || image_height > target_height) 482 || w > target_width || h > target_height)
482 flags |= sizeSensitive; 483 flags |= sizeSensitive;
483} 484}
484 485
485# ifdef HAVE_AFTERIMAGE 486# ifdef HAVE_AFTERIMAGE
486bool 487bool
… …
499 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); 500 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
500 501
501 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 502 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
502 { 503 {
503 ShadingInfo as_shade; 504 ShadingInfo as_shade;
504 as_shade.shading = (shade == 0) ? 100 : shade; 505 as_shade.shading = shade;
505 506
506 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 507 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
507 if (flags & tintSet) 508 if (flags & tintSet)
508 tint.get (c); 509 tint.get (c);
509 as_shade.tintColor.red = c.r; 510 as_shade.tintColor.red = c.r;
… …
511 as_shade.tintColor.blue = c.b; 512 as_shade.tintColor.blue = c.b;
512 513
513 background_tint = shading2tint32 (&as_shade); 514 background_tint = shading2tint32 (&as_shade);
514 } 515 }
515 516
516 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL) 517 if (!(background_flags & transpPmapBlurred) && (flags & blurNeeded) && background != NULL)
517 { 518 {
518 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 519 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, 520 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
520 100, ASIMAGE_QUALITY_DEFAULT); 521 100, ASIMAGE_QUALITY_DEFAULT);
521 if (tmp) 522 if (tmp)
… …
536 int x = 0; 537 int x = 0;
537 int y = 0; 538 int y = 0;
538 int w = 0; 539 int w = 0;
539 int h = 0; 540 int h = 0;
540 541
541 TIMING_TEST_START (asim);
542
543 if (original_asim) 542 if (original_asim)
544 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y); 543 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
545 544
546 if (!original_asim 545 if (!original_asim
546 || (!(flags & rootAlign)
547 || x >= target_width 547 && (x >= target_width
548 || y >= target_height 548 || y >= target_height
549 || (w > 0 && x + w <= 0) 549 || (x + w <= 0)
550 || (h > 0 && y + h <= 0)) 550 || (y + h <= 0))))
551 { 551 {
552 if (background) 552 if (background)
553 { 553 {
554 new_pmap_width = background->width; 554 new_pmap_width = background->width;
555 new_pmap_height = background->height; 555 new_pmap_height = background->height;
… …
569 } 569 }
570 else 570 else
571 { 571 {
572 result = original_asim; 572 result = original_asim;
573 573
574 if ((w > 0 && w != original_asim->width) 574 if ((w != original_asim->width)
575 || (h > 0 && h != original_asim->height)) 575 || (h != original_asim->height))
576 { 576 {
577 result = scale_asimage (target->asv, original_asim, 577 result = scale_asimage (target->asv, original_asim,
578 w > 0 ? w : original_asim->width, 578 w, h,
579 h > 0 ? h : original_asim->height,
580 background ? ASA_ASImage : ASA_XImage, 579 background ? ASA_ASImage : ASA_XImage,
581 100, ASIMAGE_QUALITY_DEFAULT); 580 100, ASIMAGE_QUALITY_DEFAULT);
582 } 581 }
583 582
584 if (background == NULL) 583 if (background == NULL)
… …
616 layers[0].clip_width = target_width; 615 layers[0].clip_width = target_width;
617 layers[0].clip_height = target_height; 616 layers[0].clip_height = target_height;
618 layers[0].tint = background_tint; 617 layers[0].tint = background_tint;
619 layers[1].im = result; 618 layers[1].im = result;
620 619
621 if (w <= 0) 620 if (h_scale == 0 || v_scale == 0)
622 { 621 {
623 /* tile horizontally */ 622 /* tile horizontally */
624 while (x > 0) x -= (int)result->width; 623 while (x > 0) x -= (int)result->width;
625 layers[1].dst_x = x; 624 layers[1].dst_x = x;
626 layers[1].clip_width = result->width+target_width; 625 layers[1].clip_width = result->width+target_width;
… …
630 /* clip horizontally */ 629 /* clip horizontally */
631 layers[1].dst_x = x; 630 layers[1].dst_x = x;
632 layers[1].clip_width = result->width; 631 layers[1].clip_width = result->width;
633 } 632 }
634 633
635 if (h <= 0) 634 if (h_scale == 0 || v_scale == 0)
636 { 635 {
637 while (y > 0) y -= (int)result->height; 636 while (y > 0) y -= (int)result->height;
638 layers[1].dst_y = y; 637 layers[1].dst_y = y;
639 layers[1].clip_height = result->height + target_height; 638 layers[1].clip_height = result->height + target_height;
640 } 639 }
… …
663 } 662 }
664 663
665 free (layers); 664 free (layers);
666 } 665 }
667 } 666 }
668 TIMING_TEST_PRINT_RESULT (asim);
669 667
670 bool ret = false; 668 bool ret = false;
671 669
672 if (result) 670 if (result)
673 { 671 {
674 XGCValues gcv; 672 XGCValues gcv;
675 GC gc; 673 GC gc;
676 674
677 if (pixmap)
678 {
679 if (pmap_width != new_pmap_width
680 || pmap_height != new_pmap_height
681 || pmap_depth != target->depth)
682 {
683 XFreePixmap (target->dpy, pixmap);
684 pixmap = None;
685 }
686 }
687
688 /* create Pixmap */ 675 /* create Pixmap */
689 if (pixmap == None) 676 if (pixmap == None
677 || pmap_width != new_pmap_width
678 || pmap_height != new_pmap_height
679 || pmap_depth != target->depth)
690 { 680 {
681 if (pixmap)
682 XFreePixmap (target->dpy, pixmap);
691 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 683 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
692 pmap_width = new_pmap_width; 684 pmap_width = new_pmap_width;
693 pmap_height = new_pmap_height; 685 pmap_height = new_pmap_height;
694 pmap_depth = target->depth; 686 pmap_depth = target->depth;
695 } 687 }
… …
719 711
720 if (result != background && result != original_asim) 712 if (result != background && result != original_asim)
721 destroy_asimage (&result); 713 destroy_asimage (&result);
722 714
723 XFreeGC (target->dpy, gc); 715 XFreeGC (target->dpy, gc);
724 TIMING_TEST_PRINT_RESULT (asim);
725 716
726 ret = true; 717 ret = true;
727 } 718 }
728 719
729 if (background) 720 if (background)
… …
741 return false; 732 return false;
742 733
743 if (!pixbuf) 734 if (!pixbuf)
744 return false; 735 return false;
745 736
746 // TODO: add alpha blending
747 if (background_flags) 737 if (background_flags
738 && !(flags & HAS_RENDER))
748 return false; 739 return false;
749 740
750 GdkPixbuf *result; 741 GdkPixbuf *result;
751 742
752 int image_width = gdk_pixbuf_get_width (pixbuf); 743 int image_width = gdk_pixbuf_get_width (pixbuf);
… …
762 int w = 0; 753 int w = 0;
763 int h = 0; 754 int h = 0;
764 755
765 get_image_geometry (image_width, image_height, w, h, x, y); 756 get_image_geometry (image_width, image_height, w, h, x, y);
766 757
758 if (!(flags & rootAlign)
767 if (x >= target_width 759 && (x >= target_width
768 || y >= target_height 760 || y >= target_height
769 || (w > 0 && x + w <= 0) 761 || (x + w <= 0)
770 || (h > 0 && y + h <= 0)) 762 || (y + h <= 0)))
771 return false; 763 return false;
772 764
773 result = pixbuf; 765 result = pixbuf;
774 766
775 if ((w > 0 && w != image_width) 767 if ((w != image_width)
776 || (h > 0 && h != image_height)) 768 || (h != image_height))
777 { 769 {
778 result = gdk_pixbuf_scale_simple (pixbuf, 770 result = gdk_pixbuf_scale_simple (pixbuf,
779 w > 0 ? w : image_width, 771 w, h,
780 h > 0 ? h : image_height,
781 GDK_INTERP_BILINEAR); 772 GDK_INTERP_BILINEAR);
782 } 773 }
783 774
784 bool ret = false; 775 bool ret = false;
785 776
786 if (result) 777 if (result)
787 { 778 {
788 XGCValues gcv; 779 XGCValues gcv;
789 GC gc; 780 GC gc;
781 Pixmap root_pmap;
790 782
791 image_width = gdk_pixbuf_get_width (result); 783 image_width = gdk_pixbuf_get_width (result);
792 image_height = gdk_pixbuf_get_height (result); 784 image_height = gdk_pixbuf_get_height (result);
793 785
786 if (background_flags)
787 {
788 root_pmap = pixmap;
789 pixmap = None;
790 }
791 else
792 {
794 if (h_scale == 0 || v_scale == 0) 793 if (h_scale == 0 || v_scale == 0)
795 { 794 {
796 new_pmap_width = min (image_width, target_width); 795 new_pmap_width = min (image_width, target_width);
797 new_pmap_height = min (image_height, target_height); 796 new_pmap_height = min (image_height, target_height);
798 }
799
800 if (pixmap)
801 {
802 if (pmap_width != new_pmap_width
803 || pmap_height != new_pmap_height
804 || pmap_depth != target->depth)
805 { 797 }
806 XFreePixmap (target->dpy, pixmap);
807 pixmap = None;
808 } 798 }
809 }
810 799
811 if (pixmap == None) 800 if (pixmap == None
801 || pmap_width != new_pmap_width
802 || pmap_height != new_pmap_height
803 || pmap_depth != target->depth)
812 { 804 {
805 if (pixmap)
806 XFreePixmap (target->dpy, pixmap);
813 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 807 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
814 pmap_width = new_pmap_width; 808 pmap_width = new_pmap_width;
815 pmap_height = new_pmap_height; 809 pmap_height = new_pmap_height;
816 pmap_depth = target->depth; 810 pmap_depth = target->depth;
817 } 811 }
… …
858 dst_width, dst_height, 852 dst_width, dst_height,
859 XLIB_RGB_DITHER_NONE, 853 XLIB_RGB_DITHER_NONE,
860 0, 0); 854 0, 0);
861 } 855 }
862 856
857#if XRENDER
858 if (background_flags)
859 {
860 Display *dpy = target->dpy;
861 XRenderPictureAttributes pa;
862
863 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, target->visual);
864 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
865
866 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
867 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
868
869 pa.repeat = True;
870 Pixmap mask_pmap = XCreatePixmap (dpy, target->vt, 1, 1, 8);
871 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
872 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
873 XFreePixmap (dpy, mask_pmap);
874
875 if (src && dst && mask)
876 {
877 XRenderColor mask_c;
878
879 mask_c.alpha = 0x8000;
880 mask_c.red = 0;
881 mask_c.green = 0;
882 mask_c.blue = 0;
883 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
884 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
885 }
886
887 XRenderFreePicture (dpy, src);
888 XRenderFreePicture (dpy, dst);
889 XRenderFreePicture (dpy, mask);
890
891 XFreePixmap (dpy, root_pmap);
892 }
893#endif
894
863 if (result != pixbuf) 895 if (result != pixbuf)
864 g_object_unref (result); 896 g_object_unref (result);
865 897
866 XFreeGC (target->dpy, gc); 898 XFreeGC (target->dpy, gc);
867 899
… …
873# endif /* HAVE_PIXBUF */ 905# endif /* HAVE_PIXBUF */
874 906
875bool 907bool
876bgPixmap_t::set_file (const char *file) 908bgPixmap_t::set_file (const char *file)
877{ 909{
878 assert (file); 910 if (!file || !*file)
911 return false;
879 912
880 if (*file)
881 {
882 if (const char *p = strchr (file, ';')) 913 if (const char *p = strchr (file, ';'))
883 { 914 {
884 size_t len = p - file; 915 size_t len = p - file;
885 char *f = rxvt_temp_buf<char> (len + 1); 916 char *f = rxvt_temp_buf<char> (len + 1);
886 memcpy (f, file, len); 917 memcpy (f, file, len);
887 f[len] = '\0'; 918 f[len] = '\0';
888 file = f; 919 file = f;
889 } 920 }
890 921
891# ifdef HAVE_AFTERIMAGE 922# ifdef HAVE_AFTERIMAGE
892 if (!target->asimman) 923 if (!target->asimman)
893 target->asimman = create_generic_imageman (target->rs[Rs_path]); 924 target->asimman = create_generic_imageman (target->rs[Rs_path]);
894 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 925 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
926 if (image)
927 {
895 if (original_asim) 928 if (original_asim)
929 safe_asimage_destroy (original_asim);
930 original_asim = image;
896 have_image = true; 931 have_image = true;
897 return have_image; 932 return true;
933 }
898# endif 934# endif
899 935
900# ifdef HAVE_PIXBUF 936# ifdef HAVE_PIXBUF
901 pixbuf = gdk_pixbuf_new_from_file (file, NULL); 937 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
938 if (image)
939 {
902 if (pixbuf) 940 if (pixbuf)
941 g_object_unref (pixbuf);
942 pixbuf = image;
903 have_image = true; 943 have_image = true;
904 return have_image; 944 return true;
945 }
905# endif 946# endif
906 }
907 947
908 return false; 948 return false;
909} 949}
910 950
911# endif /* BG_IMAGE_FROM_FILE */ 951# endif /* BG_IMAGE_FROM_FILE */
… …
924} 964}
925 965
926bool 966bool
927bgPixmap_t::set_blur_radius (const char *geom) 967bgPixmap_t::set_blur_radius (const char *geom)
928{ 968{
929 int changed = 0; 969 bool changed = false;
930 unsigned int hr, vr; 970 unsigned int hr, vr;
931 int junk; 971 int junk;
932 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 972 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
933 973
934 if (!(geom_flags & WidthValue)) 974 if (!(geom_flags & WidthValue))
935 hr = 1; 975 hr = 1;
936 if (!(geom_flags & HeightValue)) 976 if (!(geom_flags & HeightValue))
937 vr = hr; 977 vr = hr;
938 978
979 min_it (hr, 128);
980 min_it (vr, 128);
981
939 if (h_blurRadius != hr) 982 if (h_blurRadius != hr)
940 { 983 {
941 ++changed; 984 changed = true;
942 h_blurRadius = hr; 985 h_blurRadius = hr;
943 } 986 }
944 987
945 if (v_blurRadius != vr) 988 if (v_blurRadius != vr)
946 { 989 {
947 ++changed; 990 changed = true;
948 v_blurRadius = vr; 991 v_blurRadius = vr;
949 } 992 }
950 993
951 if (v_blurRadius == 0 && h_blurRadius == 0) 994 if (v_blurRadius == 0 && h_blurRadius == 0)
952 flags &= ~blurNeeded; 995 flags &= ~blurNeeded;
953 else 996 else
954 flags |= blurNeeded; 997 flags |= blurNeeded;
955 998
956 return (changed > 0); 999 return changed;
957} 1000}
958 1001
959static inline unsigned long 1002static inline unsigned long
960compute_tint_shade_flags (rxvt_color *tint, int shade) 1003compute_tint_shade_flags (rxvt_color *tint, int shade)
961{ 1004{
962 unsigned long flags = 0; 1005 unsigned long flags = 0;
963 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1006 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
964 bool has_shade = (shade > 0 && shade < 100) || (shade > 100 && shade < 200); 1007 bool has_shade = shade != 100;
965 1008
966 if (tint) 1009 if (tint)
967 { 1010 {
968 tint->get (c); 1011 tint->get (c);
969# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 1012# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
… …
983 { 1026 {
984 flags |= bgPixmap_t::tintNeeded; 1027 flags |= bgPixmap_t::tintNeeded;
985 } 1028 }
986 } 1029 }
987 1030
988 if (flags & bgPixmap_t::tintNeeded)
989 {
990 if (flags & bgPixmap_t::tintWholesome)
991 flags |= bgPixmap_t::tintServerSide;
992 else
993 {
994#if XFT
995 flags |= bgPixmap_t::tintServerSide;
996#endif
997 }
998 }
999
1000 return flags; 1031 return flags;
1001} 1032}
1002 1033
1003bool 1034bool
1004bgPixmap_t::set_tint (rxvt_color &new_tint) 1035bgPixmap_t::set_tint (rxvt_color &new_tint)
1005{ 1036{
1006 if (tint != new_tint) 1037 if (!(flags & tintSet) || tint != new_tint)
1007 { 1038 {
1008 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1039 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
1009 tint = new_tint; 1040 tint = new_tint;
1010 flags = (flags & ~tintFlags) | new_flags | tintSet; 1041 flags = (flags & ~tintFlags) | new_flags | tintSet;
1011 return true; 1042 return true;
… …
1029} 1060}
1030 1061
1031bool 1062bool
1032bgPixmap_t::set_shade (const char *shade_str) 1063bgPixmap_t::set_shade (const char *shade_str)
1033{ 1064{
1034 int new_shade = (shade_str) ? atoi (shade_str) : 0; 1065 int new_shade = (shade_str) ? atoi (shade_str) : 100;
1035 1066
1036 if (new_shade < 0 && new_shade > -100) 1067 clamp_it (new_shade, -100, 200);
1068 if (new_shade < 0)
1037 new_shade = 200 - (100 + new_shade); 1069 new_shade = 200 - (100 + new_shade);
1038 else if (new_shade == 100)
1039 new_shade = 0;
1040 1070
1041 if (new_shade != shade) 1071 if (new_shade != shade)
1042 { 1072 {
1043 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 1073 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
1044 shade = new_shade; 1074 shade = new_shade;
… …
1047 } 1077 }
1048 1078
1049 return false; 1079 return false;
1050} 1080}
1051 1081
1082#if XRENDER
1083static void
1084get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1085{
1086 double sigma = radius / 2.0;
1087 double scale = sqrt (2.0 * M_PI) * sigma;
1088 double sum = 0.0;
1089
1090 for (int i = 0; i < width; i++)
1091 {
1092 double x = i - width / 2;
1093 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1094 sum += kernel[i];
1095 }
1096
1097 params[0] = XDoubleToFixed (width);
1098 params[1] = XDoubleToFixed (1);
1099
1100 for (int i = 0; i < width; i++)
1101 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1102}
1103#endif
1104
1052bool 1105bool
1053bgPixmap_t::tint_pixmap (Pixmap pixmap) 1106bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1054{ 1107{
1055 Window root = target->display->root; 1108 bool ret = false;
1109#if XRENDER
1110 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1111 double *kernel = (double *)malloc (size * sizeof (double));
1112 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1113
1056 Display *dpy = target->dpy; 1114 Display *dpy = target->dpy;
1057 int window_width = target->szHint.width; 1115 XRenderPictureAttributes pa;
1058 int window_height = target->szHint.height; 1116 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1117
1118 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1119 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1120
1121 if (kernel && params && src && dst)
1122 {
1123 if (h_blurRadius)
1124 {
1125 size = h_blurRadius * 2 + 1;
1126 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1127
1128 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1129 XRenderComposite (dpy,
1130 PictOpSrc,
1131 src,
1132 None,
1133 dst,
1134 0, 0,
1135 0, 0,
1136 0, 0,
1137 width, height);
1138 }
1139
1140 if (v_blurRadius)
1141 {
1142 size = v_blurRadius * 2 + 1;
1143 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1144 swap (params[0], params[1]);
1145
1146 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1147 XRenderComposite (dpy,
1148 PictOpSrc,
1149 src,
1150 None,
1151 dst,
1152 0, 0,
1153 0, 0,
1154 0, 0,
1155 width, height);
1156 }
1157
1158 ret = true;
1159 }
1160
1161 free (kernel);
1162 free (params);
1163 XRenderFreePicture (dpy, src);
1164 XRenderFreePicture (dpy, dst);
1165#endif
1166 return ret;
1167}
1168
1169bool
1170bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1171{
1172 Display *dpy = target->dpy;
1059 bool ret = false; 1173 bool ret = false;
1060 1174
1061 if (flags & tintWholesome) 1175 if (flags & tintWholesome)
1062 { 1176 {
1063 XGCValues gcv; 1177 XGCValues gcv;
… …
1067 * performance improvements, as we eliminate XImage transfer 1181 * performance improvements, as we eliminate XImage transfer
1068 */ 1182 */
1069 gcv.foreground = Pixel (tint); 1183 gcv.foreground = Pixel (tint);
1070 gcv.function = GXand; 1184 gcv.function = GXand;
1071 gcv.fill_style = FillSolid; 1185 gcv.fill_style = FillSolid;
1072 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv); 1186 gc = XCreateGC (dpy, pixmap, GCFillStyle | GCForeground | GCFunction, &gcv);
1073 if (gc) 1187 if (gc)
1074 { 1188 {
1075 XFillRectangle (dpy, pixmap, gc, 0, 0, window_width, window_height); 1189 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1076 ret = true; 1190 ret = true;
1077 XFreeGC (dpy, gc); 1191 XFreeGC (dpy, gc);
1078 } 1192 }
1079 } 1193 }
1080 else 1194 else
1081 { 1195 {
1082# if XFT 1196# if XRENDER
1083 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1197 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1084 1198
1085 if (flags & tintSet) 1199 if (flags & tintSet)
1086 tint.get (c); 1200 tint.get (c);
1087 1201
1088 if (shade > 0 && shade < 100) 1202 if (shade <= 100)
1089 { 1203 {
1090 c.r = (c.r * shade) / 100; 1204 c.r = (c.r * shade) / 100;
1091 c.g = (c.g * shade) / 100; 1205 c.g = (c.g * shade) / 100;
1092 c.b = (c.b * shade) / 100; 1206 c.b = (c.b * shade) / 100;
1093 } 1207 }
1094 else if (shade > 100 && shade < 200) 1208 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 } 1209 {
1210 c.r = ((0xffff - c.r) * (200 - shade)) / 100;
1211 c.g = ((0xffff - c.g) * (200 - shade)) / 100;
1212 c.b = ((0xffff - c.b) * (200 - shade)) / 100;
1213 }
1100 1214
1101 XRenderPictFormat pf; 1215 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, 1216 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; 1217 XRenderPictureAttributes pa;
1120 1218
1121 Picture back_pic = XRenderCreatePicture (dpy, pixmap, root_format, 0, &pa); 1219 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1122 1220
1123 pa.repeat = True; 1221 pa.repeat = True;
1124 1222
1125 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32); 1223 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1126 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa); 1224 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1127 XFreePixmap (dpy, overlay_pmap); 1225 XFreePixmap (dpy, overlay_pmap);
1128 1226
1129 pa.component_alpha = True; 1227 pa.component_alpha = True;
1130 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32); 1228 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1131 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa); 1229 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1132 XFreePixmap (dpy, mask_pmap); 1230 XFreePixmap (dpy, mask_pmap);
1133 1231
1134 if (mask_pic && overlay_pic && back_pic) 1232 if (mask_pic && overlay_pic && back_pic)
1135 { 1233 {
1136 XRenderColor mask_c; 1234 XRenderColor mask_c;
1137 1235
1138 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); 1236 mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0;
1139 mask_c.alpha = 0xffff; 1237 mask_c.alpha = 0xffff;
1140 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1238 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1141 1239
1142 mask_c.alpha = 0; 1240 mask_c.alpha = 0;
1143 mask_c.red = 0xffff - c.r; 1241 mask_c.red = 0xffff - c.r;
1144 mask_c.green = 0xffff - c.g; 1242 mask_c.green = 0xffff - c.g;
1145 mask_c.blue = 0xffff - c.b; 1243 mask_c.blue = 0xffff - c.b;
1146 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1244 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); 1245 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1148 ret = true; 1246 ret = true;
1149 } 1247 }
1150 1248
1151 XRenderFreePicture (dpy, mask_pic); 1249 XRenderFreePicture (dpy, mask_pic);
1152 XRenderFreePicture (dpy, overlay_pic); 1250 XRenderFreePicture (dpy, overlay_pic);
1153 XRenderFreePicture (dpy, back_pic); 1251 XRenderFreePicture (dpy, back_pic);
1154# if DO_TIMING_TEST
1155 XSync (dpy, False);
1156# endif
1157# endif 1252# endif
1158 } 1253 }
1159 1254
1160 return ret; 1255 return ret;
1161} 1256}
1162 1257
1163/* make_transparency_pixmap() 1258/* make_transparency_pixmap()
1164 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1259 * Builds a pixmap of the same size as the terminal window that contains
1165 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 1260 * the tiled portion of the root pixmap that is supposed to be covered by
1166 * our window. 1261 * our window.
1167 */ 1262 */
1168unsigned long 1263unsigned long
1169bgPixmap_t::make_transparency_pixmap () 1264bgPixmap_t::make_transparency_pixmap ()
1170{ 1265{
… …
1174 return 0; 1269 return 0;
1175 1270
1176 /* root dimensions may change from call to call - but Display structure should 1271 /* root dimensions may change from call to call - but Display structure should
1177 * be always up-to-date, so let's use it : 1272 * be always up-to-date, so let's use it :
1178 */ 1273 */
1179 Window root = target->display->root;
1180 int screen = target->display->screen; 1274 int screen = target->display->screen;
1181 Display *dpy = target->dpy; 1275 Display *dpy = target->dpy;
1276 int root_depth = DefaultDepth (dpy, screen);
1182 int root_width = DisplayWidth (dpy, screen); 1277 int root_width = DisplayWidth (dpy, screen);
1183 int root_height = DisplayHeight (dpy, screen); 1278 int root_height = DisplayHeight (dpy, screen);
1184 unsigned int root_pmap_width, root_pmap_height; 1279 unsigned int root_pmap_width, root_pmap_height;
1185 int window_width = target->szHint.width; 1280 int window_width = target->szHint.width;
1186 int window_height = target->szHint.height; 1281 int window_height = target->szHint.height;
1187 int sx, sy; 1282 int sx, sy;
1188 XGCValues gcv; 1283 XGCValues gcv;
1284 GC gc;
1189 1285
1190 TIMING_TEST_START (tp);
1191 target->get_window_origin (sx, sy); 1286 target->get_window_origin (sx, sy);
1192 1287
1193 /* check if we are outside of the visible part of the virtual screen : */ 1288 /* check if we are outside of the visible part of the virtual screen : */
1194 if (sx + window_width <= 0 || sy + window_height <= 0 1289 if (sx + window_width <= 0 || sy + window_height <= 0
1195 || sx >= root_width || sy >= root_height) 1290 || sx >= root_width || sy >= root_height)
1196 return 0; 1291 return 0;
1197 1292
1293 // validate root pixmap and get its size
1198 if (root_pixmap != None) 1294 if (root_pixmap != None)
1199 { 1295 {
1200 /* we want to validate the pixmap and get it's size at the same time : */ 1296 Window wdummy;
1201 int junk; 1297 int idummy;
1202 unsigned int ujunk; 1298 unsigned int udummy;
1203 /* root pixmap may be bad - allow a error */ 1299
1204 target->allowedxerror = -1; 1300 target->allowedxerror = -1;
1205 1301
1206 if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk)) 1302 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy))
1207 root_pixmap = None; 1303 root_pixmap = None;
1208 1304
1209 target->allowedxerror = 0; 1305 target->allowedxerror = 0;
1210 } 1306 }
1211 1307
1308 Pixmap recoded_root_pmap = root_pixmap;
1309
1310 if (root_pixmap != None && root_depth != target->depth)
1311 {
1312#if XRENDER
1313 if (flags & HAS_RENDER)
1314 {
1315 XRenderPictureAttributes pa;
1316
1317 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1318 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1319
1320 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
1321 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
1322 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1323
1324 if (src && dst)
1325 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1326 else
1327 {
1328 XFreePixmap (dpy, recoded_root_pmap);
1329 root_pixmap = None;
1330 }
1331
1332 XRenderFreePicture (dpy, src);
1333 XRenderFreePicture (dpy, dst);
1334 }
1335 else
1336#endif
1337 root_pixmap = None;
1338 }
1339
1340 if (root_pixmap == None)
1341 return 0;
1342
1212 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1343 Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth);
1213 GC gc = NULL;
1214 1344
1215 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1345 if (tiled_root_pmap == None) /* something really bad happened - abort */
1216 return 0; 1346 return 0;
1217 1347
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 */ 1348 /* straightforward pixmap copy */
1276 gcv.tile = root_pixmap; 1349 gcv.tile = recoded_root_pmap;
1277 gcv.fill_style = FillTiled; 1350 gcv.fill_style = FillTiled;
1278 1351
1279 while (sx < 0) sx += (int)root_width; 1352 while (sx < 0) sx += (int)root_width;
1280 while (sy < 0) sy += (int)root_height; 1353 while (sy < 0) sy += (int)root_height;
1281 1354
1282 gcv.ts_x_origin = -sx; 1355 gcv.ts_x_origin = -sx;
1283 gcv.ts_y_origin = -sy; 1356 gcv.ts_y_origin = -sy;
1284 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1357 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1285 1358
1286 if (gc) 1359 if (gc)
1287 { 1360 {
1288 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1361 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1289 result |= transpPmapTiled; 1362 result |= transpPmapTiled;
1290 } 1363 XFreeGC (dpy, gc);
1291 }
1292 TIMING_TEST_PRINT_RESULT (tp);
1293 1364
1294 if (tiled_root_pmap != None)
1295 {
1296 if (!need_client_side_rendering ()) 1365 if (!need_client_side_rendering ())
1297 { 1366 {
1367 if ((flags & blurNeeded)
1368 && (flags & HAS_RENDER_CONV))
1369 {
1370 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1371 result |= transpPmapBlurred;
1372 }
1298 if ((flags & tintNeeded)) 1373 if ((flags & tintNeeded)
1374 && (flags & (tintWholesome | HAS_RENDER)))
1299 { 1375 {
1300 if (tint_pixmap (tiled_root_pmap)) 1376 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1301 result |= transpPmapTinted; 1377 result |= transpPmapTinted;
1302 } 1378 }
1303 } /* server side rendering completed */ 1379 } /* server side rendering completed */
1304 1380
1305 if (pixmap) 1381 if (pixmap)
1306 XFreePixmap (dpy, pixmap); 1382 XFreePixmap (dpy, pixmap);
1307 1383
1308 pixmap = tiled_root_pmap; 1384 pixmap = tiled_root_pmap;
1309 pmap_width = window_width; 1385 pmap_width = window_width;
1310 pmap_height = window_height; 1386 pmap_height = window_height;
1311 pmap_depth = root_depth; 1387 pmap_depth = target->depth;
1312 } 1388 }
1389 else
1390 XFreePixmap (dpy, tiled_root_pmap);
1313 1391
1314 if (gc) 1392 if (recoded_root_pmap != root_pixmap)
1315 XFreeGC (dpy, gc); 1393 XFreePixmap (dpy, recoded_root_pmap);
1316
1317 TIMING_TEST_PRINT_RESULT (tp);
1318 1394
1319 return result; 1395 return result;
1320} 1396}
1321 1397
1322bool 1398void
1323bgPixmap_t::set_root_pixmap () 1399bgPixmap_t::set_root_pixmap ()
1324{ 1400{
1325 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1401 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1326 if (new_root_pixmap == None) 1402 if (new_root_pixmap == None)
1327 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1403 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1328 1404
1329 if (new_root_pixmap != root_pixmap)
1330 {
1331 root_pixmap = new_root_pixmap; 1405 root_pixmap = new_root_pixmap;
1332 return true;
1333 }
1334
1335 return false;
1336} 1406}
1337# endif /* ENABLE_TRANSPARENCY */ 1407# endif /* ENABLE_TRANSPARENCY */
1338 1408
1339# ifndef HAVE_AFTERIMAGE 1409#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1340static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm); 1410static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c);
1341# endif 1411# endif
1342 1412
1343bool 1413bool
1344bgPixmap_t::render () 1414bgPixmap_t::render ()
1345{ 1415{
1346 unsigned long background_flags = 0; 1416 unsigned long background_flags = 0;
1347 1417
1348 if (target == NULL) 1418 if (target == NULL)
1349 return false; 1419 return false;
1350
1351 TIMING_TEST_START (tp);
1352 1420
1353 invalidate (); 1421 invalidate ();
1354# ifdef ENABLE_TRANSPARENCY 1422# ifdef ENABLE_TRANSPARENCY
1355 if (flags & isTransparent) 1423 if (flags & isTransparent)
1356 { 1424 {
1357 /* we need to re-generate transparency pixmap in that case ! */ 1425 /* we need to re-generate transparency pixmap in that case ! */
1358 background_flags = make_transparency_pixmap (); 1426 background_flags = make_transparency_pixmap ();
1359 if (background_flags == 0) 1427 if (background_flags == 0)
1360 return false; 1428 return false;
1361 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1429 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1362 && pmap_depth == target->depth)
1363 flags = flags & ~isInvalid; 1430 flags = flags & ~isInvalid;
1364 } 1431 }
1365# endif 1432# endif
1366 1433
1367# ifdef BG_IMAGE_FROM_FILE 1434# ifdef BG_IMAGE_FROM_FILE
… …
1371 if (render_image (background_flags)) 1438 if (render_image (background_flags))
1372 flags = flags & ~isInvalid; 1439 flags = flags & ~isInvalid;
1373 } 1440 }
1374# endif 1441# endif
1375 1442
1443# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1376 XImage *result = NULL; 1444 XImage *result = NULL;
1377 1445
1378 if (background_flags && (flags & isInvalid)) 1446 if (background_flags && (flags & isInvalid))
1379 { 1447 {
1380 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1448 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1381 } 1449 }
1382 1450
1383 if (result) 1451 if (result)
1384 { 1452 {
1385# if !defined(HAVE_AFTERIMAGE) && !XFT
1386 /* our own client-side tinting */ 1453 /* our own client-side tinting */
1387 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1388 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1389 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1454 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1390 { 1455 {
1391 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1456 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1392 if (flags & tintSet) 1457 if (flags & tintSet)
1393 tint.get (c); 1458 tint.get (c);
1394 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1459 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1395 } 1460 }
1396# endif
1397 1461
1398 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1462 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1399 1463
1400 if (gc) 1464 if (gc)
1401 { 1465 {
1402 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1403 {
1404 XFreePixmap (target->dpy, pixmap);
1405 pixmap = None;
1406 }
1407
1408 if (pixmap == None)
1409 {
1410 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1411 pmap_width = result->width;
1412 pmap_height = result->height;
1413 pmap_depth = target->depth;
1414 }
1415
1416 if (pmap_depth != result->depth)
1417 {
1418 /* Bad Match error will ensue ! stupid X !!!! */
1419 if (result->depth == 24 && pmap_depth == 32)
1420 result->depth = 32;
1421 else if (result->depth == 32 && pmap_depth == 24)
1422 result->depth = 24;
1423 else
1424 {
1425 /* TODO: implement image recoding */
1426 }
1427 }
1428
1429 if (pmap_depth == result->depth)
1430 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1466 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1431 1467
1432 XFreeGC (target->dpy, gc); 1468 XFreeGC (target->dpy, gc);
1433 flags = flags & ~isInvalid; 1469 flags = flags & ~isInvalid;
1434 } 1470 }
1435 1471
1436 XDestroyImage (result); 1472 XDestroyImage (result);
1437 } 1473 }
1474# endif
1438 1475
1439 if (flags & isInvalid) 1476 if (flags & isInvalid)
1440 { 1477 {
1441 if (pixmap != None) 1478 if (pixmap != None)
1442 { 1479 {
… …
1445 } 1482 }
1446 } 1483 }
1447 1484
1448 apply (); 1485 apply ();
1449 1486
1450 XSync (target->dpy, False);
1451 valid_since = ev::now (); 1487 valid_since = ev::now ();
1452 1488
1453 TIMING_TEST_PRINT_RESULT (tp);
1454
1455 return true; 1489 return true;
1456} 1490}
1457 1491
1458bool 1492void
1459bgPixmap_t::set_target (rxvt_term *new_target) 1493bgPixmap_t::set_target (rxvt_term *new_target)
1460{ 1494{
1461 if (new_target)
1462 if (target != new_target)
1463 {
1464 target = new_target; 1495 target = new_target;
1465# ifdef ENABLE_TRANSPARENCY 1496
1466 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1497 flags &= ~(HAS_RENDER | HAS_RENDER_CONV);
1498#if XRENDER
1499 int major, minor;
1500 if (XRenderQueryVersion (target->dpy, &major, &minor))
1501 flags |= HAS_RENDER;
1502 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1503 if (filters)
1504 {
1505 for (int i = 0; i < filters->nfilter; i++)
1506 if (!strcmp (filters->filter[i], FilterConvolution))
1507 flags |= HAS_RENDER_CONV;
1508
1509 XFree (filters);
1510 }
1467# endif 1511#endif
1468 return true;
1469 }
1470
1471 return false;
1472} 1512}
1473 1513
1474void 1514void
1475bgPixmap_t::apply () 1515bgPixmap_t::apply ()
1476{ 1516{
1477 if (target) 1517 if (target == NULL)
1478 { 1518 return;
1479 flags &= ~isVtOrigin;
1480 1519
1481 if (pixmap != None) 1520 if (pixmap != None)
1482 { 1521 {
1483 /* set target's background to pixmap */ 1522 /* set target's background to pixmap */
1484# ifdef ENABLE_TRANSPARENCY 1523# ifdef ENABLE_TRANSPARENCY
1485 if (flags & isTransparent) 1524 if (flags & isTransparent)
1486 { 1525 {
1487 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1526 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1488 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1527 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1489 1528
1490 if (target->scrollBar.win) 1529 if (target->scrollBar.win)
1491 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1530 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1492 } 1531 }
1493 else 1532 else
1494# endif 1533# endif
1495 { 1534 {
1496 flags |= isVtOrigin;
1497 /* force old pixmap dereference in case it was transparent before :*/ 1535 /* force old pixmap dereference in case it was transparent before :*/
1498 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1499 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1500 /* do we also need to set scrollbar's background here ? */
1501
1502 if (target->scrollBar.win)
1503 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1504 }
1505 }
1506 else
1507 {
1508 /* set target background to a pixel */
1509 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1536 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1510 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1537 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1511 /* do we also need to set scrollbar's background here ? */ 1538 /* do we also need to set scrollbar's background here ? */
1539
1512 if (target->scrollBar.win) 1540 if (target->scrollBar.win)
1513 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1541 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1514 } 1542 }
1543 }
1544 else
1545 {
1546 /* set target background to a pixel */
1547 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1548 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1549 /* do we also need to set scrollbar's background here ? */
1550 if (target->scrollBar.win)
1551 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1552 }
1515 1553
1516 /* don't want Expose on the parent or vt. It is better to use 1554 /* don't want Expose on the parent or vt. It is better to use
1517 scr_touch or we get a great deal of flicker otherwise: */ 1555 scr_touch or we get a great deal of flicker otherwise: */
1518 XClearWindow (target->dpy, target->parent[0]); 1556 XClearWindow (target->dpy, target->parent[0]);
1519 1557
1520 if (target->scrollBar.state && target->scrollBar.win) 1558 if (target->scrollBar.state && target->scrollBar.win)
1521 { 1559 {
1522 target->scrollBar.state = STATE_IDLE; 1560 target->scrollBar.state = STATE_IDLE;
1523 target->scrollBar.show (0); 1561 target->scrollBar.show (0);
1524 } 1562 }
1525 1563
1526 target->want_refresh = 1; 1564 target->want_refresh = 1;
1527 flags |= hasChanged; 1565 flags |= hasChanged;
1528 }
1529} 1566}
1530 1567
1531#endif /* HAVE_BG_PIXMAP */ 1568#endif /* HAVE_BG_PIXMAP */
1532 1569
1533#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1570#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1534/* taken from aterm-0.4.2 */ 1571/* taken from aterm-0.4.2 */
1535 1572
1536typedef uint32_t RUINT32T;
1537
1538static void 1573static void
1539ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm) 1574ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c)
1540{ 1575{
1541 int sh_r, sh_g, sh_b; 1576 int sh_r, sh_g, sh_b;
1542 RUINT32T mask_r, mask_g, mask_b; 1577 uint32_t mask_r, mask_g, mask_b;
1543 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1578 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1544 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1579 rgba low;
1545 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1580 rgba high;
1546 int i; 1581 int i;
1582 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1547 1583
1548 Visual *visual = term->visual;
1549
1550 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1584 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1551
1552 if (shade == 0)
1553 shade = 100;
1554 1585
1555 /* for convenience */ 1586 /* for convenience */
1556 mask_r = visual->red_mask; 1587 mask_r = visual->red_mask;
1557 mask_g = visual->green_mask; 1588 mask_g = visual->green_mask;
1558 mask_b = visual->blue_mask; 1589 mask_b = visual->blue_mask;
1559 1590
1560 /* boring lookup table pre-initialization */ 1591 /* boring lookup table pre-initialization */
1561 switch (srcImage->bits_per_pixel) { 1592 switch (srcImage->depth)
1593 {
1562 case 15: 1594 case 15:
1563 if ((mask_r != 0x7c00) || 1595 if ((mask_r != 0x7c00) ||
1564 (mask_g != 0x03e0) || 1596 (mask_g != 0x03e0) ||
1565 (mask_b != 0x001f)) 1597 (mask_b != 0x001f))
1566 return; 1598 return;
1567 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1599 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32));
1568 lookup_r = lookup; 1600 lookup_r = lookup;
1569 lookup_g = lookup+32; 1601 lookup_g = lookup+32;
1570 lookup_b = lookup+32+32; 1602 lookup_b = lookup+32+32;
1571 sh_r = 10; 1603 sh_r = 10;
1572 sh_g = 5; 1604 sh_g = 5;
1573 sh_b = 0; 1605 sh_b = 0;
1574 break; 1606 break;
1575 case 16: 1607 case 16:
1576 if ((mask_r != 0xf800) || 1608 if ((mask_r != 0xf800) ||
1577 (mask_g != 0x07e0) || 1609 (mask_g != 0x07e0) ||
1578 (mask_b != 0x001f)) 1610 (mask_b != 0x001f))
1579 return; 1611 return;
1580 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1612 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1581 lookup_r = lookup; 1613 lookup_r = lookup;
1582 lookup_g = lookup+32; 1614 lookup_g = lookup+32;
1583 lookup_b = lookup+32+64; 1615 lookup_b = lookup+32+64;
1584 sh_r = 11; 1616 sh_r = 11;
1585 sh_g = 5; 1617 sh_g = 5;
1586 sh_b = 0; 1618 sh_b = 0;
1587 break; 1619 break;
1588 case 24: 1620 case 24:
1589 if ((mask_r != 0xff0000) || 1621 if ((mask_r != 0xff0000) ||
1590 (mask_g != 0x00ff00) || 1622 (mask_g != 0x00ff00) ||
1591 (mask_b != 0x0000ff)) 1623 (mask_b != 0x0000ff))
1592 return; 1624 return;
1593 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1625 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1594 lookup_r = lookup; 1626 lookup_r = lookup;
1595 lookup_g = lookup+256; 1627 lookup_g = lookup+256;
1596 lookup_b = lookup+256+256; 1628 lookup_b = lookup+256+256;
1597 sh_r = 16; 1629 sh_r = 16;
1598 sh_g = 8; 1630 sh_g = 8;
1599 sh_b = 0; 1631 sh_b = 0;
1600 break; 1632 break;
1601 case 32: 1633 case 32:
1602 if ((mask_r != 0xff0000) || 1634 if ((mask_r != 0xff0000) ||
1603 (mask_g != 0x00ff00) || 1635 (mask_g != 0x00ff00) ||
1604 (mask_b != 0x0000ff)) 1636 (mask_b != 0x0000ff))
1605 return; 1637 return;
1606 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1638 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1607 lookup_r = lookup; 1639 lookup_r = lookup;
1608 lookup_g = lookup+256; 1640 lookup_g = lookup+256;
1609 lookup_b = lookup+256+256; 1641 lookup_b = lookup+256+256;
1610 sh_r = 16; 1642 sh_r = 16;
1611 sh_g = 8; 1643 sh_g = 8;
1612 sh_b = 0; 1644 sh_b = 0;
1613 break; 1645 break;
1614 default: 1646 default:
1615 return; /* we do not support this color depth */ 1647 return; /* we do not support this color depth */
1616 } 1648 }
1617 1649
1618 /* prepare limits for color transformation (each channel is handled separately) */ 1650 /* prepare limits for color transformation (each channel is handled separately) */
1619 if (shade < 0) { 1651 if (shade > 100)
1652 {
1620 shade = -shade; 1653 shade = 200 - shade;
1621 if (shade < 0) shade = 0;
1622 if (shade > 100) shade = 100;
1623 1654
1624 lower_lim_r = 65535-rm; 1655 high.r = (65535 - c.r) * shade / 100;
1625 lower_lim_g = 65535-gm; 1656 high.g = (65535 - c.g) * shade / 100;
1626 lower_lim_b = 65535-bm; 1657 high.b = (65535 - c.b) * shade / 100;
1627 1658
1628 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1659 low.r = 65535 - high.r;
1629 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1660 low.g = 65535 - high.g;
1630 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1661 low.b = 65535 - high.b;
1631
1632 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1633 } else {
1634 if (shade < 0) shade = 0;
1635 if (shade > 100) shade = 100;
1636
1637 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1638
1639 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1640 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1641 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1642 } 1662 }
1643 1663 else
1644 /* 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 ))
1646 { 1664 {
1647 unsigned int tmp; 1665 high.r = c.r * shade / 100;
1666 high.g = c.g * shade / 100;
1667 high.b = c.b * shade / 100;
1648 1668
1649 tmp = lower_lim_r; 1669 low.r = low.g = low.b = 0;
1650 lower_lim_r = lower_lim_b;
1651 lower_lim_b = tmp;
1652
1653 tmp = upper_lim_r;
1654 upper_lim_r = upper_lim_b;
1655 upper_lim_b = tmp;
1656 } 1670 }
1657 1671
1658 /* fill our lookup tables */ 1672 /* fill our lookup tables */
1659 for (i = 0; i <= mask_r>>sh_r; i++) 1673 for (i = 0; i <= mask_r>>sh_r; i++)
1660 { 1674 {
1661 RUINT32T tmp; 1675 uint32_t tmp;
1662 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1676 tmp = i * high.r;
1663 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1677 tmp += (mask_r>>sh_r) * low.r;
1664 lookup_r[i] = (tmp/65535)<<sh_r; 1678 lookup_r[i] = (tmp/65535)<<sh_r;
1665 } 1679 }
1666 for (i = 0; i <= mask_g>>sh_g; i++) 1680 for (i = 0; i <= mask_g>>sh_g; i++)
1667 { 1681 {
1668 RUINT32T tmp; 1682 uint32_t tmp;
1669 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1683 tmp = i * high.g;
1670 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1684 tmp += (mask_g>>sh_g) * low.g;
1671 lookup_g[i] = (tmp/65535)<<sh_g; 1685 lookup_g[i] = (tmp/65535)<<sh_g;
1672 } 1686 }
1673 for (i = 0; i <= mask_b>>sh_b; i++) 1687 for (i = 0; i <= mask_b>>sh_b; i++)
1674 { 1688 {
1675 RUINT32T tmp; 1689 uint32_t tmp;
1676 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1690 tmp = i * high.b;
1677 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1691 tmp += (mask_b>>sh_b) * low.b;
1678 lookup_b[i] = (tmp/65535)<<sh_b; 1692 lookup_b[i] = (tmp/65535)<<sh_b;
1679 } 1693 }
1680 1694
1681 /* apply table to input image (replacing colors by newly calculated ones) */ 1695 /* apply table to input image (replacing colors by newly calculated ones) */
1682 switch (srcImage->bits_per_pixel) 1696 if (srcImage->bits_per_pixel == 32
1697 && (srcImage->depth == 24 || srcImage->depth == 32)
1698 && srcImage->byte_order == host_byte_order)
1683 { 1699 {
1684 case 15:
1685 {
1686 unsigned short *p1, *pf, *p, *pl; 1700 uint32_t *p1, *pf, *p, *pl;
1687 p1 = (unsigned short *) srcImage->data; 1701 p1 = (uint32_t *) srcImage->data;
1688 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1702 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1703
1689 while (p1 < pf) 1704 while (p1 < pf)
1690 { 1705 {
1691 p = p1; 1706 p = p1;
1692 pl = p1 + srcImage->width; 1707 pl = p1 + srcImage->width;
1693 for (; p < pl; p++) 1708 for (; p < pl; p++)
1694 { 1709 {
1695 *p = lookup_r[(*p & 0x7c00)>>10] |
1696 lookup_g[(*p & 0x03e0)>> 5] |
1697 lookup_b[(*p & 0x001f)];
1698 }
1699 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1700 }
1701 break;
1702 }
1703 case 16:
1704 {
1705 unsigned short *p1, *pf, *p, *pl;
1706 p1 = (unsigned short *) srcImage->data;
1707 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1708 while (p1 < pf)
1709 {
1710 p = p1;
1711 pl = p1 + srcImage->width;
1712 for (; p < pl; p++)
1713 {
1714 *p = lookup_r[(*p & 0xf800)>>11] |
1715 lookup_g[(*p & 0x07e0)>> 5] |
1716 lookup_b[(*p & 0x001f)];
1717 }
1718 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1719 }
1720 break;
1721 }
1722 case 24:
1723 {
1724 unsigned char *p1, *pf, *p, *pl;
1725 p1 = (unsigned char *) srcImage->data;
1726 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1727 while (p1 < pf)
1728 {
1729 p = p1;
1730 pl = p1 + srcImage->width * 3;
1731 for (; p < pl; p += 3)
1732 {
1733 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1734 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1735 p[2] = lookup_r[(p[2] & 0x0000ff)];
1736 }
1737 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1738 }
1739 break;
1740 }
1741 case 32:
1742 {
1743 RUINT32T *p1, *pf, *p, *pl;
1744 p1 = (RUINT32T *) srcImage->data;
1745 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1746
1747 while (p1 < pf)
1748 {
1749 p = p1;
1750 pl = p1 + srcImage->width;
1751 for (; p < pl; p++)
1752 {
1753 *p = lookup_r[(*p & 0xff0000)>>16] | 1710 *p = lookup_r[(*p & 0xff0000) >> 16] |
1754 lookup_g[(*p & 0x00ff00)>> 8] | 1711 lookup_g[(*p & 0x00ff00) >> 8] |
1755 lookup_b[(*p & 0x0000ff)] | 1712 lookup_b[(*p & 0x0000ff)] |
1756 (*p & ~0xffffff); 1713 (*p & 0xff000000);
1714 }
1715 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line);
1716 }
1717 }
1718 else
1719 {
1720 for (int y = 0; y < srcImage->height; y++)
1721 for (int x = 0; x < srcImage->width; x++)
1722 {
1723 unsigned long pixel = XGetPixel (srcImage, x, y);
1724 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1725 lookup_g[(pixel & mask_g) >> sh_g] |
1726 lookup_b[(pixel & mask_b) >> sh_b];
1727 XPutPixel (srcImage, x, y, pixel);
1757 } 1728 }
1758 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1759 } 1729 }
1760 break;
1761 }
1762 }
1763 1730
1764 free (lookup); 1731 free (lookup);
1765} 1732}
1766#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1733#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */

Diff Legend

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