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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.61 by sf-exg, Sun Oct 3 20:48:34 2010 UTC vs.
Revision 1.114 by sf-exg, Wed Nov 10 13:15:08 2010 UTC

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

Diff Legend

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