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.116 by sf-exg, Thu Nov 11 11:58:10 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 {
674 XGCValues gcv; 668 XGCValues gcv;
675 GC gc; 669 GC gc;
676 670
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 */ 671 /* create Pixmap */
689 if (pixmap == None) 672 if (pixmap == None
673 || pmap_width != new_pmap_width
674 || pmap_height != new_pmap_height
675 || pmap_depth != target->depth)
690 { 676 {
677 if (pixmap)
678 XFreePixmap (target->dpy, pixmap);
691 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 679 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
692 pmap_width = new_pmap_width; 680 pmap_width = new_pmap_width;
693 pmap_height = new_pmap_height; 681 pmap_height = new_pmap_height;
694 pmap_depth = target->depth; 682 pmap_depth = target->depth;
695 } 683 }
… …
719 707
720 if (result != background && result != original_asim) 708 if (result != background && result != original_asim)
721 destroy_asimage (&result); 709 destroy_asimage (&result);
722 710
723 XFreeGC (target->dpy, gc); 711 XFreeGC (target->dpy, gc);
724 TIMING_TEST_PRINT_RESULT (asim);
725 712
726 ret = true; 713 ret = true;
727 } 714 }
728 715
729 if (background) 716 if (background)
… …
741 return false; 728 return false;
742 729
743 if (!pixbuf) 730 if (!pixbuf)
744 return false; 731 return false;
745 732
746 // TODO: add alpha blending
747 if (background_flags) 733 if (background_flags
734 && !(flags & HAS_RENDER))
748 return false; 735 return false;
749 736
750 GdkPixbuf *result; 737 GdkPixbuf *result;
751 738
752 int image_width = gdk_pixbuf_get_width (pixbuf); 739 int image_width = gdk_pixbuf_get_width (pixbuf);
… …
762 int w = 0; 749 int w = 0;
763 int h = 0; 750 int h = 0;
764 751
765 get_image_geometry (image_width, image_height, w, h, x, y); 752 get_image_geometry (image_width, image_height, w, h, x, y);
766 753
754 if (!(flags & rootAlign)
767 if (x >= target_width 755 && (x >= target_width
768 || y >= target_height 756 || y >= target_height
769 || (w > 0 && x + w <= 0) 757 || (x + w <= 0)
770 || (h > 0 && y + h <= 0)) 758 || (y + h <= 0)))
771 return false; 759 return false;
772 760
773 result = pixbuf; 761 result = pixbuf;
774 762
775 if ((w > 0 && w != image_width) 763 if ((w != image_width)
776 || (h > 0 && h != image_height)) 764 || (h != image_height))
777 { 765 {
778 result = gdk_pixbuf_scale_simple (pixbuf, 766 result = gdk_pixbuf_scale_simple (pixbuf,
779 w > 0 ? w : image_width, 767 w, h,
780 h > 0 ? h : image_height,
781 GDK_INTERP_BILINEAR); 768 GDK_INTERP_BILINEAR);
782 } 769 }
783 770
784 bool ret = false; 771 bool ret = false;
785 772
786 if (result) 773 if (result)
787 { 774 {
788 XGCValues gcv; 775 XGCValues gcv;
789 GC gc; 776 GC gc;
777 Pixmap root_pmap;
790 778
791 image_width = gdk_pixbuf_get_width (result); 779 image_width = gdk_pixbuf_get_width (result);
792 image_height = gdk_pixbuf_get_height (result); 780 image_height = gdk_pixbuf_get_height (result);
793 781
782 if (background_flags)
783 {
784 root_pmap = pixmap;
785 pixmap = None;
786 }
787 else
788 {
794 if (h_scale == 0 || v_scale == 0) 789 if (h_scale == 0 || v_scale == 0)
795 { 790 {
796 new_pmap_width = min (image_width, target_width); 791 new_pmap_width = min (image_width, target_width);
797 new_pmap_height = min (image_height, target_height); 792 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 { 793 }
806 XFreePixmap (target->dpy, pixmap);
807 pixmap = None;
808 } 794 }
809 }
810 795
811 if (pixmap == None) 796 if (pixmap == None
797 || pmap_width != new_pmap_width
798 || pmap_height != new_pmap_height
799 || pmap_depth != target->depth)
812 { 800 {
801 if (pixmap)
802 XFreePixmap (target->dpy, pixmap);
813 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 803 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
814 pmap_width = new_pmap_width; 804 pmap_width = new_pmap_width;
815 pmap_height = new_pmap_height; 805 pmap_height = new_pmap_height;
816 pmap_depth = target->depth; 806 pmap_depth = target->depth;
817 } 807 }
… …
858 dst_width, dst_height, 848 dst_width, dst_height,
859 XLIB_RGB_DITHER_NONE, 849 XLIB_RGB_DITHER_NONE,
860 0, 0); 850 0, 0);
861 } 851 }
862 852
853#if XRENDER
854 if (background_flags)
855 {
856 Display *dpy = target->dpy;
857 XRenderPictureAttributes pa;
858
859 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, target->visual);
860 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
861
862 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
863 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
864
865 pa.repeat = True;
866 Pixmap mask_pmap = XCreatePixmap (dpy, target->vt, 1, 1, 8);
867 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
868 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
869 XFreePixmap (dpy, mask_pmap);
870
871 if (src && dst && mask)
872 {
873 XRenderColor mask_c;
874
875 mask_c.alpha = 0x8000;
876 mask_c.red = 0;
877 mask_c.green = 0;
878 mask_c.blue = 0;
879 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
880 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
881 }
882
883 XRenderFreePicture (dpy, src);
884 XRenderFreePicture (dpy, dst);
885 XRenderFreePicture (dpy, mask);
886
887 XFreePixmap (dpy, root_pmap);
888 }
889#endif
890
863 if (result != pixbuf) 891 if (result != pixbuf)
864 g_object_unref (result); 892 g_object_unref (result);
865 893
866 XFreeGC (target->dpy, gc); 894 XFreeGC (target->dpy, gc);
867 895
… …
873# endif /* HAVE_PIXBUF */ 901# endif /* HAVE_PIXBUF */
874 902
875bool 903bool
876bgPixmap_t::set_file (const char *file) 904bgPixmap_t::set_file (const char *file)
877{ 905{
878 assert (file); 906 if (!file || !*file)
907 return false;
879 908
880 if (*file)
881 {
882 if (const char *p = strchr (file, ';')) 909 if (const char *p = strchr (file, ';'))
883 { 910 {
884 size_t len = p - file; 911 size_t len = p - file;
885 char *f = rxvt_temp_buf<char> (len + 1); 912 char *f = rxvt_temp_buf<char> (len + 1);
886 memcpy (f, file, len); 913 memcpy (f, file, len);
887 f[len] = '\0'; 914 f[len] = '\0';
888 file = f; 915 file = f;
889 } 916 }
890 917
891# ifdef HAVE_AFTERIMAGE 918# ifdef HAVE_AFTERIMAGE
892 if (!target->asimman) 919 if (!target->asimman)
893 target->asimman = create_generic_imageman (target->rs[Rs_path]); 920 target->asimman = create_generic_imageman (target->rs[Rs_path]);
894 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 921 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
922 if (image)
923 {
895 if (original_asim) 924 if (original_asim)
925 safe_asimage_destroy (original_asim);
926 original_asim = image;
896 have_image = true; 927 have_image = true;
897 return have_image; 928 return true;
929 }
898# endif 930# endif
899 931
900# ifdef HAVE_PIXBUF 932# ifdef HAVE_PIXBUF
901 pixbuf = gdk_pixbuf_new_from_file (file, NULL); 933 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
934 if (image)
935 {
902 if (pixbuf) 936 if (pixbuf)
937 g_object_unref (pixbuf);
938 pixbuf = image;
903 have_image = true; 939 have_image = true;
904 return have_image; 940 return true;
941 }
905# endif 942# endif
906 }
907 943
908 return false; 944 return false;
909} 945}
910 946
911# endif /* BG_IMAGE_FROM_FILE */ 947# endif /* BG_IMAGE_FROM_FILE */
… …
924} 960}
925 961
926bool 962bool
927bgPixmap_t::set_blur_radius (const char *geom) 963bgPixmap_t::set_blur_radius (const char *geom)
928{ 964{
929 int changed = 0; 965 bool changed = false;
930 unsigned int hr, vr; 966 unsigned int hr, vr;
931 int junk; 967 int junk;
932 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 968 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
933 969
934 if (!(geom_flags & WidthValue)) 970 if (!(geom_flags & WidthValue))
935 hr = 1; 971 hr = 1;
936 if (!(geom_flags & HeightValue)) 972 if (!(geom_flags & HeightValue))
937 vr = hr; 973 vr = hr;
938 974
975 min_it (hr, 128);
976 min_it (vr, 128);
977
939 if (h_blurRadius != hr) 978 if (h_blurRadius != hr)
940 { 979 {
941 ++changed; 980 changed = true;
942 h_blurRadius = hr; 981 h_blurRadius = hr;
943 } 982 }
944 983
945 if (v_blurRadius != vr) 984 if (v_blurRadius != vr)
946 { 985 {
947 ++changed; 986 changed = true;
948 v_blurRadius = vr; 987 v_blurRadius = vr;
949 } 988 }
950 989
951 if (v_blurRadius == 0 && h_blurRadius == 0) 990 if (v_blurRadius == 0 && h_blurRadius == 0)
952 flags &= ~blurNeeded; 991 flags &= ~blurNeeded;
953 else 992 else
954 flags |= blurNeeded; 993 flags |= blurNeeded;
955 994
956 return (changed > 0); 995 return changed;
957} 996}
958 997
959static inline unsigned long 998static inline unsigned long
960compute_tint_shade_flags (rxvt_color *tint, int shade) 999compute_tint_shade_flags (rxvt_color *tint, int shade)
961{ 1000{
962 unsigned long flags = 0; 1001 unsigned long flags = 0;
963 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1002 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
964 bool has_shade = (shade > 0 && shade < 100) || (shade > 100 && shade < 200); 1003 bool has_shade = shade != 100;
965 1004
966 if (tint) 1005 if (tint)
967 { 1006 {
968 tint->get (c); 1007 tint->get (c);
969# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 1008# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
… …
983 { 1022 {
984 flags |= bgPixmap_t::tintNeeded; 1023 flags |= bgPixmap_t::tintNeeded;
985 } 1024 }
986 } 1025 }
987 1026
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; 1027 return flags;
1001} 1028}
1002 1029
1003bool 1030bool
1004bgPixmap_t::set_tint (rxvt_color &new_tint) 1031bgPixmap_t::set_tint (rxvt_color &new_tint)
1005{ 1032{
1006 if (tint != new_tint) 1033 if (!(flags & tintSet) || tint != new_tint)
1007 { 1034 {
1008 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1035 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
1009 tint = new_tint; 1036 tint = new_tint;
1010 flags = (flags & ~tintFlags) | new_flags | tintSet; 1037 flags = (flags & ~tintFlags) | new_flags | tintSet;
1011 return true; 1038 return true;
… …
1029} 1056}
1030 1057
1031bool 1058bool
1032bgPixmap_t::set_shade (const char *shade_str) 1059bgPixmap_t::set_shade (const char *shade_str)
1033{ 1060{
1034 int new_shade = (shade_str) ? atoi (shade_str) : 0; 1061 int new_shade = (shade_str) ? atoi (shade_str) : 100;
1035 1062
1036 if (new_shade < 0 && new_shade > -100) 1063 clamp_it (new_shade, -100, 200);
1064 if (new_shade < 0)
1037 new_shade = 200 - (100 + new_shade); 1065 new_shade = 200 - (100 + new_shade);
1038 else if (new_shade == 100)
1039 new_shade = 0;
1040 1066
1041 if (new_shade != shade) 1067 if (new_shade != shade)
1042 { 1068 {
1043 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 1069 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
1044 shade = new_shade; 1070 shade = new_shade;
… …
1047 } 1073 }
1048 1074
1049 return false; 1075 return false;
1050} 1076}
1051 1077
1078#if XRENDER
1079static void
1080get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1081{
1082 double sigma = radius / 2.0;
1083 double scale = sqrt (2.0 * M_PI) * sigma;
1084 double sum = 0.0;
1085
1086 for (int i = 0; i < width; i++)
1087 {
1088 double x = i - width / 2;
1089 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1090 sum += kernel[i];
1091 }
1092
1093 params[0] = XDoubleToFixed (width);
1094 params[1] = XDoubleToFixed (1);
1095
1096 for (int i = 0; i < width; i++)
1097 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1098}
1099#endif
1100
1052bool 1101bool
1053bgPixmap_t::tint_pixmap (Pixmap pixmap) 1102bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1054{ 1103{
1055 Window root = target->display->root; 1104 bool ret = false;
1105#if XRENDER
1106 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1107 double *kernel = (double *)malloc (size * sizeof (double));
1108 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1109
1056 Display *dpy = target->dpy; 1110 Display *dpy = target->dpy;
1057 int window_width = target->szHint.width; 1111 XRenderPictureAttributes pa;
1058 int window_height = target->szHint.height; 1112 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1113
1114 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1115 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1116
1117 if (kernel && params && src && dst)
1118 {
1119 if (h_blurRadius)
1120 {
1121 size = h_blurRadius * 2 + 1;
1122 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1123
1124 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1125 XRenderComposite (dpy,
1126 PictOpSrc,
1127 src,
1128 None,
1129 dst,
1130 0, 0,
1131 0, 0,
1132 0, 0,
1133 width, height);
1134 }
1135
1136 if (v_blurRadius)
1137 {
1138 size = v_blurRadius * 2 + 1;
1139 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1140 swap (params[0], params[1]);
1141
1142 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1143 XRenderComposite (dpy,
1144 PictOpSrc,
1145 src,
1146 None,
1147 dst,
1148 0, 0,
1149 0, 0,
1150 0, 0,
1151 width, height);
1152 }
1153
1154 ret = true;
1155 }
1156
1157 free (kernel);
1158 free (params);
1159 XRenderFreePicture (dpy, src);
1160 XRenderFreePicture (dpy, dst);
1161#endif
1162 return ret;
1163}
1164
1165bool
1166bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1167{
1168 Display *dpy = target->dpy;
1059 bool ret = false; 1169 bool ret = false;
1060 1170
1061 if (flags & tintWholesome) 1171 if (flags & tintWholesome)
1062 { 1172 {
1063 XGCValues gcv; 1173 XGCValues gcv;
… …
1067 * performance improvements, as we eliminate XImage transfer 1177 * performance improvements, as we eliminate XImage transfer
1068 */ 1178 */
1069 gcv.foreground = Pixel (tint); 1179 gcv.foreground = Pixel (tint);
1070 gcv.function = GXand; 1180 gcv.function = GXand;
1071 gcv.fill_style = FillSolid; 1181 gcv.fill_style = FillSolid;
1072 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv); 1182 gc = XCreateGC (dpy, pixmap, GCFillStyle | GCForeground | GCFunction, &gcv);
1073 if (gc) 1183 if (gc)
1074 { 1184 {
1075 XFillRectangle (dpy, pixmap, gc, 0, 0, window_width, window_height); 1185 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1076 ret = true; 1186 ret = true;
1077 XFreeGC (dpy, gc); 1187 XFreeGC (dpy, gc);
1078 } 1188 }
1079 } 1189 }
1080 else 1190 else
1081 { 1191 {
1082# if XFT 1192# if XRENDER
1083 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1193 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1084 1194
1085 if (flags & tintSet) 1195 if (flags & tintSet)
1086 tint.get (c); 1196 tint.get (c);
1087 1197
1088 if (shade > 0 && shade < 100) 1198 if (shade <= 100)
1089 { 1199 {
1090 c.r = (c.r * shade) / 100; 1200 c.r = (c.r * shade) / 100;
1091 c.g = (c.g * shade) / 100; 1201 c.g = (c.g * shade) / 100;
1092 c.b = (c.b * shade) / 100; 1202 c.b = (c.b * shade) / 100;
1093 } 1203 }
1094 else if (shade > 100 && shade < 200) 1204 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 } 1205 {
1206 c.r = ((0xffff - c.r) * (200 - shade)) / 100;
1207 c.g = ((0xffff - c.g) * (200 - shade)) / 100;
1208 c.b = ((0xffff - c.b) * (200 - shade)) / 100;
1209 }
1100 1210
1101 XRenderPictFormat pf; 1211 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, 1212 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; 1213 XRenderPictureAttributes pa;
1120 1214
1121 Picture back_pic = XRenderCreatePicture (dpy, pixmap, root_format, 0, &pa); 1215 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1122 1216
1123 pa.repeat = True; 1217 pa.repeat = True;
1124 1218
1125 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32); 1219 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1126 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa); 1220 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1127 XFreePixmap (dpy, overlay_pmap); 1221 XFreePixmap (dpy, overlay_pmap);
1128 1222
1129 pa.component_alpha = True; 1223 pa.component_alpha = True;
1130 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32); 1224 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1131 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa); 1225 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1132 XFreePixmap (dpy, mask_pmap); 1226 XFreePixmap (dpy, mask_pmap);
1133 1227
1134 if (mask_pic && overlay_pic && back_pic) 1228 if (mask_pic && overlay_pic && back_pic)
1135 { 1229 {
1136 XRenderColor mask_c; 1230 XRenderColor mask_c;
1137 1231
1138 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); 1232 mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0;
1139 mask_c.alpha = 0xffff; 1233 mask_c.alpha = 0xffff;
1140 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1234 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1141 1235
1142 mask_c.alpha = 0; 1236 mask_c.alpha = 0;
1143 mask_c.red = 0xffff - c.r; 1237 mask_c.red = 0xffff - c.r;
1144 mask_c.green = 0xffff - c.g; 1238 mask_c.green = 0xffff - c.g;
1145 mask_c.blue = 0xffff - c.b; 1239 mask_c.blue = 0xffff - c.b;
1146 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1240 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); 1241 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1148 ret = true; 1242 ret = true;
1149 } 1243 }
1150 1244
1151 XRenderFreePicture (dpy, mask_pic); 1245 XRenderFreePicture (dpy, mask_pic);
1152 XRenderFreePicture (dpy, overlay_pic); 1246 XRenderFreePicture (dpy, overlay_pic);
1153 XRenderFreePicture (dpy, back_pic); 1247 XRenderFreePicture (dpy, back_pic);
1154# if DO_TIMING_TEST
1155 XSync (dpy, False);
1156# endif
1157# endif 1248# endif
1158 } 1249 }
1159 1250
1160 return ret; 1251 return ret;
1161} 1252}
1162 1253
1163/* make_transparency_pixmap() 1254/* make_transparency_pixmap()
1164 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1255 * 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 1256 * the tiled portion of the root pixmap that is supposed to be covered by
1166 * our window. 1257 * our window.
1167 */ 1258 */
1168unsigned long 1259unsigned long
1169bgPixmap_t::make_transparency_pixmap () 1260bgPixmap_t::make_transparency_pixmap ()
1170{ 1261{
… …
1174 return 0; 1265 return 0;
1175 1266
1176 /* root dimensions may change from call to call - but Display structure should 1267 /* root dimensions may change from call to call - but Display structure should
1177 * be always up-to-date, so let's use it : 1268 * be always up-to-date, so let's use it :
1178 */ 1269 */
1179 Window root = target->display->root;
1180 int screen = target->display->screen; 1270 int screen = target->display->screen;
1181 Display *dpy = target->dpy; 1271 Display *dpy = target->dpy;
1272 int root_depth = DefaultDepth (dpy, screen);
1182 int root_width = DisplayWidth (dpy, screen); 1273 int root_width = DisplayWidth (dpy, screen);
1183 int root_height = DisplayHeight (dpy, screen); 1274 int root_height = DisplayHeight (dpy, screen);
1184 unsigned int root_pmap_width, root_pmap_height; 1275 unsigned int root_pmap_width, root_pmap_height;
1185 int window_width = target->szHint.width; 1276 int window_width = target->szHint.width;
1186 int window_height = target->szHint.height; 1277 int window_height = target->szHint.height;
1187 int sx, sy; 1278 int sx, sy;
1188 XGCValues gcv; 1279 XGCValues gcv;
1280 GC gc;
1189 1281
1190 TIMING_TEST_START (tp);
1191 target->get_window_origin (sx, sy); 1282 target->get_window_origin (sx, sy);
1192 1283
1193 /* check if we are outside of the visible part of the virtual screen : */ 1284 /* check if we are outside of the visible part of the virtual screen : */
1194 if (sx + window_width <= 0 || sy + window_height <= 0 1285 if (sx + window_width <= 0 || sy + window_height <= 0
1195 || sx >= root_width || sy >= root_height) 1286 || sx >= root_width || sy >= root_height)
1196 return 0; 1287 return 0;
1197 1288
1289 // validate root pixmap and get its size
1198 if (root_pixmap != None) 1290 if (root_pixmap != None)
1199 { 1291 {
1200 /* we want to validate the pixmap and get it's size at the same time : */ 1292 Window wdummy;
1201 int junk; 1293 int idummy;
1202 unsigned int ujunk; 1294 unsigned int udummy;
1203 /* root pixmap may be bad - allow a error */ 1295
1204 target->allowedxerror = -1; 1296 target->allowedxerror = -1;
1205 1297
1206 if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk)) 1298 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy))
1207 root_pixmap = None; 1299 root_pixmap = None;
1208 1300
1209 target->allowedxerror = 0; 1301 target->allowedxerror = 0;
1210 } 1302 }
1211 1303
1304 Pixmap recoded_root_pmap = root_pixmap;
1305
1306 if (root_pixmap != None && root_depth != target->depth)
1307 {
1308#if XRENDER
1309 if (flags & HAS_RENDER)
1310 {
1311 XRenderPictureAttributes pa;
1312
1313 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1314 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1315
1316 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
1317 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
1318 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1319
1320 if (src && dst)
1321 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1322 else
1323 {
1324 XFreePixmap (dpy, recoded_root_pmap);
1325 root_pixmap = None;
1326 }
1327
1328 XRenderFreePicture (dpy, src);
1329 XRenderFreePicture (dpy, dst);
1330 }
1331 else
1332#endif
1333 root_pixmap = None;
1334 }
1335
1336 if (root_pixmap == None)
1337 return 0;
1338
1212 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1339 Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth);
1213 GC gc = NULL;
1214 1340
1215 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1341 if (tiled_root_pmap == None) /* something really bad happened - abort */
1216 return 0; 1342 return 0;
1217 1343
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 */ 1344 /* straightforward pixmap copy */
1276 gcv.tile = root_pixmap; 1345 gcv.tile = recoded_root_pmap;
1277 gcv.fill_style = FillTiled; 1346 gcv.fill_style = FillTiled;
1278 1347
1279 while (sx < 0) sx += (int)root_width; 1348 while (sx < 0) sx += (int)root_width;
1280 while (sy < 0) sy += (int)root_height; 1349 while (sy < 0) sy += (int)root_height;
1281 1350
1282 gcv.ts_x_origin = -sx; 1351 gcv.ts_x_origin = -sx;
1283 gcv.ts_y_origin = -sy; 1352 gcv.ts_y_origin = -sy;
1284 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1353 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1285 1354
1286 if (gc) 1355 if (gc)
1287 { 1356 {
1288 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1357 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1289 result |= transpPmapTiled; 1358 result |= transpPmapTiled;
1290 } 1359 XFreeGC (dpy, gc);
1291 }
1292 TIMING_TEST_PRINT_RESULT (tp);
1293 1360
1294 if (tiled_root_pmap != None)
1295 {
1296 if (!need_client_side_rendering ()) 1361 if (!need_client_side_rendering ())
1297 { 1362 {
1363 if ((flags & blurNeeded)
1364 && (flags & HAS_RENDER_CONV))
1365 {
1366 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1367 result |= transpPmapBlurred;
1368 }
1298 if ((flags & tintNeeded)) 1369 if ((flags & tintNeeded)
1370 && (flags & (tintWholesome | HAS_RENDER)))
1299 { 1371 {
1300 if (tint_pixmap (tiled_root_pmap)) 1372 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1301 result |= transpPmapTinted; 1373 result |= transpPmapTinted;
1302 } 1374 }
1303 } /* server side rendering completed */ 1375 } /* server side rendering completed */
1304 1376
1305 if (pixmap) 1377 if (pixmap)
1306 XFreePixmap (dpy, pixmap); 1378 XFreePixmap (dpy, pixmap);
1307 1379
1308 pixmap = tiled_root_pmap; 1380 pixmap = tiled_root_pmap;
1309 pmap_width = window_width; 1381 pmap_width = window_width;
1310 pmap_height = window_height; 1382 pmap_height = window_height;
1311 pmap_depth = root_depth; 1383 pmap_depth = target->depth;
1312 } 1384 }
1385 else
1386 XFreePixmap (dpy, tiled_root_pmap);
1313 1387
1314 if (gc) 1388 if (recoded_root_pmap != root_pixmap)
1315 XFreeGC (dpy, gc); 1389 XFreePixmap (dpy, recoded_root_pmap);
1316
1317 TIMING_TEST_PRINT_RESULT (tp);
1318 1390
1319 return result; 1391 return result;
1320} 1392}
1321 1393
1322bool 1394void
1323bgPixmap_t::set_root_pixmap () 1395bgPixmap_t::set_root_pixmap ()
1324{ 1396{
1325 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1397 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1326 if (new_root_pixmap == None) 1398 if (new_root_pixmap == None)
1327 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1399 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1328 1400
1329 if (new_root_pixmap != root_pixmap)
1330 {
1331 root_pixmap = new_root_pixmap; 1401 root_pixmap = new_root_pixmap;
1332 return true;
1333 }
1334
1335 return false;
1336} 1402}
1337# endif /* ENABLE_TRANSPARENCY */ 1403# endif /* ENABLE_TRANSPARENCY */
1338 1404
1339# ifndef HAVE_AFTERIMAGE 1405#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1340static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm); 1406static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c);
1341# endif 1407# endif
1342 1408
1343bool 1409bool
1344bgPixmap_t::render () 1410bgPixmap_t::render ()
1345{ 1411{
1346 unsigned long background_flags = 0; 1412 unsigned long background_flags = 0;
1347 1413
1348 if (target == NULL) 1414 if (target == NULL)
1349 return false; 1415 return false;
1350
1351 TIMING_TEST_START (tp);
1352 1416
1353 invalidate (); 1417 invalidate ();
1354# ifdef ENABLE_TRANSPARENCY 1418# ifdef ENABLE_TRANSPARENCY
1355 if (flags & isTransparent) 1419 if (flags & isTransparent)
1356 { 1420 {
1357 /* we need to re-generate transparency pixmap in that case ! */ 1421 /* we need to re-generate transparency pixmap in that case ! */
1358 background_flags = make_transparency_pixmap (); 1422 background_flags = make_transparency_pixmap ();
1359 if (background_flags == 0) 1423 if (background_flags == 0)
1360 return false; 1424 return false;
1361 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1425 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1362 && pmap_depth == target->depth)
1363 flags = flags & ~isInvalid; 1426 flags = flags & ~isInvalid;
1364 } 1427 }
1365# endif 1428# endif
1366 1429
1367# ifdef BG_IMAGE_FROM_FILE 1430# ifdef BG_IMAGE_FROM_FILE
… …
1371 if (render_image (background_flags)) 1434 if (render_image (background_flags))
1372 flags = flags & ~isInvalid; 1435 flags = flags & ~isInvalid;
1373 } 1436 }
1374# endif 1437# endif
1375 1438
1439# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1376 XImage *result = NULL; 1440 XImage *result = NULL;
1377 1441
1378 if (background_flags && (flags & isInvalid)) 1442 if (background_flags && (flags & isInvalid))
1379 { 1443 {
1380 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1444 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1381 } 1445 }
1382 1446
1383 if (result) 1447 if (result)
1384 { 1448 {
1385# if !defined(HAVE_AFTERIMAGE) && !XFT
1386 /* our own client-side tinting */ 1449 /* 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)) 1450 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1390 { 1451 {
1391 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1452 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1392 if (flags & tintSet) 1453 if (flags & tintSet)
1393 tint.get (c); 1454 tint.get (c);
1394 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1455 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1395 } 1456 }
1396# endif
1397 1457
1398 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1458 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1399 1459
1400 if (gc) 1460 if (gc)
1401 { 1461 {
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); 1462 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1431 1463
1432 XFreeGC (target->dpy, gc); 1464 XFreeGC (target->dpy, gc);
1433 flags = flags & ~isInvalid; 1465 flags = flags & ~isInvalid;
1434 } 1466 }
1435 1467
1436 XDestroyImage (result); 1468 XDestroyImage (result);
1437 } 1469 }
1470# endif
1438 1471
1439 if (flags & isInvalid) 1472 if (flags & isInvalid)
1440 { 1473 {
1441 if (pixmap != None) 1474 if (pixmap != None)
1442 { 1475 {
… …
1445 } 1478 }
1446 } 1479 }
1447 1480
1448 apply (); 1481 apply ();
1449 1482
1450 XSync (target->dpy, False);
1451 valid_since = ev::now (); 1483 valid_since = ev::now ();
1452 1484
1453 TIMING_TEST_PRINT_RESULT (tp);
1454
1455 return true; 1485 return true;
1456} 1486}
1457 1487
1458bool 1488void
1459bgPixmap_t::set_target (rxvt_term *new_target) 1489bgPixmap_t::set_target (rxvt_term *new_target)
1460{ 1490{
1461 if (new_target)
1462 if (target != new_target)
1463 {
1464 target = new_target; 1491 target = new_target;
1465# ifdef ENABLE_TRANSPARENCY 1492
1466 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1493 flags &= ~(HAS_RENDER | HAS_RENDER_CONV);
1494#if XRENDER
1495 int major, minor;
1496 if (XRenderQueryVersion (target->dpy, &major, &minor))
1497 flags |= HAS_RENDER;
1498 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1499 if (filters)
1500 {
1501 for (int i = 0; i < filters->nfilter; i++)
1502 if (!strcmp (filters->filter[i], FilterConvolution))
1503 flags |= HAS_RENDER_CONV;
1504
1505 XFree (filters);
1506 }
1467# endif 1507#endif
1468 return true;
1469 }
1470
1471 return false;
1472} 1508}
1473 1509
1474void 1510void
1475bgPixmap_t::apply () 1511bgPixmap_t::apply ()
1476{ 1512{
1477 if (target) 1513 if (target == NULL)
1478 { 1514 return;
1479 flags &= ~isVtOrigin;
1480 1515
1481 if (pixmap != None) 1516 if (pixmap != None)
1482 { 1517 {
1483 /* set target's background to pixmap */ 1518 /* set target's background to pixmap */
1484# ifdef ENABLE_TRANSPARENCY 1519# ifdef ENABLE_TRANSPARENCY
1485 if (flags & isTransparent) 1520 if (flags & isTransparent)
1486 { 1521 {
1487 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1522 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1488 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1523 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1489 1524
1490 if (target->scrollBar.win) 1525 if (target->scrollBar.win)
1491 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1526 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1492 } 1527 }
1493 else 1528 else
1494# endif 1529# endif
1495 { 1530 {
1496 flags |= isVtOrigin;
1497 /* force old pixmap dereference in case it was transparent before :*/ 1531 /* 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]); 1532 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1510 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1533 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1511 /* do we also need to set scrollbar's background here ? */ 1534 /* do we also need to set scrollbar's background here ? */
1535
1512 if (target->scrollBar.win) 1536 if (target->scrollBar.win)
1513 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1537 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1514 } 1538 }
1539 }
1540 else
1541 {
1542 /* set target background to a pixel */
1543 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1544 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1545 /* do we also need to set scrollbar's background here ? */
1546 if (target->scrollBar.win)
1547 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1548 }
1515 1549
1516 /* don't want Expose on the parent or vt. It is better to use 1550 /* 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: */ 1551 scr_touch or we get a great deal of flicker otherwise: */
1518 XClearWindow (target->dpy, target->parent[0]); 1552 XClearWindow (target->dpy, target->parent[0]);
1519 1553
1520 if (target->scrollBar.state && target->scrollBar.win) 1554 if (target->scrollBar.state && target->scrollBar.win)
1521 { 1555 {
1522 target->scrollBar.state = STATE_IDLE; 1556 target->scrollBar.state = STATE_IDLE;
1523 target->scrollBar.show (0); 1557 target->scrollBar.show (0);
1524 } 1558 }
1525 1559
1526 target->want_refresh = 1; 1560 target->want_refresh = 1;
1527 flags |= hasChanged; 1561 flags |= hasChanged;
1528 }
1529} 1562}
1530 1563
1531#endif /* HAVE_BG_PIXMAP */ 1564#endif /* HAVE_BG_PIXMAP */
1532 1565
1533#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1566#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1534/* taken from aterm-0.4.2 */ 1567/* taken from aterm-0.4.2 */
1535 1568
1536typedef uint32_t RUINT32T;
1537
1538static void 1569static void
1539ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm) 1570ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c)
1540{ 1571{
1541 int sh_r, sh_g, sh_b; 1572 int sh_r, sh_g, sh_b;
1542 RUINT32T mask_r, mask_g, mask_b; 1573 uint32_t mask_r, mask_g, mask_b;
1543 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1574 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1544 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1575 rgba low;
1545 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1576 rgba high;
1546 int i; 1577 int i;
1578 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1547 1579
1548 Visual *visual = term->visual;
1549
1550 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1580 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1551
1552 if (shade == 0)
1553 shade = 100;
1554 1581
1555 /* for convenience */ 1582 /* for convenience */
1556 mask_r = visual->red_mask; 1583 mask_r = visual->red_mask;
1557 mask_g = visual->green_mask; 1584 mask_g = visual->green_mask;
1558 mask_b = visual->blue_mask; 1585 mask_b = visual->blue_mask;
1559 1586
1560 /* boring lookup table pre-initialization */ 1587 /* boring lookup table pre-initialization */
1561 switch (srcImage->bits_per_pixel) { 1588 switch (srcImage->depth)
1589 {
1562 case 15: 1590 case 15:
1563 if ((mask_r != 0x7c00) || 1591 if ((mask_r != 0x7c00) ||
1564 (mask_g != 0x03e0) || 1592 (mask_g != 0x03e0) ||
1565 (mask_b != 0x001f)) 1593 (mask_b != 0x001f))
1566 return; 1594 return;
1567 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1595 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32));
1568 lookup_r = lookup; 1596 lookup_r = lookup;
1569 lookup_g = lookup+32; 1597 lookup_g = lookup+32;
1570 lookup_b = lookup+32+32; 1598 lookup_b = lookup+32+32;
1571 sh_r = 10; 1599 sh_r = 10;
1572 sh_g = 5; 1600 sh_g = 5;
1573 sh_b = 0; 1601 sh_b = 0;
1574 break; 1602 break;
1575 case 16: 1603 case 16:
1576 if ((mask_r != 0xf800) || 1604 if ((mask_r != 0xf800) ||
1577 (mask_g != 0x07e0) || 1605 (mask_g != 0x07e0) ||
1578 (mask_b != 0x001f)) 1606 (mask_b != 0x001f))
1579 return; 1607 return;
1580 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1608 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1581 lookup_r = lookup; 1609 lookup_r = lookup;
1582 lookup_g = lookup+32; 1610 lookup_g = lookup+32;
1583 lookup_b = lookup+32+64; 1611 lookup_b = lookup+32+64;
1584 sh_r = 11; 1612 sh_r = 11;
1585 sh_g = 5; 1613 sh_g = 5;
1586 sh_b = 0; 1614 sh_b = 0;
1587 break; 1615 break;
1588 case 24: 1616 case 24:
1589 if ((mask_r != 0xff0000) || 1617 if ((mask_r != 0xff0000) ||
1590 (mask_g != 0x00ff00) || 1618 (mask_g != 0x00ff00) ||
1591 (mask_b != 0x0000ff)) 1619 (mask_b != 0x0000ff))
1592 return; 1620 return;
1593 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1621 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1594 lookup_r = lookup; 1622 lookup_r = lookup;
1595 lookup_g = lookup+256; 1623 lookup_g = lookup+256;
1596 lookup_b = lookup+256+256; 1624 lookup_b = lookup+256+256;
1597 sh_r = 16; 1625 sh_r = 16;
1598 sh_g = 8; 1626 sh_g = 8;
1599 sh_b = 0; 1627 sh_b = 0;
1600 break; 1628 break;
1601 case 32: 1629 case 32:
1602 if ((mask_r != 0xff0000) || 1630 if ((mask_r != 0xff0000) ||
1603 (mask_g != 0x00ff00) || 1631 (mask_g != 0x00ff00) ||
1604 (mask_b != 0x0000ff)) 1632 (mask_b != 0x0000ff))
1605 return; 1633 return;
1606 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1634 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1607 lookup_r = lookup; 1635 lookup_r = lookup;
1608 lookup_g = lookup+256; 1636 lookup_g = lookup+256;
1609 lookup_b = lookup+256+256; 1637 lookup_b = lookup+256+256;
1610 sh_r = 16; 1638 sh_r = 16;
1611 sh_g = 8; 1639 sh_g = 8;
1612 sh_b = 0; 1640 sh_b = 0;
1613 break; 1641 break;
1614 default: 1642 default:
1615 return; /* we do not support this color depth */ 1643 return; /* we do not support this color depth */
1616 } 1644 }
1617 1645
1618 /* prepare limits for color transformation (each channel is handled separately) */ 1646 /* prepare limits for color transformation (each channel is handled separately) */
1619 if (shade < 0) { 1647 if (shade > 100)
1648 {
1620 shade = -shade; 1649 shade = 200 - shade;
1621 if (shade < 0) shade = 0;
1622 if (shade > 100) shade = 100;
1623 1650
1624 lower_lim_r = 65535-rm; 1651 high.r = (65535 - c.r) * shade / 100;
1625 lower_lim_g = 65535-gm; 1652 high.g = (65535 - c.g) * shade / 100;
1626 lower_lim_b = 65535-bm; 1653 high.b = (65535 - c.b) * shade / 100;
1627 1654
1628 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1655 low.r = 65535 - high.r;
1629 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1656 low.g = 65535 - high.g;
1630 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1657 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 } 1658 }
1643 1659 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 { 1660 {
1647 unsigned int tmp; 1661 high.r = c.r * shade / 100;
1662 high.g = c.g * shade / 100;
1663 high.b = c.b * shade / 100;
1648 1664
1649 tmp = lower_lim_r; 1665 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 } 1666 }
1657 1667
1658 /* fill our lookup tables */ 1668 /* fill our lookup tables */
1659 for (i = 0; i <= mask_r>>sh_r; i++) 1669 for (i = 0; i <= mask_r>>sh_r; i++)
1660 { 1670 {
1661 RUINT32T tmp; 1671 uint32_t tmp;
1662 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1672 tmp = i * high.r;
1663 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1673 tmp += (mask_r>>sh_r) * low.r;
1664 lookup_r[i] = (tmp/65535)<<sh_r; 1674 lookup_r[i] = (tmp/65535)<<sh_r;
1665 } 1675 }
1666 for (i = 0; i <= mask_g>>sh_g; i++) 1676 for (i = 0; i <= mask_g>>sh_g; i++)
1667 { 1677 {
1668 RUINT32T tmp; 1678 uint32_t tmp;
1669 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1679 tmp = i * high.g;
1670 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1680 tmp += (mask_g>>sh_g) * low.g;
1671 lookup_g[i] = (tmp/65535)<<sh_g; 1681 lookup_g[i] = (tmp/65535)<<sh_g;
1672 } 1682 }
1673 for (i = 0; i <= mask_b>>sh_b; i++) 1683 for (i = 0; i <= mask_b>>sh_b; i++)
1674 { 1684 {
1675 RUINT32T tmp; 1685 uint32_t tmp;
1676 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1686 tmp = i * high.b;
1677 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1687 tmp += (mask_b>>sh_b) * low.b;
1678 lookup_b[i] = (tmp/65535)<<sh_b; 1688 lookup_b[i] = (tmp/65535)<<sh_b;
1679 } 1689 }
1680 1690
1681 /* apply table to input image (replacing colors by newly calculated ones) */ 1691 /* apply table to input image (replacing colors by newly calculated ones) */
1682 switch (srcImage->bits_per_pixel) 1692 if (srcImage->bits_per_pixel == 32
1693 && (srcImage->depth == 24 || srcImage->depth == 32)
1694 && srcImage->byte_order == host_byte_order)
1683 { 1695 {
1684 case 15:
1685 {
1686 unsigned short *p1, *pf, *p, *pl; 1696 uint32_t *p1, *pf, *p, *pl;
1687 p1 = (unsigned short *) srcImage->data; 1697 p1 = (uint32_t *) srcImage->data;
1688 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1698 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1699
1689 while (p1 < pf) 1700 while (p1 < pf)
1690 { 1701 {
1691 p = p1; 1702 p = p1;
1692 pl = p1 + srcImage->width; 1703 pl = p1 + srcImage->width;
1693 for (; p < pl; p++) 1704 for (; p < pl; p++)
1694 { 1705 {
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] | 1706 *p = lookup_r[(*p & 0xff0000) >> 16] |
1754 lookup_g[(*p & 0x00ff00)>> 8] | 1707 lookup_g[(*p & 0x00ff00) >> 8] |
1755 lookup_b[(*p & 0x0000ff)] | 1708 lookup_b[(*p & 0x0000ff)] |
1756 (*p & ~0xffffff); 1709 (*p & 0xff000000);
1710 }
1711 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line);
1712 }
1713 }
1714 else
1715 {
1716 for (int y = 0; y < srcImage->height; y++)
1717 for (int x = 0; x < srcImage->width; x++)
1718 {
1719 unsigned long pixel = XGetPixel (srcImage, x, y);
1720 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1721 lookup_g[(pixel & mask_g) >> sh_g] |
1722 lookup_b[(pixel & mask_b) >> sh_b];
1723 XPutPixel (srcImage, x, y, pixel);
1757 } 1724 }
1758 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1759 } 1725 }
1760 break;
1761 }
1762 }
1763 1726
1764 free (lookup); 1727 free (lookup);
1765} 1728}
1766#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1729#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */

Diff Legend

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