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

Diff Legend

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