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.109 by sf-exg, Tue Nov 2 22:01:47 2010 UTC

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

Diff Legend

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