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

Diff Legend

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