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

Diff Legend

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