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.56 by sf-exg, Thu Sep 2 23:40:56 2010 UTC vs.
Revision 1.81 by sf-exg, Wed Oct 13 23:08:11 2010 UTC

… …
19 * You should have received a copy of the GNU General Public License 19 * You should have received a copy of the GNU General Public License
20 * along with this program; if not, write to the Free Software 20 * along with this program; if not, write to the Free Software
21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22 *---------------------------------------------------------------------*/ 22 *---------------------------------------------------------------------*/
23 23
24#include <cmath>
24#include "../config.h" /* NECESSARY */ 25#include "../config.h" /* NECESSARY */
25#include "rxvt.h" /* NECESSARY */ 26#include "rxvt.h" /* NECESSARY */
26 27
27#define DO_TIMING_TEST 0 28#define DO_TIMING_TEST 0
28 29
… …
104#ifdef BG_IMAGE_FROM_FILE 105#ifdef BG_IMAGE_FROM_FILE
105 have_image = false; 106 have_image = false;
106 h_scale = v_scale = 0; 107 h_scale = v_scale = 0;
107 h_align = v_align = 0; 108 h_align = v_align = 0;
108#endif 109#endif
110#ifdef ENABLE_TRANSPARENCY
111 shade = 100;
112#endif
109 flags = 0; 113 flags = 0;
110 pixmap = None; 114 pixmap = None;
111 valid_since = invalid_since = 0; 115 valid_since = invalid_since = 0;
112 target = 0; 116 target = 0;
113} 117}
… …
138# endif 142# endif
139 143
140# ifdef BG_IMAGE_FROM_FILE 144# ifdef BG_IMAGE_FROM_FILE
141 if (have_image) 145 if (have_image)
142 { 146 {
143 if (h_scale != 0 || v_scale != 0 147 if (flags & sizeSensitive)
144 || h_align != 0 || v_align != 0)
145 return true; 148 return true;
146 } 149 }
147# endif 150# endif
148 151
149 return false; 152 return false;
… …
158# endif 161# endif
159 162
160# ifdef BG_IMAGE_FROM_FILE 163# ifdef BG_IMAGE_FROM_FILE
161 if (have_image) 164 if (have_image)
162 { 165 {
163 if (h_align == rootAlign || v_align == rootAlign) 166 if (flags & rootAlign)
164 return true; 167 return true;
165 } 168 }
166# endif 169# endif
167 170
168 return false; 171 return false;
… …
175 return true; 178 return true;
176# endif 179# endif
177# ifdef ENABLE_TRANSPARENCY 180# ifdef ENABLE_TRANSPARENCY
178 if (flags & isTransparent) 181 if (flags & isTransparent)
179 { 182 {
180# ifdef HAVE_AFTERIMAGE // can't blur without libAI anyways 183# ifdef HAVE_AFTERIMAGE
181 if ((flags & blurNeeded) && !(flags & blurServerSide)) 184 if ((flags & blurNeeded) && !(flags & blurServerSide))
182 return true; 185 return true;
183# endif 186# endif
184 if ((flags & tintNeeded) && !(flags & tintServerSide)) 187 if ((flags & tintNeeded) && !(flags & tintServerSide))
185 return true; 188 return true;
… …
208static inline bool 211static inline bool
209check_set_align_value (int geom_flags, int flag, int &align, int new_value) 212check_set_align_value (int geom_flags, int flag, int &align, int new_value)
210{ 213{
211 if (geom_flags & flag) 214 if (geom_flags & flag)
212 { 215 {
213 if (new_value != bgPixmap_t::rootAlign)
214 {
215 if (new_value < -100) 216 if (new_value < -100)
216 new_value = -100; 217 new_value = -100;
217 else if (new_value > 200) 218 else if (new_value > 200)
218 new_value = 200; 219 new_value = 200;
219 }
220 if (new_value != align) 220 if (new_value != align)
221 { 221 {
222 align = new_value; 222 align = new_value;
223 return true; 223 return true;
224 } 224 }
… …
230make_align_position (int align, int window_size, int image_size) 230make_align_position (int align, int window_size, int image_size)
231{ 231{
232 int diff = window_size - image_size; 232 int diff = window_size - image_size;
233 int smaller = min (image_size, window_size); 233 int smaller = min (image_size, window_size);
234 234
235 if (align >= 0 && align <= 50) 235 if (align >= 0 && align <= 100)
236 return diff * align / 100; 236 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 ) 237 else if (align > 100 && align <= 200 )
240 return ((align - 100) * smaller / 100) + window_size - smaller; 238 return ((align - 100) * smaller / 100) + window_size - smaller;
241 else if (align > -100 && align < 0) 239 else if (align >= -100 && align < 0)
242 return ((align + 100) * smaller / 100) - image_size; 240 return ((align + 100) * smaller / 100) - image_size;
243 return 0; 241 return 0;
244} 242}
245 243
246static inline int 244static inline int
247make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 245make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
248{ 246{
249 int src_pos = 0; 247 int src_pos = 0;
250 dst_pos = 0; 248 dst_pos = pos;
251 dst_size = size; 249 dst_size = size;
252 if (pos < 0 && size > target_size) 250 if (pos < 0)
253 { 251 {
254 src_pos = -pos; 252 src_pos = -pos;
253 dst_pos = 0;
255 dst_size += pos; 254 dst_size += pos;
256 } 255 }
257 else if (pos > 0)
258 dst_pos = pos;
259 256
260 if (dst_pos + dst_size > target_size) 257 if (dst_pos + dst_size > target_size)
261 dst_size = target_size - dst_pos; 258 dst_size = target_size - dst_pos;
262 return src_pos; 259 return src_pos;
263} 260}
… …
388 w = h = noScale; 385 w = h = noScale;
389 geom_flags |= WidthValue|HeightValue; 386 geom_flags |= WidthValue|HeightValue;
390 } 387 }
391 else if (CHECK_GEOM_OPS ("propscale")) 388 else if (CHECK_GEOM_OPS ("propscale"))
392 { 389 {
393 if (w == 0 && h == 0)
394 {
395 w = windowScale;
396 geom_flags |= WidthValue;
397 }
398 new_flags |= propScale; 390 new_flags |= propScale;
399 } 391 }
400 else if (CHECK_GEOM_OPS ("hscale")) 392 else if (CHECK_GEOM_OPS ("hscale"))
401 { 393 {
402 if (w == 0) w = windowScale; 394 if (w == 0) w = windowScale;
… …
424 x = y = centerAlign; 416 x = y = centerAlign;
425 geom_flags |= WidthValue|HeightValue|XValue|YValue; 417 geom_flags |= WidthValue|HeightValue|XValue|YValue;
426 } 418 }
427 else if (CHECK_GEOM_OPS ("root")) 419 else if (CHECK_GEOM_OPS ("root"))
428 { 420 {
421 new_flags |= rootAlign;
429 w = h = noScale; 422 w = h = noScale;
430 x = y = rootAlign;
431 geom_flags |= WidthValue|HeightValue|XValue|YValue; 423 geom_flags |= WidthValue|HeightValue;
432 } 424 }
433# undef CHECK_GEOM_OPS 425# undef CHECK_GEOM_OPS
434 426
435 while (*ops != ':' && *ops != '\0') ++ops; 427 while (*ops != ':' && *ops != '\0') ++ops;
436 } /* done parsing ops */ 428 } /* done parsing ops */
… …
451 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 443 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
452 // flags, h_scale, v_scale, h_align, v_align); 444 // flags, h_scale, v_scale, h_align, v_align);
453 return (changed > 0); 445 return (changed > 0);
454} 446}
455 447
448void
449bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
450{
451 int target_width = target->szHint.width;
452 int target_height = target->szHint.height;
453
454 if (flags & propScale)
455 {
456 float scale = (float)target_width / image_width;
457 min_it (scale, (float)target_height / image_height);
458 w = image_width * scale + 0.5;
459 h = image_height * scale + 0.5;
460 }
461 else
462 {
463 w = h_scale * target_width / 100;
464 h = v_scale * target_height / 100;
465 }
466
467 if (!w) w = image_width;
468 if (!h) h = image_height;
469
470 if (flags & rootAlign)
471 {
472 target->get_window_origin (x, y);
473 x = -x;
474 y = -y;
475 }
476 else
477 {
478 x = make_align_position (h_align, target_width, w);
479 y = make_align_position (v_align, target_height, h);
480 }
481
482 flags &= ~sizeSensitive;
483 if (h_scale != 0 || v_scale != 0
484 || h_align != 0 || v_align != 0
485 || w > target_width || h > target_height)
486 flags |= sizeSensitive;
487}
488
456# ifdef HAVE_AFTERIMAGE 489# ifdef HAVE_AFTERIMAGE
457bool 490bool
458bgPixmap_t::render_image (unsigned long background_flags) 491bgPixmap_t::render_image (unsigned long background_flags)
459{ 492{
460 if (target == NULL) 493 if (target == NULL)
… …
470 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); 503 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
471 504
472 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 505 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
473 { 506 {
474 ShadingInfo as_shade; 507 ShadingInfo as_shade;
475 as_shade.shading = (shade == 0) ? 100 : shade; 508 as_shade.shading = shade;
476 509
477 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 510 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
478 if (flags & tintSet) 511 if (flags & tintSet)
479 tint.get (c); 512 tint.get (c);
480 as_shade.tintColor.red = c.r; 513 as_shade.tintColor.red = c.r;
… …
482 as_shade.tintColor.blue = c.b; 515 as_shade.tintColor.blue = c.b;
483 516
484 background_tint = shading2tint32 (&as_shade); 517 background_tint = shading2tint32 (&as_shade);
485 } 518 }
486 519
487 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL) 520 if (!(background_flags & transpPmapBlurred) && (flags & blurNeeded) && background != NULL)
488 { 521 {
489 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 522 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, 523 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
491 100, ASIMAGE_QUALITY_DEFAULT); 524 100, ASIMAGE_QUALITY_DEFAULT);
492 if (tmp) 525 if (tmp)
… …
504 int new_pmap_width = target_width; 537 int new_pmap_width = target_width;
505 int new_pmap_height = target_height; 538 int new_pmap_height = target_height;
506 539
507 int x = 0; 540 int x = 0;
508 int y = 0; 541 int y = 0;
509 int w = h_scale * target_width / 100; 542 int w = 0;
510 int h = v_scale * target_height / 100; 543 int h = 0;
511 544
512 TIMING_TEST_START (asim); 545 TIMING_TEST_START (asim);
513 546
514 if (original_asim) 547 if (original_asim)
515 { 548 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 549
530 if (!original_asim 550 if (!original_asim
551 || (!(flags & rootAlign)
531 || x >= target_width 552 && (x >= target_width
532 || y >= target_height 553 || y >= target_height
533 || (w > 0 && x + w <= 0) 554 || (x + w <= 0)
534 || (h > 0 && y + h <= 0)) 555 || (y + h <= 0))))
535 { 556 {
536 if (background) 557 if (background)
537 { 558 {
538 new_pmap_width = background->width; 559 new_pmap_width = background->width;
539 new_pmap_height = background->height; 560 new_pmap_height = background->height;
… …
553 } 574 }
554 else 575 else
555 { 576 {
556 result = original_asim; 577 result = original_asim;
557 578
558 if ((w > 0 && w != original_asim->width) 579 if ((w != original_asim->width)
559 || (h > 0 && h != original_asim->height)) 580 || (h != original_asim->height))
560 { 581 {
561 result = scale_asimage (target->asv, original_asim, 582 result = scale_asimage (target->asv, original_asim,
562 w > 0 ? w : original_asim->width, 583 w, h,
563 h > 0 ? h : original_asim->height,
564 background ? ASA_ASImage : ASA_XImage, 584 background ? ASA_ASImage : ASA_XImage,
565 100, ASIMAGE_QUALITY_DEFAULT); 585 100, ASIMAGE_QUALITY_DEFAULT);
566 } 586 }
567 587
568 if (background == NULL) 588 if (background == NULL)
569 { 589 {
570 /* if tiling - pixmap has to be sized exactly as the image,
571 but there is no need to make it bigger than the window! */
572 if (h_scale == 0)
573 new_pmap_width = min (result->width, target_width);
574 if (v_scale == 0)
575 new_pmap_height = min (result->height, target_height);
576 /* we also need to tile our image in one or both directions */
577 if (h_scale == 0 || v_scale == 0) 590 if (h_scale == 0 || v_scale == 0)
578 { 591 {
592 /* if tiling - pixmap has to be sized exactly as the image,
593 but there is no need to make it bigger than the window! */
594 new_pmap_width = min (result->width, target_width);
595 new_pmap_height = min (result->height, target_height);
596
597 /* we also need to tile our image in both directions */
579 ASImage *tmp = tile_asimage (target->asv, result, 598 ASImage *tmp = tile_asimage (target->asv, result,
580 (h_scale > 0) ? 0 : (int)result->width - x, 599 (int)result->width - x,
581 (v_scale > 0) ? 0 : (int)result->height - y, 600 (int)result->height - y,
582 new_pmap_width, 601 new_pmap_width,
583 new_pmap_height, 602 new_pmap_height,
584 TINT_LEAVE_SAME, ASA_XImage, 603 TINT_LEAVE_SAME, ASA_XImage,
585 100, ASIMAGE_QUALITY_DEFAULT); 604 100, ASIMAGE_QUALITY_DEFAULT);
586 if (tmp) 605 if (tmp)
… …
601 layers[0].clip_width = target_width; 620 layers[0].clip_width = target_width;
602 layers[0].clip_height = target_height; 621 layers[0].clip_height = target_height;
603 layers[0].tint = background_tint; 622 layers[0].tint = background_tint;
604 layers[1].im = result; 623 layers[1].im = result;
605 624
606 if (w <= 0) 625 if (h_scale == 0 || v_scale == 0)
607 { 626 {
608 /* tile horizontally */ 627 /* tile horizontally */
609 while (x > 0) x -= (int)result->width; 628 while (x > 0) x -= (int)result->width;
610 layers[1].dst_x = x; 629 layers[1].dst_x = x;
611 layers[1].clip_width = result->width+target_width; 630 layers[1].clip_width = result->width+target_width;
… …
615 /* clip horizontally */ 634 /* clip horizontally */
616 layers[1].dst_x = x; 635 layers[1].dst_x = x;
617 layers[1].clip_width = result->width; 636 layers[1].clip_width = result->width;
618 } 637 }
619 638
620 if (h <= 0) 639 if (h_scale == 0 || v_scale == 0)
621 { 640 {
622 while (y > 0) y -= (int)result->height; 641 while (y > 0) y -= (int)result->height;
623 layers[1].dst_y = y; 642 layers[1].dst_y = y;
624 layers[1].clip_height = result->height + target_height; 643 layers[1].clip_height = result->height + target_height;
625 } 644 }
… …
684 703
685 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 704 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
686 int dst_width = result->width, dst_height = result->height; 705 int dst_width = result->width, dst_height = result->height;
687 if (background == NULL) 706 if (background == NULL)
688 { 707 {
708 if (!(h_scale == 0 || v_scale == 0))
709 {
689 if (h_scale > 0) src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width ); 710 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
690 if (v_scale > 0) src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height); 711 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
712 }
691 713
692 if (dst_x > 0 || dst_y > 0 714 if (dst_x > 0 || dst_y > 0
693 || dst_x + dst_width < new_pmap_width 715 || dst_x + dst_width < new_pmap_width
694 || dst_y + dst_height < new_pmap_height) 716 || dst_y + dst_height < new_pmap_height)
695 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 717 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
… …
723 return false; 745 return false;
724 746
725 if (!pixbuf) 747 if (!pixbuf)
726 return false; 748 return false;
727 749
728 // TODO: add alpha blending 750#if !XFT
729 if (background_flags) 751 if (background_flags)
730 return false; 752 return false;
753#endif
731 754
732 GdkPixbuf *result; 755 GdkPixbuf *result;
733 756
734 int image_width = gdk_pixbuf_get_width (pixbuf); 757 int image_width = gdk_pixbuf_get_width (pixbuf);
735 int image_height = gdk_pixbuf_get_height (pixbuf); 758 int image_height = gdk_pixbuf_get_height (pixbuf);
… …
739 int new_pmap_width = target_width; 762 int new_pmap_width = target_width;
740 int new_pmap_height = target_height; 763 int new_pmap_height = target_height;
741 764
742 int x = 0; 765 int x = 0;
743 int y = 0; 766 int y = 0;
744 int w = h_scale * target_width / 100; 767 int w = 0;
745 int h = v_scale * target_height / 100; 768 int h = 0;
746 769
747 if (h_align == rootAlign || v_align == rootAlign) 770 get_image_geometry (image_width, image_height, w, h, x, y);
748 {
749 target->get_window_origin (x, y);
750 x = -x;
751 y = -y;
752 }
753 771
754 if (h_align != rootAlign) 772 if (!(flags & rootAlign)
755 x = make_align_position (h_align, target_width, w > 0 ? w : image_width);
756
757 if (v_align != rootAlign)
758 y = make_align_position (v_align, target_height, h > 0 ? h : image_height);
759
760 if (x >= target_width 773 && (x >= target_width
761 || y >= target_height 774 || y >= target_height
762 || (w > 0 && x + w <= 0) 775 || (x + w <= 0)
763 || (h > 0 && y + h <= 0)) 776 || (y + h <= 0)))
764 return false; 777 return false;
765 778
766 result = pixbuf; 779 result = pixbuf;
767 780
768 if ((w > 0 && w != image_width) 781 if ((w != image_width)
769 || (h > 0 && h != image_height)) 782 || (h != image_height))
770 { 783 {
771 result = gdk_pixbuf_scale_simple (pixbuf, 784 result = gdk_pixbuf_scale_simple (pixbuf,
772 w > 0 ? w : image_width, 785 w, h,
773 h > 0 ? h : image_height,
774 GDK_INTERP_BILINEAR); 786 GDK_INTERP_BILINEAR);
775 } 787 }
776 788
777 bool ret = false; 789 bool ret = false;
778 790
779 if (result) 791 if (result)
780 { 792 {
781 XGCValues gcv; 793 XGCValues gcv;
782 GC gc; 794 GC gc;
795 Pixmap root_pmap;
783 796
784 image_width = gdk_pixbuf_get_width (result); 797 image_width = gdk_pixbuf_get_width (result);
785 image_height = gdk_pixbuf_get_height (result); 798 image_height = gdk_pixbuf_get_height (result);
786 799
787 if (h_scale == 0) 800 if (background_flags)
801 {
802 root_pmap = pixmap;
803 pixmap = None;
804 }
805 else
806 {
807 if (h_scale == 0 || v_scale == 0)
808 {
788 new_pmap_width = min (image_width, target_width); 809 new_pmap_width = min (image_width, target_width);
789 if (v_scale == 0)
790 new_pmap_height = min (image_height, target_height); 810 new_pmap_height = min (image_height, target_height);
811 }
812 }
791 813
792 if (pixmap) 814 if (pixmap)
793 { 815 {
794 if (pmap_width != new_pmap_width 816 if (pmap_width != new_pmap_width
795 || pmap_height != new_pmap_height 817 || pmap_height != new_pmap_height
… …
849 dst_x, dst_y, 871 dst_x, dst_y,
850 dst_width, dst_height, 872 dst_width, dst_height,
851 XLIB_RGB_DITHER_NONE, 873 XLIB_RGB_DITHER_NONE,
852 0, 0); 874 0, 0);
853 } 875 }
876
877#if XFT
878 if (background_flags)
879 {
880 Display *dpy = target->dpy;
881 XRenderPictureAttributes pa;
882
883 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen));
884 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
885
886 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
887 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
888
889 pa.repeat = True;
890 Pixmap mask_pmap = XCreatePixmap (dpy, target->vt, 1, 1, 8);
891 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
892 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
893 XFreePixmap (dpy, mask_pmap);
894
895 if (src && dst && mask)
896 {
897 XRenderColor mask_c;
898
899 mask_c.alpha = 0x8000;
900 mask_c.red = 0;
901 mask_c.green = 0;
902 mask_c.blue = 0;
903 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
904 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
905 }
906
907 XRenderFreePicture (dpy, src);
908 XRenderFreePicture (dpy, dst);
909 XRenderFreePicture (dpy, mask);
910
911 XFreePixmap (dpy, root_pmap);
912 }
913#endif
854 914
855 if (result != pixbuf) 915 if (result != pixbuf)
856 g_object_unref (result); 916 g_object_unref (result);
857 917
858 XFreeGC (target->dpy, gc); 918 XFreeGC (target->dpy, gc);
… …
926 if (!(geom_flags & WidthValue)) 986 if (!(geom_flags & WidthValue))
927 hr = 1; 987 hr = 1;
928 if (!(geom_flags & HeightValue)) 988 if (!(geom_flags & HeightValue))
929 vr = hr; 989 vr = hr;
930 990
991 min_it (hr, 128);
992 min_it (vr, 128);
993
931 if (h_blurRadius != hr) 994 if (h_blurRadius != hr)
932 { 995 {
933 ++changed; 996 ++changed;
934 h_blurRadius = hr; 997 h_blurRadius = hr;
935 } 998 }
… …
943 if (v_blurRadius == 0 && h_blurRadius == 0) 1006 if (v_blurRadius == 0 && h_blurRadius == 0)
944 flags &= ~blurNeeded; 1007 flags &= ~blurNeeded;
945 else 1008 else
946 flags |= blurNeeded; 1009 flags |= blurNeeded;
947 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
948 return (changed > 0); 1023 return (changed > 0);
949} 1024}
950 1025
951static inline unsigned long 1026static inline unsigned long
952compute_tint_shade_flags (rxvt_color *tint, int shade) 1027compute_tint_shade_flags (rxvt_color *tint, int shade)
953{ 1028{
954 unsigned long flags = 0; 1029 unsigned long flags = 0;
955 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1030 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
956 bool has_shade = (shade > 0 && shade < 100) || (shade > 100 && shade < 200); 1031 bool has_shade = shade != 100;
957 1032
958 if (tint) 1033 if (tint)
959 { 1034 {
960 tint->get (c); 1035 tint->get (c);
961# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 1036# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
… …
993} 1068}
994 1069
995bool 1070bool
996bgPixmap_t::set_tint (rxvt_color &new_tint) 1071bgPixmap_t::set_tint (rxvt_color &new_tint)
997{ 1072{
998 if (tint != new_tint) 1073 if (!(flags & tintSet) || tint != new_tint)
999 { 1074 {
1000 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1075 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
1001 tint = new_tint; 1076 tint = new_tint;
1002 flags = (flags & ~tintFlags) | new_flags | tintSet; 1077 flags = (flags & ~tintFlags) | new_flags | tintSet;
1003 return true; 1078 return true;
… …
1021} 1096}
1022 1097
1023bool 1098bool
1024bgPixmap_t::set_shade (const char *shade_str) 1099bgPixmap_t::set_shade (const char *shade_str)
1025{ 1100{
1026 int new_shade = (shade_str) ? atoi (shade_str) : 0; 1101 int new_shade = (shade_str) ? atoi (shade_str) : 100;
1027 1102
1028 if (new_shade < 0 && new_shade > -100) 1103 clamp_it (new_shade, -100, 200);
1104 if (new_shade < 0)
1029 new_shade = 200 - (100 + new_shade); 1105 new_shade = 200 - (100 + new_shade);
1030 else if (new_shade == 100)
1031 new_shade = 0;
1032 1106
1033 if (new_shade != shade) 1107 if (new_shade != shade)
1034 { 1108 {
1035 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);
1036 shade = new_shade; 1110 shade = new_shade;
1037 flags = (flags & (~tintFlags | tintSet)) | new_flags; 1111 flags = (flags & (~tintFlags | tintSet)) | new_flags;
1038 return true; 1112 return true;
1039 } 1113 }
1040 1114
1041 return false; 1115 return false;
1116}
1117
1118static void
1119get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1120{
1121 double sigma = radius / 2.0;
1122 double scale = sqrt (2.0 * M_PI) * sigma;
1123 double sum = 0.0;
1124
1125 for (int i = 0; i < width; i++)
1126 {
1127 double x = i - width / 2;
1128 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1129 sum += kernel[i];
1130 }
1131
1132 params[0] = XDoubleToFixed (width);
1133 params[1] = XDoubleToFixed (1);
1134
1135 for (int i = 0; i < width; i++)
1136 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1137}
1138
1139bool
1140bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1141{
1142 bool ret = false;
1143#if XFT
1144 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1145 double *kernel = (double *)malloc (size * sizeof (double));
1146 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1147
1148 Display *dpy = target->dpy;
1149 XRenderPictureAttributes pa;
1150 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, target->visual);
1151
1152 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1153 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1154
1155 if (kernel && params && src && dst)
1156 {
1157 if (h_blurRadius)
1158 {
1159 size = h_blurRadius * 2 + 1;
1160 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1161
1162 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1163 XRenderComposite (dpy,
1164 PictOpSrc,
1165 src,
1166 None,
1167 dst,
1168 0, 0,
1169 0, 0,
1170 0, 0,
1171 width, height);
1172 }
1173
1174 if (v_blurRadius)
1175 {
1176 size = v_blurRadius * 2 + 1;
1177 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1178 swap (params[0], params[1]);
1179
1180 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1181 XRenderComposite (dpy,
1182 PictOpSrc,
1183 src,
1184 None,
1185 dst,
1186 0, 0,
1187 0, 0,
1188 0, 0,
1189 width, height);
1190 }
1191
1192 ret = true;
1193 }
1194
1195 free (kernel);
1196 free (params);
1197 XRenderFreePicture (dpy, src);
1198 XRenderFreePicture (dpy, dst);
1199#endif
1200 return ret;
1201}
1202
1203bool
1204bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1205{
1206 Display *dpy = target->dpy;
1207 bool ret = false;
1208
1209 if (flags & tintWholesome)
1210 {
1211 XGCValues gcv;
1212 GC gc;
1213
1214 /* In this case we can tint image server-side getting significant
1215 * performance improvements, as we eliminate XImage transfer
1216 */
1217 gcv.foreground = Pixel (tint);
1218 gcv.function = GXand;
1219 gcv.fill_style = FillSolid;
1220 gc = XCreateGC (dpy, pixmap, GCFillStyle | GCForeground | GCFunction, &gcv);
1221 if (gc)
1222 {
1223 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1224 ret = true;
1225 XFreeGC (dpy, gc);
1226 }
1227 }
1228 else
1229 {
1230# if XFT
1231 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1232
1233 if (flags & tintSet)
1234 tint.get (c);
1235
1236 if (shade <= 100)
1237 {
1238 c.r = (c.r * shade) / 100;
1239 c.g = (c.g * shade) / 100;
1240 c.b = (c.b * shade) / 100;
1241 }
1242 else
1243 {
1244 c.r = ((0xffff - c.r) * (200 - shade)) / 100;
1245 c.g = ((0xffff - c.g) * (200 - shade)) / 100;
1246 c.b = ((0xffff - c.b) * (200 - shade)) / 100;
1247 }
1248
1249 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1250 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1251 XRenderPictureAttributes pa;
1252
1253 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1254
1255 pa.repeat = True;
1256
1257 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1258 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1259 XFreePixmap (dpy, overlay_pmap);
1260
1261 pa.component_alpha = True;
1262 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1263 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1264 XFreePixmap (dpy, mask_pmap);
1265
1266 if (mask_pic && overlay_pic && back_pic)
1267 {
1268 XRenderColor mask_c;
1269
1270 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1271 mask_c.alpha = 0xffff;
1272 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1273
1274 mask_c.alpha = 0;
1275 mask_c.red = 0xffff - c.r;
1276 mask_c.green = 0xffff - c.g;
1277 mask_c.blue = 0xffff - c.b;
1278 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1279 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1280 ret = true;
1281 }
1282
1283 XRenderFreePicture (dpy, mask_pic);
1284 XRenderFreePicture (dpy, overlay_pic);
1285 XRenderFreePicture (dpy, back_pic);
1286# if DO_TIMING_TEST
1287 XSync (dpy, False);
1288# endif
1289# endif
1290 }
1291
1292 return ret;
1042} 1293}
1043 1294
1044/* make_transparency_pixmap() 1295/* make_transparency_pixmap()
1045 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1296 * Builds a pixmap sized the same as terminal window, with depth same as the root window
1046 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 1297 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by
… …
1065 unsigned int root_pmap_width, root_pmap_height; 1316 unsigned int root_pmap_width, root_pmap_height;
1066 int window_width = target->szHint.width; 1317 int window_width = target->szHint.width;
1067 int window_height = target->szHint.height; 1318 int window_height = target->szHint.height;
1068 int sx, sy; 1319 int sx, sy;
1069 XGCValues gcv; 1320 XGCValues gcv;
1321 GC gc;
1070 1322
1071 TIMING_TEST_START (tp); 1323 TIMING_TEST_START (tp);
1072 target->get_window_origin (sx, sy); 1324 target->get_window_origin (sx, sy);
1073 1325
1074 /* check if we are outside of the visible part of the virtual screen : */ 1326 /* check if we are outside of the visible part of the virtual screen : */
… …
1076 || sx >= root_width || sy >= root_height) 1328 || sx >= root_width || sy >= root_height)
1077 return 0; 1329 return 0;
1078 1330
1079 if (root_pixmap != None) 1331 if (root_pixmap != None)
1080 { 1332 {
1081 /* we want to validate the pixmap and get it's size at the same time : */ 1333 /* we want to validate the pixmap and get its size at the same time : */
1082 int junk; 1334 int junk;
1083 unsigned int ujunk; 1335 unsigned int ujunk;
1084 /* root pixmap may be bad - allow a error */ 1336 /* root pixmap may be bad - allow a error */
1085 target->allowedxerror = -1; 1337 target->allowedxerror = -1;
1086 1338
… …
1088 root_pixmap = None; 1340 root_pixmap = None;
1089 1341
1090 target->allowedxerror = 0; 1342 target->allowedxerror = 0;
1091 } 1343 }
1092 1344
1345 if (root_pixmap == None)
1346 return 0;
1347
1093 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1348 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth);
1094 GC gc = NULL;
1095 1349
1096 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1350 if (tiled_root_pmap == None) /* something really bad happened - abort */
1097 return 0; 1351 return 0;
1098 1352
1099 if (root_pixmap == None)
1100 {
1101 /* use tricks to obtain the root background image :*/
1102 /* we want to create Overrideredirect window overlapping out window
1103 with background type of Parent Relative and then grab it */
1104 XSetWindowAttributes attr;
1105 Window src;
1106 bool success = false;
1107
1108 attr.background_pixmap = ParentRelative;
1109 attr.backing_store = Always;
1110 attr.event_mask = ExposureMask;
1111 attr.override_redirect = True;
1112 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
1113 CopyFromParent, CopyFromParent, CopyFromParent,
1114 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
1115 &attr);
1116
1117 if (src != None)
1118 {
1119 XEvent event;
1120 int ev_count = 0;
1121 XGrabServer (dpy);
1122 XMapRaised (dpy, src);
1123 XSync (dpy, False);
1124
1125 /* XSync should get window where it's properly exposed,
1126 * but to be on the safe side - let's check for the actual event to arrive : */
1127 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
1128 ++ev_count;
1129
1130 if (ev_count > 0);
1131 {
1132 /* hooray! - we can grab the image! */
1133 gc = XCreateGC (dpy, root, 0, NULL);
1134 if (gc)
1135 {
1136 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
1137 success = true;
1138 }
1139 }
1140
1141 XDestroyWindow (dpy, src);
1142 XUngrabServer (dpy);
1143 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
1144 }
1145
1146 if (!success)
1147 {
1148 XFreePixmap (dpy, tiled_root_pmap);
1149 tiled_root_pmap = None;
1150 }
1151 else
1152 result |= transpPmapTiled;
1153 }
1154 else
1155 {
1156 /* straightforward pixmap copy */ 1353 /* straightforward pixmap copy */
1157 gcv.tile = root_pixmap; 1354 gcv.tile = root_pixmap;
1158 gcv.fill_style = FillTiled; 1355 gcv.fill_style = FillTiled;
1159 1356
1160 while (sx < 0) sx += (int)root_width; 1357 while (sx < 0) sx += (int)root_width;
1161 while (sy < 0) sy += (int)root_height; 1358 while (sy < 0) sy += (int)root_height;
1162 1359
1163 gcv.ts_x_origin = -sx; 1360 gcv.ts_x_origin = -sx;
1164 gcv.ts_y_origin = -sy; 1361 gcv.ts_y_origin = -sy;
1165 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1362 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1166 1363
1167 if (gc) 1364 if (gc)
1168 { 1365 {
1169 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1366 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1170 result |= transpPmapTiled; 1367 result |= transpPmapTiled;
1171 } 1368 XFreeGC (dpy, gc);
1172 } 1369 }
1173 TIMING_TEST_PRINT_RESULT (tp); 1370 TIMING_TEST_PRINT_RESULT (tp);
1174 1371
1175 if (tiled_root_pmap != None) 1372 if (tiled_root_pmap != None)
1176 { 1373 {
1177 if (!need_client_side_rendering ()) 1374 if (!need_client_side_rendering ())
1178 { 1375 {
1376 if ((flags & blurNeeded))
1377 {
1378 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height))
1379 result |= transpPmapBlurred;
1380 }
1179 if ((flags & tintNeeded)) 1381 if ((flags & tintNeeded))
1180 { 1382 {
1181 if (flags & tintWholesome) 1383 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height))
1182 {
1183 /* In this case we can tint image server-side getting significant
1184 * performance improvements, as we eliminate XImage transfer
1185 */
1186 gcv.foreground = Pixel (tint);
1187 gcv.function = GXand;
1188 gcv.fill_style = FillSolid;
1189 if (gc)
1190 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcv);
1191 else
1192 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv);
1193 if (gc)
1194 {
1195 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1196 result |= transpPmapTinted; 1384 result |= transpPmapTinted;
1197 }
1198 }
1199 else
1200 {
1201# if XFT
1202 Picture back_pic = 0;
1203 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1204
1205 if (flags & tintSet)
1206 tint.get (c);
1207
1208 if (shade > 0 && shade < 100)
1209 {
1210 c.r = (c.r * shade) / 100;
1211 c.g = (c.g * shade) / 100;
1212 c.b = (c.b * shade) / 100;
1213 }
1214 else if (shade > 100 && shade < 200)
1215 {
1216 c.r = (c.r * (200 - shade)) / 100;
1217 c.g = (c.g * (200 - shade)) / 100;
1218 c.b = (c.b * (200 - shade)) / 100;
1219 }
1220
1221 XRenderPictFormat pf;
1222 pf.type = PictTypeDirect;
1223 pf.depth = 32;
1224 pf.direct.redMask = 0xff;
1225 pf.direct.greenMask = 0xff;
1226 pf.direct.blueMask = 0xff;
1227 pf.direct.alphaMask = 0xff;
1228
1229 XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
1230 (PictFormatType|
1231 PictFormatDepth|
1232 PictFormatRedMask|
1233 PictFormatGreenMask|
1234 PictFormatBlueMask|
1235 PictFormatAlphaMask),
1236 &pf,
1237 0);
1238 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
1239 XRenderPictureAttributes pa ;
1240
1241 back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa);
1242
1243 pa.repeat = True;
1244
1245 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1246 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1247 XFreePixmap (dpy, overlay_pmap);
1248
1249 pa.component_alpha = True;
1250 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1251 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1252 XFreePixmap (dpy, mask_pmap);
1253
1254 if (mask_pic && overlay_pic && back_pic)
1255 {
1256 XRenderColor mask_c;
1257
1258 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1259 mask_c.alpha = 0xffff;
1260 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1261
1262 mask_c.alpha = 0;
1263 mask_c.red = 0xffff - c.r;
1264 mask_c.green = 0xffff - c.g;
1265 mask_c.blue = 0xffff - c.b;
1266 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1267 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
1268 result |= transpPmapTinted;
1269 }
1270
1271 XRenderFreePicture (dpy, mask_pic);
1272 XRenderFreePicture (dpy, overlay_pic);
1273 XRenderFreePicture (dpy, back_pic);
1274# if DO_TIMING_TEST
1275 XSync (dpy, False);
1276# endif
1277# endif
1278 }
1279 } 1385 }
1280 } /* server side rendering completed */ 1386 } /* server side rendering completed */
1281 1387
1282 if (pixmap) 1388 if (pixmap)
1283 XFreePixmap (dpy, pixmap); 1389 XFreePixmap (dpy, pixmap);
… …
1285 pixmap = tiled_root_pmap; 1391 pixmap = tiled_root_pmap;
1286 pmap_width = window_width; 1392 pmap_width = window_width;
1287 pmap_height = window_height; 1393 pmap_height = window_height;
1288 pmap_depth = root_depth; 1394 pmap_depth = root_depth;
1289 } 1395 }
1290
1291 if (gc)
1292 XFreeGC (dpy, gc);
1293 1396
1294 TIMING_TEST_PRINT_RESULT (tp); 1397 TIMING_TEST_PRINT_RESULT (tp);
1295 1398
1296 return result; 1399 return result;
1297} 1400}
… …
1523 int i; 1626 int i;
1524 1627
1525 Visual *visual = term->visual; 1628 Visual *visual = term->visual;
1526 1629
1527 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1630 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ;
1528
1529 if (shade == 0)
1530 shade = 100;
1531 1631
1532 /* for convenience */ 1632 /* for convenience */
1533 mask_r = visual->red_mask; 1633 mask_r = visual->red_mask;
1534 mask_g = visual->green_mask; 1634 mask_g = visual->green_mask;
1535 mask_b = visual->blue_mask; 1635 mask_b = visual->blue_mask;
… …
1591 default: 1691 default:
1592 return; /* we do not support this color depth */ 1692 return; /* we do not support this color depth */
1593 } 1693 }
1594 1694
1595 /* prepare limits for color transformation (each channel is handled separately) */ 1695 /* prepare limits for color transformation (each channel is handled separately) */
1596 if (shade < 0) { 1696 if (shade > 100) {
1597 shade = -shade; 1697 shade = 200 - shade;
1598 if (shade < 0) shade = 0;
1599 if (shade > 100) shade = 100;
1600 1698
1601 lower_lim_r = 65535-rm; 1699 lower_lim_r = 65535-rm;
1602 lower_lim_g = 65535-gm; 1700 lower_lim_g = 65535-gm;
1603 lower_lim_b = 65535-bm; 1701 lower_lim_b = 65535-bm;
1604 1702
… …
1606 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1704 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
1607 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1705 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
1608 1706
1609 upper_lim_r = upper_lim_g = upper_lim_b = 65535; 1707 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1610 } else { 1708 } else {
1611 if (shade < 0) shade = 0;
1612 if (shade > 100) shade = 100;
1613 1709
1614 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1710 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1615 1711
1616 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100); 1712 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1617 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100); 1713 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);

Diff Legend

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