ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/background.C
(Generate patch)

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.61 by sf-exg, Sun Oct 3 20:48:34 2010 UTC vs.
Revision 1.106 by sf-exg, Mon Nov 1 11:37:02 2010 UTC

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

Diff Legend

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