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.86 by sf-exg, Mon Oct 18 10:49:19 2010 UTC

… …
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com>
7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net> 7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net>
8 * Copyright (c) 2010 Emanuele Giaquinta <e.giaquinta@glauco.it>
8 * 9 *
9 * This program is free software; you can redistribute it and/or modify 10 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by 11 * it under the terms of the GNU General Public License as published by
11 * the Free Software Foundation; either version 2 of the License, or 12 * the Free Software Foundation; either version 2 of the License, or
12 * (at your option) any later version. 13 * (at your option) any later version.
… …
19 * You should have received a copy of the GNU General Public License 20 * You should have received a copy of the GNU General Public License
20 * along with this program; if not, write to the Free Software 21 * along with this program; if not, write to the Free Software
21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 22 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22 *---------------------------------------------------------------------*/ 23 *---------------------------------------------------------------------*/
23 24
25#include <cmath>
24#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
25#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
26 28
27#define DO_TIMING_TEST 0 29#define DO_TIMING_TEST 0
28 30
… …
104#ifdef BG_IMAGE_FROM_FILE 106#ifdef BG_IMAGE_FROM_FILE
105 have_image = false; 107 have_image = false;
106 h_scale = v_scale = 0; 108 h_scale = v_scale = 0;
107 h_align = v_align = 0; 109 h_align = v_align = 0;
108#endif 110#endif
111#ifdef ENABLE_TRANSPARENCY
112 shade = 100;
113#endif
109 flags = 0; 114 flags = 0;
110 pixmap = None; 115 pixmap = None;
111 valid_since = invalid_since = 0; 116 valid_since = invalid_since = 0;
112 target = 0; 117 target = 0;
113} 118}
… …
138# endif 143# endif
139 144
140# ifdef BG_IMAGE_FROM_FILE 145# ifdef BG_IMAGE_FROM_FILE
141 if (have_image) 146 if (have_image)
142 { 147 {
143 if (h_scale != 0 || v_scale != 0 148 if (flags & sizeSensitive)
144 || h_align != 0 || v_align != 0)
145 return true; 149 return true;
146 } 150 }
147# endif 151# endif
148 152
149 return false; 153 return false;
… …
158# endif 162# endif
159 163
160# ifdef BG_IMAGE_FROM_FILE 164# ifdef BG_IMAGE_FROM_FILE
161 if (have_image) 165 if (have_image)
162 { 166 {
163 if (h_align == rootAlign || v_align == rootAlign) 167 if (flags & rootAlign)
164 return true; 168 return true;
165 } 169 }
166# endif 170# endif
167 171
168 return false; 172 return false;
… …
172{ 176{
173# ifdef HAVE_AFTERIMAGE 177# ifdef HAVE_AFTERIMAGE
174 if (original_asim) 178 if (original_asim)
175 return true; 179 return true;
176# endif 180# endif
177# ifdef ENABLE_TRANSPARENCY
178 if (flags & isTransparent)
179 {
180# ifdef HAVE_AFTERIMAGE // can't blur without libAI anyways
181 if ((flags & blurNeeded) && !(flags & blurServerSide))
182 return true;
183# endif
184 if ((flags & tintNeeded) && !(flags & tintServerSide))
185 return true;
186 }
187# endif
188 return false; 181 return false;
189} 182}
190 183
191# ifdef BG_IMAGE_FROM_FILE 184# ifdef BG_IMAGE_FROM_FILE
192static inline bool 185static inline bool
… …
208static inline bool 201static inline bool
209check_set_align_value (int geom_flags, int flag, int &align, int new_value) 202check_set_align_value (int geom_flags, int flag, int &align, int new_value)
210{ 203{
211 if (geom_flags & flag) 204 if (geom_flags & flag)
212 { 205 {
213 if (new_value != bgPixmap_t::rootAlign)
214 {
215 if (new_value < -100) 206 if (new_value < -100)
216 new_value = -100; 207 new_value = -100;
217 else if (new_value > 200) 208 else if (new_value > 200)
218 new_value = 200; 209 new_value = 200;
219 }
220 if (new_value != align) 210 if (new_value != align)
221 { 211 {
222 align = new_value; 212 align = new_value;
223 return true; 213 return true;
224 } 214 }
… …
230make_align_position (int align, int window_size, int image_size) 220make_align_position (int align, int window_size, int image_size)
231{ 221{
232 int diff = window_size - image_size; 222 int diff = window_size - image_size;
233 int smaller = min (image_size, window_size); 223 int smaller = min (image_size, window_size);
234 224
235 if (align >= 0 && align <= 50) 225 if (align >= 0 && align <= 100)
236 return diff * align / 100; 226 return diff * align / 100;
237 else if (align > 50 && align <= 100)
238 return window_size - image_size - diff * (100 - align) / 100;
239 else if (align > 100 && align <= 200 ) 227 else if (align > 100 && align <= 200)
240 return ((align - 100) * smaller / 100) + window_size - smaller; 228 return ((align - 100) * smaller / 100) + window_size - smaller;
241 else if (align > -100 && align < 0) 229 else if (align >= -100 && align < 0)
242 return ((align + 100) * smaller / 100) - image_size; 230 return ((align + 100) * smaller / 100) - image_size;
243 return 0; 231 return 0;
244} 232}
245 233
246static inline int 234static inline int
247make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 235make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
248{ 236{
249 int src_pos = 0; 237 int src_pos = 0;
250 dst_pos = 0; 238 dst_pos = pos;
251 dst_size = size; 239 dst_size = size;
252 if (pos < 0 && size > target_size) 240 if (pos < 0)
253 { 241 {
254 src_pos = -pos; 242 src_pos = -pos;
243 dst_pos = 0;
255 dst_size += pos; 244 dst_size += pos;
256 } 245 }
257 else if (pos > 0)
258 dst_pos = pos;
259 246
260 if (dst_pos + dst_size > target_size) 247 if (dst_pos + dst_size > target_size)
261 dst_size = target_size - dst_pos; 248 dst_size = target_size - dst_pos;
262 return src_pos; 249 return src_pos;
263} 250}
… …
388 w = h = noScale; 375 w = h = noScale;
389 geom_flags |= WidthValue|HeightValue; 376 geom_flags |= WidthValue|HeightValue;
390 } 377 }
391 else if (CHECK_GEOM_OPS ("propscale")) 378 else if (CHECK_GEOM_OPS ("propscale"))
392 { 379 {
393 if (w == 0 && h == 0)
394 {
395 w = windowScale;
396 geom_flags |= WidthValue;
397 }
398 new_flags |= propScale; 380 new_flags |= propScale;
399 } 381 }
400 else if (CHECK_GEOM_OPS ("hscale")) 382 else if (CHECK_GEOM_OPS ("hscale"))
401 { 383 {
402 if (w == 0) w = windowScale; 384 if (w == 0) w = windowScale;
… …
424 x = y = centerAlign; 406 x = y = centerAlign;
425 geom_flags |= WidthValue|HeightValue|XValue|YValue; 407 geom_flags |= WidthValue|HeightValue|XValue|YValue;
426 } 408 }
427 else if (CHECK_GEOM_OPS ("root")) 409 else if (CHECK_GEOM_OPS ("root"))
428 { 410 {
411 new_flags |= rootAlign;
429 w = h = noScale; 412 w = h = noScale;
430 x = y = rootAlign;
431 geom_flags |= WidthValue|HeightValue|XValue|YValue; 413 geom_flags |= WidthValue|HeightValue;
432 } 414 }
433# undef CHECK_GEOM_OPS 415# undef CHECK_GEOM_OPS
434 416
435 while (*ops != ':' && *ops != '\0') ++ops; 417 while (*ops != ':' && *ops != '\0') ++ops;
436 } /* done parsing ops */ 418 } /* done parsing ops */
… …
451 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 433 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
452 // flags, h_scale, v_scale, h_align, v_align); 434 // flags, h_scale, v_scale, h_align, v_align);
453 return (changed > 0); 435 return (changed > 0);
454} 436}
455 437
438void
439bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
440{
441 int target_width = target->szHint.width;
442 int target_height = target->szHint.height;
443
444 if (flags & propScale)
445 {
446 float scale = (float)target_width / image_width;
447 min_it (scale, (float)target_height / image_height);
448 w = image_width * scale + 0.5;
449 h = image_height * scale + 0.5;
450 }
451 else
452 {
453 w = h_scale * target_width / 100;
454 h = v_scale * target_height / 100;
455 }
456
457 if (!w) w = image_width;
458 if (!h) h = image_height;
459
460 if (flags & rootAlign)
461 {
462 target->get_window_origin (x, y);
463 x = -x;
464 y = -y;
465 }
466 else
467 {
468 x = make_align_position (h_align, target_width, w);
469 y = make_align_position (v_align, target_height, h);
470 }
471
472 flags &= ~sizeSensitive;
473 if ((flags & propScale) || h_scale || v_scale
474 || (!(flags & rootAlign) && (h_align || v_align))
475 || w > target_width || h > target_height)
476 flags |= sizeSensitive;
477}
478
456# ifdef HAVE_AFTERIMAGE 479# ifdef HAVE_AFTERIMAGE
457bool 480bool
458bgPixmap_t::render_image (unsigned long background_flags) 481bgPixmap_t::render_image (unsigned long background_flags)
459{ 482{
460 if (target == NULL) 483 if (target == NULL)
… …
470 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); 493 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
471 494
472 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 495 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
473 { 496 {
474 ShadingInfo as_shade; 497 ShadingInfo as_shade;
475 as_shade.shading = (shade == 0) ? 100 : shade; 498 as_shade.shading = shade;
476 499
477 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 500 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
478 if (flags & tintSet) 501 if (flags & tintSet)
479 tint.get (c); 502 tint.get (c);
480 as_shade.tintColor.red = c.r; 503 as_shade.tintColor.red = c.r;
… …
482 as_shade.tintColor.blue = c.b; 505 as_shade.tintColor.blue = c.b;
483 506
484 background_tint = shading2tint32 (&as_shade); 507 background_tint = shading2tint32 (&as_shade);
485 } 508 }
486 509
487 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL) 510 if (!(background_flags & transpPmapBlurred) && (flags & blurNeeded) && background != NULL)
488 { 511 {
489 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 512 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, 513 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
491 100, ASIMAGE_QUALITY_DEFAULT); 514 100, ASIMAGE_QUALITY_DEFAULT);
492 if (tmp) 515 if (tmp)
… …
504 int new_pmap_width = target_width; 527 int new_pmap_width = target_width;
505 int new_pmap_height = target_height; 528 int new_pmap_height = target_height;
506 529
507 int x = 0; 530 int x = 0;
508 int y = 0; 531 int y = 0;
509 int w = h_scale * target_width / 100; 532 int w = 0;
510 int h = v_scale * target_height / 100; 533 int h = 0;
511 534
512 TIMING_TEST_START (asim); 535 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 }
… …
725 return false; 735 return false;
726 736
727 if (!pixbuf) 737 if (!pixbuf)
728 return false; 738 return false;
729 739
730 // TODO: add alpha blending 740#if !XFT
731 if (background_flags) 741 if (background_flags)
732 return false; 742 return false;
743#endif
733 744
734 GdkPixbuf *result; 745 GdkPixbuf *result;
735 746
736 int image_width = gdk_pixbuf_get_width (pixbuf); 747 int image_width = gdk_pixbuf_get_width (pixbuf);
737 int image_height = gdk_pixbuf_get_height (pixbuf); 748 int image_height = gdk_pixbuf_get_height (pixbuf);
… …
741 int new_pmap_width = target_width; 752 int new_pmap_width = target_width;
742 int new_pmap_height = target_height; 753 int new_pmap_height = target_height;
743 754
744 int x = 0; 755 int x = 0;
745 int y = 0; 756 int y = 0;
746 int w = h_scale * target_width / 100; 757 int w = 0;
747 int h = v_scale * target_height / 100; 758 int h = 0;
748 759
749 if (h_align == rootAlign || v_align == rootAlign) 760 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 761
756 if (h_align != rootAlign) 762 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 763 && (x >= target_width
763 || y >= target_height 764 || y >= target_height
764 || (w > 0 && x + w <= 0) 765 || (x + w <= 0)
765 || (h > 0 && y + h <= 0)) 766 || (y + h <= 0)))
766 return false; 767 return false;
767 768
768 result = pixbuf; 769 result = pixbuf;
769 770
770 if ((w > 0 && w != image_width) 771 if ((w != image_width)
771 || (h > 0 && h != image_height)) 772 || (h != image_height))
772 { 773 {
773 result = gdk_pixbuf_scale_simple (pixbuf, 774 result = gdk_pixbuf_scale_simple (pixbuf,
774 w > 0 ? w : image_width, 775 w, h,
775 h > 0 ? h : image_height,
776 GDK_INTERP_BILINEAR); 776 GDK_INTERP_BILINEAR);
777 } 777 }
778 778
779 bool ret = false; 779 bool ret = false;
780 780
781 if (result) 781 if (result)
782 { 782 {
783 XGCValues gcv; 783 XGCValues gcv;
784 GC gc; 784 GC gc;
785 Pixmap root_pmap;
785 786
786 image_width = gdk_pixbuf_get_width (result); 787 image_width = gdk_pixbuf_get_width (result);
787 image_height = gdk_pixbuf_get_height (result); 788 image_height = gdk_pixbuf_get_height (result);
788 789
789 if (h_scale == 0) 790 if (background_flags)
791 {
792 root_pmap = pixmap;
793 pixmap = None;
794 }
795 else
796 {
797 if (h_scale == 0 || v_scale == 0)
798 {
790 new_pmap_width = min (image_width, target_width); 799 new_pmap_width = min (image_width, target_width);
791 if (v_scale == 0)
792 new_pmap_height = min (image_height, target_height); 800 new_pmap_height = min (image_height, target_height);
801 }
802 }
793 803
794 if (pixmap) 804 if (pixmap)
795 { 805 {
796 if (pmap_width != new_pmap_width 806 if (pmap_width != new_pmap_width
797 || pmap_height != new_pmap_height 807 || pmap_height != new_pmap_height
… …
852 dst_width, dst_height, 862 dst_width, dst_height,
853 XLIB_RGB_DITHER_NONE, 863 XLIB_RGB_DITHER_NONE,
854 0, 0); 864 0, 0);
855 } 865 }
856 866
867#if XFT
868 if (background_flags)
869 {
870 Display *dpy = target->dpy;
871 XRenderPictureAttributes pa;
872
873 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen));
874 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
875
876 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
877 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
878
879 pa.repeat = True;
880 Pixmap mask_pmap = XCreatePixmap (dpy, target->vt, 1, 1, 8);
881 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
882 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
883 XFreePixmap (dpy, mask_pmap);
884
885 if (src && dst && mask)
886 {
887 XRenderColor mask_c;
888
889 mask_c.alpha = 0x8000;
890 mask_c.red = 0;
891 mask_c.green = 0;
892 mask_c.blue = 0;
893 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
894 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
895 }
896
897 XRenderFreePicture (dpy, src);
898 XRenderFreePicture (dpy, dst);
899 XRenderFreePicture (dpy, mask);
900
901 XFreePixmap (dpy, root_pmap);
902 }
903#endif
904
857 if (result != pixbuf) 905 if (result != pixbuf)
858 g_object_unref (result); 906 g_object_unref (result);
859 907
860 XFreeGC (target->dpy, gc); 908 XFreeGC (target->dpy, gc);
861 909
… …
883 } 931 }
884 932
885# ifdef HAVE_AFTERIMAGE 933# ifdef HAVE_AFTERIMAGE
886 if (!target->asimman) 934 if (!target->asimman)
887 target->asimman = create_generic_imageman (target->rs[Rs_path]); 935 target->asimman = create_generic_imageman (target->rs[Rs_path]);
888 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 936 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
937 if (image)
938 {
889 if (original_asim) 939 if (original_asim)
940 safe_asimage_destroy (original_asim);
941 original_asim = image;
890 have_image = true; 942 have_image = true;
891 return have_image; 943 return true;
944 }
892# endif 945# endif
893 946
894# ifdef HAVE_PIXBUF 947# ifdef HAVE_PIXBUF
895 pixbuf = gdk_pixbuf_new_from_file (file, NULL); 948 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
949 if (image)
950 {
896 if (pixbuf) 951 if (pixbuf)
952 g_object_unref (pixbuf);
953 pixbuf = image;
897 have_image = true; 954 have_image = true;
898 return have_image; 955 return true;
956 }
899# endif 957# endif
900 } 958 }
901 959
902 return false; 960 return false;
903} 961}
… …
928 if (!(geom_flags & WidthValue)) 986 if (!(geom_flags & WidthValue))
929 hr = 1; 987 hr = 1;
930 if (!(geom_flags & HeightValue)) 988 if (!(geom_flags & HeightValue))
931 vr = hr; 989 vr = hr;
932 990
991 min_it (hr, 128);
992 min_it (vr, 128);
993
933 if (h_blurRadius != hr) 994 if (h_blurRadius != hr)
934 { 995 {
935 ++changed; 996 ++changed;
936 h_blurRadius = hr; 997 h_blurRadius = hr;
937 } 998 }
… …
945 if (v_blurRadius == 0 && h_blurRadius == 0) 1006 if (v_blurRadius == 0 && h_blurRadius == 0)
946 flags &= ~blurNeeded; 1007 flags &= ~blurNeeded;
947 else 1008 else
948 flags |= blurNeeded; 1009 flags |= blurNeeded;
949 1010
1011#if XFT
1012 XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root);
1013 if (filters)
1014 {
1015 for (int i = 0; i < filters->nfilter; i++)
1016 if (!strcmp (filters->filter[i], FilterConvolution))
1017 flags |= bgPixmap_t::blurServerSide;
1018
1019 XFree (filters);
1020 }
1021#endif
1022
950 return (changed > 0); 1023 return (changed > 0);
951} 1024}
952 1025
953static inline unsigned long 1026static inline unsigned long
954compute_tint_shade_flags (rxvt_color *tint, int shade) 1027compute_tint_shade_flags (rxvt_color *tint, int shade)
955{ 1028{
956 unsigned long flags = 0; 1029 unsigned long flags = 0;
957 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1030 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
958 bool has_shade = (shade > 0 && shade < 100) || (shade > 100 && shade < 200); 1031 bool has_shade = shade != 100;
959 1032
960 if (tint) 1033 if (tint)
961 { 1034 {
962 tint->get (c); 1035 tint->get (c);
963# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 1036# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
… …
995} 1068}
996 1069
997bool 1070bool
998bgPixmap_t::set_tint (rxvt_color &new_tint) 1071bgPixmap_t::set_tint (rxvt_color &new_tint)
999{ 1072{
1000 if (tint != new_tint) 1073 if (!(flags & tintSet) || tint != new_tint)
1001 { 1074 {
1002 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1075 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
1003 tint = new_tint; 1076 tint = new_tint;
1004 flags = (flags & ~tintFlags) | new_flags | tintSet; 1077 flags = (flags & ~tintFlags) | new_flags | tintSet;
1005 return true; 1078 return true;
… …
1023} 1096}
1024 1097
1025bool 1098bool
1026bgPixmap_t::set_shade (const char *shade_str) 1099bgPixmap_t::set_shade (const char *shade_str)
1027{ 1100{
1028 int new_shade = (shade_str) ? atoi (shade_str) : 0; 1101 int new_shade = (shade_str) ? atoi (shade_str) : 100;
1029 1102
1030 if (new_shade < 0 && new_shade > -100) 1103 clamp_it (new_shade, -100, 200);
1104 if (new_shade < 0)
1031 new_shade = 200 - (100 + new_shade); 1105 new_shade = 200 - (100 + new_shade);
1032 else if (new_shade == 100)
1033 new_shade = 0;
1034 1106
1035 if (new_shade != shade) 1107 if (new_shade != shade)
1036 { 1108 {
1037 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 1109 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
1038 shade = new_shade; 1110 shade = new_shade;
1039 flags = (flags & (~tintFlags | tintSet)) | new_flags; 1111 flags = (flags & (~tintFlags | tintSet)) | new_flags;
1040 return true; 1112 return true;
1041 } 1113 }
1042 1114
1043 return false; 1115 return false;
1116}
1117
1118#if XFT
1119static void
1120get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1121{
1122 double sigma = radius / 2.0;
1123 double scale = sqrt (2.0 * M_PI) * sigma;
1124 double sum = 0.0;
1125
1126 for (int i = 0; i < width; i++)
1127 {
1128 double x = i - width / 2;
1129 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1130 sum += kernel[i];
1131 }
1132
1133 params[0] = XDoubleToFixed (width);
1134 params[1] = XDoubleToFixed (1);
1135
1136 for (int i = 0; i < width; i++)
1137 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1138}
1139#endif
1140
1141bool
1142bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1143{
1144 bool ret = false;
1145#if XFT
1146 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1147 double *kernel = (double *)malloc (size * sizeof (double));
1148 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1149
1150 Display *dpy = target->dpy;
1151 XRenderPictureAttributes pa;
1152 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, target->visual);
1153
1154 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1155 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1156
1157 if (kernel && params && src && dst)
1158 {
1159 if (h_blurRadius)
1160 {
1161 size = h_blurRadius * 2 + 1;
1162 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1163
1164 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1165 XRenderComposite (dpy,
1166 PictOpSrc,
1167 src,
1168 None,
1169 dst,
1170 0, 0,
1171 0, 0,
1172 0, 0,
1173 width, height);
1174 }
1175
1176 if (v_blurRadius)
1177 {
1178 size = v_blurRadius * 2 + 1;
1179 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1180 swap (params[0], params[1]);
1181
1182 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1183 XRenderComposite (dpy,
1184 PictOpSrc,
1185 src,
1186 None,
1187 dst,
1188 0, 0,
1189 0, 0,
1190 0, 0,
1191 width, height);
1192 }
1193
1194 ret = true;
1195 }
1196
1197 free (kernel);
1198 free (params);
1199 XRenderFreePicture (dpy, src);
1200 XRenderFreePicture (dpy, dst);
1201#endif
1202 return ret;
1203}
1204
1205bool
1206bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1207{
1208 Display *dpy = target->dpy;
1209 bool ret = false;
1210
1211 if (flags & tintWholesome)
1212 {
1213 XGCValues gcv;
1214 GC gc;
1215
1216 /* In this case we can tint image server-side getting significant
1217 * performance improvements, as we eliminate XImage transfer
1218 */
1219 gcv.foreground = Pixel (tint);
1220 gcv.function = GXand;
1221 gcv.fill_style = FillSolid;
1222 gc = XCreateGC (dpy, pixmap, GCFillStyle | GCForeground | GCFunction, &gcv);
1223 if (gc)
1224 {
1225 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1226 ret = true;
1227 XFreeGC (dpy, gc);
1228 }
1229 }
1230 else
1231 {
1232# if XFT
1233 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1234
1235 if (flags & tintSet)
1236 tint.get (c);
1237
1238 if (shade <= 100)
1239 {
1240 c.r = (c.r * shade) / 100;
1241 c.g = (c.g * shade) / 100;
1242 c.b = (c.b * shade) / 100;
1243 }
1244 else
1245 {
1246 c.r = ((0xffff - c.r) * (200 - shade)) / 100;
1247 c.g = ((0xffff - c.g) * (200 - shade)) / 100;
1248 c.b = ((0xffff - c.b) * (200 - shade)) / 100;
1249 }
1250
1251 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1252 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1253 XRenderPictureAttributes pa;
1254
1255 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1256
1257 pa.repeat = True;
1258
1259 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1260 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1261 XFreePixmap (dpy, overlay_pmap);
1262
1263 pa.component_alpha = True;
1264 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1265 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1266 XFreePixmap (dpy, mask_pmap);
1267
1268 if (mask_pic && overlay_pic && back_pic)
1269 {
1270 XRenderColor mask_c;
1271
1272 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1273 mask_c.alpha = 0xffff;
1274 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1275
1276 mask_c.alpha = 0;
1277 mask_c.red = 0xffff - c.r;
1278 mask_c.green = 0xffff - c.g;
1279 mask_c.blue = 0xffff - c.b;
1280 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1281 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1282 ret = true;
1283 }
1284
1285 XRenderFreePicture (dpy, mask_pic);
1286 XRenderFreePicture (dpy, overlay_pic);
1287 XRenderFreePicture (dpy, back_pic);
1288# if DO_TIMING_TEST
1289 XSync (dpy, False);
1290# endif
1291# endif
1292 }
1293
1294 return ret;
1044} 1295}
1045 1296
1046/* make_transparency_pixmap() 1297/* make_transparency_pixmap()
1047 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1298 * Builds a pixmap sized the same as terminal window, with depth same as the root window
1048 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 1299 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by
… …
1067 unsigned int root_pmap_width, root_pmap_height; 1318 unsigned int root_pmap_width, root_pmap_height;
1068 int window_width = target->szHint.width; 1319 int window_width = target->szHint.width;
1069 int window_height = target->szHint.height; 1320 int window_height = target->szHint.height;
1070 int sx, sy; 1321 int sx, sy;
1071 XGCValues gcv; 1322 XGCValues gcv;
1323 GC gc;
1072 1324
1073 TIMING_TEST_START (tp); 1325 TIMING_TEST_START (tp);
1074 target->get_window_origin (sx, sy); 1326 target->get_window_origin (sx, sy);
1075 1327
1076 /* check if we are outside of the visible part of the virtual screen : */ 1328 /* check if we are outside of the visible part of the virtual screen : */
… …
1078 || sx >= root_width || sy >= root_height) 1330 || sx >= root_width || sy >= root_height)
1079 return 0; 1331 return 0;
1080 1332
1081 if (root_pixmap != None) 1333 if (root_pixmap != None)
1082 { 1334 {
1083 /* we want to validate the pixmap and get it's size at the same time : */ 1335 /* we want to validate the pixmap and get its size at the same time : */
1084 int junk; 1336 int junk;
1085 unsigned int ujunk; 1337 unsigned int ujunk;
1086 /* root pixmap may be bad - allow a error */ 1338 /* root pixmap may be bad - allow a error */
1087 target->allowedxerror = -1; 1339 target->allowedxerror = -1;
1088 1340
… …
1090 root_pixmap = None; 1342 root_pixmap = None;
1091 1343
1092 target->allowedxerror = 0; 1344 target->allowedxerror = 0;
1093 } 1345 }
1094 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, root, window_width, window_height, root_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 = root_pixmap;
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, root, 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); 1372 TIMING_TEST_PRINT_RESULT (tp);
1176 1373
1177 if (tiled_root_pmap != None) 1374 if (tiled_root_pmap != None)
1178 { 1375 {
1179 if (!need_client_side_rendering ()) 1376 if (!need_client_side_rendering ())
1180 { 1377 {
1181 if ((flags & tintNeeded)) 1378 if (flags & (blurNeeded | blurServerSide))
1379 {
1380 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height))
1381 result |= transpPmapBlurred;
1182 { 1382 }
1183 if (flags & tintWholesome) 1383 if (flags & (tintNeeded | tintServerSide))
1184 { 1384 {
1185 /* In this case we can tint image server-side getting significant 1385 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), 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; 1386 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 } 1387 }
1282 } /* server side rendering completed */ 1388 } /* server side rendering completed */
1283 1389
1284 if (pixmap) 1390 if (pixmap)
1285 XFreePixmap (dpy, pixmap); 1391 XFreePixmap (dpy, pixmap);
… …
1287 pixmap = tiled_root_pmap; 1393 pixmap = tiled_root_pmap;
1288 pmap_width = window_width; 1394 pmap_width = window_width;
1289 pmap_height = window_height; 1395 pmap_height = window_height;
1290 pmap_depth = root_depth; 1396 pmap_depth = root_depth;
1291 } 1397 }
1292
1293 if (gc)
1294 XFreeGC (dpy, gc);
1295 1398
1296 TIMING_TEST_PRINT_RESULT (tp); 1399 TIMING_TEST_PRINT_RESULT (tp);
1297 1400
1298 return result; 1401 return result;
1299} 1402}
… …
1524 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1627 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1525 int i; 1628 int i;
1526 1629
1527 Visual *visual = term->visual; 1630 Visual *visual = term->visual;
1528 1631
1529 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1632 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1530
1531 if (shade == 0)
1532 shade = 100;
1533 1633
1534 /* for convenience */ 1634 /* for convenience */
1535 mask_r = visual->red_mask; 1635 mask_r = visual->red_mask;
1536 mask_g = visual->green_mask; 1636 mask_g = visual->green_mask;
1537 mask_b = visual->blue_mask; 1637 mask_b = visual->blue_mask;
… …
1593 default: 1693 default:
1594 return; /* we do not support this color depth */ 1694 return; /* we do not support this color depth */
1595 } 1695 }
1596 1696
1597 /* prepare limits for color transformation (each channel is handled separately) */ 1697 /* prepare limits for color transformation (each channel is handled separately) */
1598 if (shade < 0) { 1698 if (shade > 100) {
1599 shade = -shade; 1699 shade = 200 - shade;
1600 if (shade < 0) shade = 0;
1601 if (shade > 100) shade = 100;
1602 1700
1603 lower_lim_r = 65535-rm; 1701 lower_lim_r = 65535-rm;
1604 lower_lim_g = 65535-gm; 1702 lower_lim_g = 65535-gm;
1605 lower_lim_b = 65535-bm; 1703 lower_lim_b = 65535-bm;
1606 1704
… …
1608 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1706 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
1609 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1707 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
1610 1708
1611 upper_lim_r = upper_lim_g = upper_lim_b = 65535; 1709 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1612 } else { 1710 } else {
1613 if (shade < 0) shade = 0;
1614 if (shade > 100) shade = 100;
1615 1711
1616 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1712 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1617 1713
1618 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100); 1714 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1619 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100); 1715 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1620 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100); 1716 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1621 } 1717 }
1622 1718
1623 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */ 1719 /* 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 )) 1720 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000))
1625 { 1721 {
1626 unsigned int tmp; 1722 unsigned int tmp;
1627 1723
1628 tmp = lower_lim_r; 1724 tmp = lower_lim_r;
1629 lower_lim_r = lower_lim_b; 1725 lower_lim_r = lower_lim_b;

Diff Legend

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