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.53 by sf-exg, Wed Sep 1 13:18:55 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
… …
96 // this is basically redundant as bgPixmap_t is only used in 97 // this is basically redundant as bgPixmap_t is only used in
97 // zero_initialised-derived structs 98 // zero_initialised-derived structs
98#ifdef HAVE_AFTERIMAGE 99#ifdef HAVE_AFTERIMAGE
99 original_asim = NULL; 100 original_asim = NULL;
100#endif 101#endif
102#ifdef HAVE_PIXBUF
103 pixbuf = NULL;
104#endif
101#ifdef BG_IMAGE_FROM_FILE 105#ifdef BG_IMAGE_FROM_FILE
102 have_image = false; 106 have_image = false;
103 h_scale = v_scale = 0; 107 h_scale = v_scale = 0;
104 h_align = v_align = 0; 108 h_align = v_align = 0;
105#endif 109#endif
110#ifdef ENABLE_TRANSPARENCY
111 shade = 100;
112#endif
106 flags = 0; 113 flags = 0;
107 pixmap = None; 114 pixmap = None;
108 valid_since = invalid_since = 0; 115 valid_since = invalid_since = 0;
109 target = 0; 116 target = 0;
110} 117}
… …
115#ifdef HAVE_AFTERIMAGE 122#ifdef HAVE_AFTERIMAGE
116 if (original_asim) 123 if (original_asim)
117 safe_asimage_destroy (original_asim); 124 safe_asimage_destroy (original_asim);
118#endif 125#endif
119 126
127#ifdef HAVE_PIXBUF
128 if (pixbuf)
129 g_object_unref (pixbuf);
130#endif
131
120 if (pixmap && target) 132 if (pixmap && target)
121 XFreePixmap (target->dpy, pixmap); 133 XFreePixmap (target->dpy, pixmap);
122} 134}
123 135
124bool 136bool
… …
130# endif 142# endif
131 143
132# ifdef BG_IMAGE_FROM_FILE 144# ifdef BG_IMAGE_FROM_FILE
133 if (have_image) 145 if (have_image)
134 { 146 {
135 if (h_scale != 0 || v_scale != 0 147 if (flags & sizeSensitive)
136 || h_align != 0 || v_align != 0)
137 return true; 148 return true;
138 } 149 }
139# endif 150# endif
140 151
141 return false; 152 return false;
… …
150# endif 161# endif
151 162
152# ifdef BG_IMAGE_FROM_FILE 163# ifdef BG_IMAGE_FROM_FILE
153 if (have_image) 164 if (have_image)
154 { 165 {
155 if (h_align == rootAlign || v_align == rootAlign) 166 if (flags & rootAlign)
156 return true; 167 return true;
157 } 168 }
158# endif 169# endif
159 170
160 return false; 171 return false;
… …
167 return true; 178 return true;
168# endif 179# endif
169# ifdef ENABLE_TRANSPARENCY 180# ifdef ENABLE_TRANSPARENCY
170 if (flags & isTransparent) 181 if (flags & isTransparent)
171 { 182 {
172# ifdef HAVE_AFTERIMAGE // can't blur without libAI anyways 183# ifdef HAVE_AFTERIMAGE
173 if ((flags & blurNeeded) && !(flags & blurServerSide)) 184 if ((flags & blurNeeded) && !(flags & blurServerSide))
174 return true; 185 return true;
175# endif 186# endif
176 if ((flags & tintNeeded) && !(flags & tintServerSide)) 187 if ((flags & tintNeeded) && !(flags & tintServerSide))
177 return true; 188 return true;
… …
200static inline bool 211static inline bool
201check_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)
202{ 213{
203 if (geom_flags & flag) 214 if (geom_flags & flag)
204 { 215 {
205 if (new_value != bgPixmap_t::rootAlign)
206 {
207 if (new_value < -100) 216 if (new_value < -100)
208 new_value = -100; 217 new_value = -100;
209 else if (new_value > 200) 218 else if (new_value > 200)
210 new_value = 200; 219 new_value = 200;
211 }
212 if (new_value != align) 220 if (new_value != align)
213 { 221 {
214 align = new_value; 222 align = new_value;
215 return true; 223 return true;
216 } 224 }
… …
220 228
221static inline int 229static inline int
222make_align_position (int align, int window_size, int image_size) 230make_align_position (int align, int window_size, int image_size)
223{ 231{
224 int diff = window_size - image_size; 232 int diff = window_size - image_size;
225 int smaller = MIN (image_size,window_size); 233 int smaller = min (image_size, window_size);
226 234
227 if (align >= 0 && align <= 50) 235 if (align >= 0 && align <= 100)
228 return diff * align / 100; 236 return diff * align / 100;
229 else if (align > 50 && align <= 100)
230 return window_size - image_size - diff * (100 - align) / 100;
231 else if (align > 100 && align <= 200 ) 237 else if (align > 100 && align <= 200 )
232 return ((align - 100) * smaller / 100) + window_size - smaller; 238 return ((align - 100) * smaller / 100) + window_size - smaller;
233 else if (align > -100 && align < 0) 239 else if (align >= -100 && align < 0)
234 return ((align + 100) * smaller / 100) - image_size; 240 return ((align + 100) * smaller / 100) - image_size;
235 return 0; 241 return 0;
236} 242}
237 243
238static inline int 244static inline int
239make_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)
240{ 246{
241 int src_pos = 0; 247 int src_pos = 0;
242 dst_pos = 0; 248 dst_pos = pos;
243 dst_size = size; 249 dst_size = size;
244 if (pos < 0 && size > target_size) 250 if (pos < 0)
245 { 251 {
246 src_pos = -pos; 252 src_pos = -pos;
253 dst_pos = 0;
247 dst_size += pos; 254 dst_size += pos;
248 } 255 }
249 else if (pos > 0)
250 dst_pos = pos;
251 256
252 if (dst_pos + dst_size > target_size) 257 if (dst_pos + dst_size > target_size)
253 dst_size = target_size - dst_pos; 258 dst_size = target_size - dst_pos;
254 return src_pos; 259 return src_pos;
255} 260}
… …
380 w = h = noScale; 385 w = h = noScale;
381 geom_flags |= WidthValue|HeightValue; 386 geom_flags |= WidthValue|HeightValue;
382 } 387 }
383 else if (CHECK_GEOM_OPS ("propscale")) 388 else if (CHECK_GEOM_OPS ("propscale"))
384 { 389 {
385 if (w == 0 && h == 0)
386 {
387 w = windowScale;
388 geom_flags |= WidthValue;
389 }
390 new_flags |= propScale; 390 new_flags |= propScale;
391 } 391 }
392 else if (CHECK_GEOM_OPS ("hscale")) 392 else if (CHECK_GEOM_OPS ("hscale"))
393 { 393 {
394 if (w == 0) w = windowScale; 394 if (w == 0) w = windowScale;
… …
416 x = y = centerAlign; 416 x = y = centerAlign;
417 geom_flags |= WidthValue|HeightValue|XValue|YValue; 417 geom_flags |= WidthValue|HeightValue|XValue|YValue;
418 } 418 }
419 else if (CHECK_GEOM_OPS ("root")) 419 else if (CHECK_GEOM_OPS ("root"))
420 { 420 {
421 new_flags |= rootAlign;
421 w = h = noScale; 422 w = h = noScale;
422 x = y = rootAlign;
423 geom_flags |= WidthValue|HeightValue|XValue|YValue; 423 geom_flags |= WidthValue|HeightValue;
424 } 424 }
425# undef CHECK_GEOM_OPS 425# undef CHECK_GEOM_OPS
426 426
427 while (*ops != ':' && *ops != '\0') ++ops; 427 while (*ops != ':' && *ops != '\0') ++ops;
428 } /* done parsing ops */ 428 } /* done parsing ops */
… …
443 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 443 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
444 // flags, h_scale, v_scale, h_align, v_align); 444 // flags, h_scale, v_scale, h_align, v_align);
445 return (changed > 0); 445 return (changed > 0);
446} 446}
447 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
448# ifdef HAVE_AFTERIMAGE 489# ifdef HAVE_AFTERIMAGE
449bool 490bool
450bgPixmap_t::render_image (unsigned long background_flags) 491bgPixmap_t::render_image (unsigned long background_flags)
451{ 492{
452 if (target == NULL) 493 if (target == NULL)
… …
462 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);
463 504
464 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 505 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
465 { 506 {
466 ShadingInfo as_shade; 507 ShadingInfo as_shade;
467 as_shade.shading = (shade == 0) ? 100 : shade; 508 as_shade.shading = shade;
468 509
469 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 510 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
470 if (flags & tintSet) 511 if (flags & tintSet)
471 tint.get (c); 512 tint.get (c);
472 as_shade.tintColor.red = c.r; 513 as_shade.tintColor.red = c.r;
… …
474 as_shade.tintColor.blue = c.b; 515 as_shade.tintColor.blue = c.b;
475 516
476 background_tint = shading2tint32 (&as_shade); 517 background_tint = shading2tint32 (&as_shade);
477 } 518 }
478 519
479 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL) 520 if (!(background_flags & transpPmapBlurred) && (flags & blurNeeded) && background != NULL)
480 { 521 {
481 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,
482 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 523 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
483 100, ASIMAGE_QUALITY_DEFAULT); 524 100, ASIMAGE_QUALITY_DEFAULT);
484 if (tmp) 525 if (tmp)
… …
496 int new_pmap_width = target_width; 537 int new_pmap_width = target_width;
497 int new_pmap_height = target_height; 538 int new_pmap_height = target_height;
498 539
499 int x = 0; 540 int x = 0;
500 int y = 0; 541 int y = 0;
501 int w = h_scale * target_width / 100; 542 int w = 0;
502 int h = v_scale * target_height / 100; 543 int h = 0;
503 544
504 TIMING_TEST_START (asim); 545 TIMING_TEST_START (asim);
505 546
506 if (original_asim) 547 if (original_asim)
507 { 548 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
508 if (h_align == rootAlign || v_align == rootAlign)
509 {
510 target->get_window_origin (x, y);
511 x = -x;
512 y = -y;
513 }
514
515 if (h_align != rootAlign)
516 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
517
518 if (v_align != rootAlign)
519 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
520 }
521 549
522 if (!original_asim 550 if (!original_asim
551 || (!(flags & rootAlign)
523 || x >= target_width 552 && (x >= target_width
524 || y >= target_height 553 || y >= target_height
525 || (w > 0 && x + w <= 0) 554 || (x + w <= 0)
526 || (h > 0 && y + h <= 0)) 555 || (y + h <= 0))))
527 { 556 {
528 if (background) 557 if (background)
529 { 558 {
530 new_pmap_width = background->width; 559 new_pmap_width = background->width;
531 new_pmap_height = background->height; 560 new_pmap_height = background->height;
… …
545 } 574 }
546 else 575 else
547 { 576 {
548 result = original_asim; 577 result = original_asim;
549 578
550 if ((w > 0 && w != original_asim->width) 579 if ((w != original_asim->width)
551 || (h > 0 && h != original_asim->height)) 580 || (h != original_asim->height))
552 { 581 {
553 result = scale_asimage (target->asv, original_asim, 582 result = scale_asimage (target->asv, original_asim,
554 w > 0 ? w : original_asim->width, 583 w, h,
555 h > 0 ? h : original_asim->height,
556 background ? ASA_ASImage : ASA_XImage, 584 background ? ASA_ASImage : ASA_XImage,
557 100, ASIMAGE_QUALITY_DEFAULT); 585 100, ASIMAGE_QUALITY_DEFAULT);
558 } 586 }
559 587
560 if (background == NULL) 588 if (background == NULL)
561 { 589 {
562 /* if tiling - pixmap has to be sized exactly as the image,
563 but there is no need to make it bigger than the window! */
564 if (h_scale == 0)
565 new_pmap_width = min (result->width, target_width);
566 if (v_scale == 0)
567 new_pmap_height = min (result->height, target_height);
568 /* we also need to tile our image in one or both directions */
569 if (h_scale == 0 || v_scale == 0) 590 if (h_scale == 0 || v_scale == 0)
570 { 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 */
571 ASImage *tmp = tile_asimage (target->asv, result, 598 ASImage *tmp = tile_asimage (target->asv, result,
572 (h_scale > 0) ? 0 : (int)result->width - x, 599 (int)result->width - x,
573 (v_scale > 0) ? 0 : (int)result->height - y, 600 (int)result->height - y,
574 new_pmap_width, 601 new_pmap_width,
575 new_pmap_height, 602 new_pmap_height,
576 TINT_LEAVE_SAME, ASA_XImage, 603 TINT_LEAVE_SAME, ASA_XImage,
577 100, ASIMAGE_QUALITY_DEFAULT); 604 100, ASIMAGE_QUALITY_DEFAULT);
578 if (tmp) 605 if (tmp)
… …
593 layers[0].clip_width = target_width; 620 layers[0].clip_width = target_width;
594 layers[0].clip_height = target_height; 621 layers[0].clip_height = target_height;
595 layers[0].tint = background_tint; 622 layers[0].tint = background_tint;
596 layers[1].im = result; 623 layers[1].im = result;
597 624
598 if (w <= 0) 625 if (h_scale == 0 || v_scale == 0)
599 { 626 {
600 /* tile horizontally */ 627 /* tile horizontally */
601 while (x > 0) x -= (int)result->width; 628 while (x > 0) x -= (int)result->width;
602 layers[1].dst_x = x; 629 layers[1].dst_x = x;
603 layers[1].clip_width = result->width+target_width; 630 layers[1].clip_width = result->width+target_width;
… …
607 /* clip horizontally */ 634 /* clip horizontally */
608 layers[1].dst_x = x; 635 layers[1].dst_x = x;
609 layers[1].clip_width = result->width; 636 layers[1].clip_width = result->width;
610 } 637 }
611 638
612 if (h <= 0) 639 if (h_scale == 0 || v_scale == 0)
613 { 640 {
614 while (y > 0) y -= (int)result->height; 641 while (y > 0) y -= (int)result->height;
615 layers[1].dst_y = y; 642 layers[1].dst_y = y;
616 layers[1].clip_height = result->height + target_height; 643 layers[1].clip_height = result->height + target_height;
617 } 644 }
… …
676 703
677 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;
678 int dst_width = result->width, dst_height = result->height; 705 int dst_width = result->width, dst_height = result->height;
679 if (background == NULL) 706 if (background == NULL)
680 { 707 {
708 if (!(h_scale == 0 || v_scale == 0))
709 {
681 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 );
682 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 }
683 713
684 if (dst_x > 0 || dst_y > 0 714 if (dst_x > 0 || dst_y > 0
685 || dst_x + dst_width < new_pmap_width 715 || dst_x + dst_width < new_pmap_width
686 || dst_y + dst_height < new_pmap_height) 716 || dst_y + dst_height < new_pmap_height)
687 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);
… …
704 destroy_asimage (&background); 734 destroy_asimage (&background);
705 735
706 return ret; 736 return ret;
707} 737}
708# endif /* HAVE_AFTERIMAGE */ 738# endif /* HAVE_AFTERIMAGE */
739
740# ifdef HAVE_PIXBUF
741bool
742bgPixmap_t::render_image (unsigned long background_flags)
743{
744 if (target == NULL)
745 return false;
746
747 if (!pixbuf)
748 return false;
749
750#if !XFT
751 if (background_flags)
752 return false;
753#endif
754
755 GdkPixbuf *result;
756
757 int image_width = gdk_pixbuf_get_width (pixbuf);
758 int image_height = gdk_pixbuf_get_height (pixbuf);
759
760 int target_width = target->szHint.width;
761 int target_height = target->szHint.height;
762 int new_pmap_width = target_width;
763 int new_pmap_height = target_height;
764
765 int x = 0;
766 int y = 0;
767 int w = 0;
768 int h = 0;
769
770 get_image_geometry (image_width, image_height, w, h, x, y);
771
772 if (!(flags & rootAlign)
773 && (x >= target_width
774 || y >= target_height
775 || (x + w <= 0)
776 || (y + h <= 0)))
777 return false;
778
779 result = pixbuf;
780
781 if ((w != image_width)
782 || (h != image_height))
783 {
784 result = gdk_pixbuf_scale_simple (pixbuf,
785 w, h,
786 GDK_INTERP_BILINEAR);
787 }
788
789 bool ret = false;
790
791 if (result)
792 {
793 XGCValues gcv;
794 GC gc;
795 Pixmap root_pmap;
796
797 image_width = gdk_pixbuf_get_width (result);
798 image_height = gdk_pixbuf_get_height (result);
799
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 {
809 new_pmap_width = min (image_width, target_width);
810 new_pmap_height = min (image_height, target_height);
811 }
812 }
813
814 if (pixmap)
815 {
816 if (pmap_width != new_pmap_width
817 || pmap_height != new_pmap_height
818 || pmap_depth != target->depth)
819 {
820 XFreePixmap (target->dpy, pixmap);
821 pixmap = None;
822 }
823 }
824
825 if (pixmap == None)
826 {
827 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
828 pmap_width = new_pmap_width;
829 pmap_height = new_pmap_height;
830 pmap_depth = target->depth;
831 }
832
833 gcv.foreground = target->pix_colors[Color_bg];
834 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
835
836 if (h_scale == 0 || v_scale == 0)
837 {
838 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
839 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc,
840 0, 0,
841 0, 0,
842 image_width, image_height,
843 XLIB_RGB_DITHER_NONE,
844 0, 0);
845
846 gcv.tile = tile;
847 gcv.fill_style = FillTiled;
848 gcv.ts_x_origin = x;
849 gcv.ts_y_origin = y;
850 XChangeGC (target->dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
851
852 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
853 XFreePixmap (target->dpy, tile);
854 }
855 else
856 {
857 int src_x, src_y, dst_x, dst_y;
858 int dst_width, dst_height;
859
860 src_x = make_clip_rectangle (x, image_width , new_pmap_width , dst_x, dst_width );
861 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
862
863 if (dst_x > 0 || dst_y > 0
864 || dst_x + dst_width < new_pmap_width
865 || dst_y + dst_height < new_pmap_height)
866 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
867
868 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
869 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc,
870 src_x, src_y,
871 dst_x, dst_y,
872 dst_width, dst_height,
873 XLIB_RGB_DITHER_NONE,
874 0, 0);
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
914
915 if (result != pixbuf)
916 g_object_unref (result);
917
918 XFreeGC (target->dpy, gc);
919
920 ret = true;
921 }
922
923 return ret;
924}
925# endif /* HAVE_PIXBUF */
709 926
710bool 927bool
711bgPixmap_t::set_file (const char *file) 928bgPixmap_t::set_file (const char *file)
712{ 929{
713 assert (file); 930 assert (file);
… …
729 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 946 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
730 if (original_asim) 947 if (original_asim)
731 have_image = true; 948 have_image = true;
732 return have_image; 949 return have_image;
733# endif 950# endif
951
952# ifdef HAVE_PIXBUF
953 pixbuf = gdk_pixbuf_new_from_file (file, NULL);
954 if (pixbuf)
955 have_image = true;
956 return have_image;
957# endif
734 } 958 }
735 959
736 return false; 960 return false;
737} 961}
738 962
… …
762 if (!(geom_flags & WidthValue)) 986 if (!(geom_flags & WidthValue))
763 hr = 1; 987 hr = 1;
764 if (!(geom_flags & HeightValue)) 988 if (!(geom_flags & HeightValue))
765 vr = hr; 989 vr = hr;
766 990
991 min_it (hr, 128);
992 min_it (vr, 128);
993
767 if (h_blurRadius != hr) 994 if (h_blurRadius != hr)
768 { 995 {
769 ++changed; 996 ++changed;
770 h_blurRadius = hr; 997 h_blurRadius = hr;
771 } 998 }
… …
779 if (v_blurRadius == 0 && h_blurRadius == 0) 1006 if (v_blurRadius == 0 && h_blurRadius == 0)
780 flags &= ~blurNeeded; 1007 flags &= ~blurNeeded;
781 else 1008 else
782 flags |= blurNeeded; 1009 flags |= blurNeeded;
783 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
784 return (changed > 0); 1023 return (changed > 0);
785} 1024}
786 1025
787static inline unsigned long 1026static inline unsigned long
788compute_tint_shade_flags (rxvt_color *tint, int shade) 1027compute_tint_shade_flags (rxvt_color *tint, int shade)
789{ 1028{
790 unsigned long flags = 0; 1029 unsigned long flags = 0;
791 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1030 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
792 bool has_shade = (shade > 0 && shade < 100) || (shade > 100 && shade < 200); 1031 bool has_shade = shade != 100;
793 1032
794 if (tint) 1033 if (tint)
795 { 1034 {
796 tint->get (c); 1035 tint->get (c);
797# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 1036# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
… …
829} 1068}
830 1069
831bool 1070bool
832bgPixmap_t::set_tint (rxvt_color &new_tint) 1071bgPixmap_t::set_tint (rxvt_color &new_tint)
833{ 1072{
834 if (tint != new_tint) 1073 if (!(flags & tintSet) || tint != new_tint)
835 { 1074 {
836 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1075 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
837 tint = new_tint; 1076 tint = new_tint;
838 flags = (flags & ~tintFlags) | new_flags | tintSet; 1077 flags = (flags & ~tintFlags) | new_flags | tintSet;
839 return true; 1078 return true;
… …
857} 1096}
858 1097
859bool 1098bool
860bgPixmap_t::set_shade (const char *shade_str) 1099bgPixmap_t::set_shade (const char *shade_str)
861{ 1100{
862 int new_shade = (shade_str) ? atoi (shade_str) : 0; 1101 int new_shade = (shade_str) ? atoi (shade_str) : 100;
863 1102
864 if (new_shade < 0 && new_shade > -100) 1103 clamp_it (new_shade, -100, 200);
1104 if (new_shade < 0)
865 new_shade = 200 - (100 + new_shade); 1105 new_shade = 200 - (100 + new_shade);
866 else if (new_shade == 100)
867 new_shade = 0;
868 1106
869 if (new_shade != shade) 1107 if (new_shade != shade)
870 { 1108 {
871 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);
872 shade = new_shade; 1110 shade = new_shade;
873 flags = (flags & (~tintFlags | tintSet)) | new_flags; 1111 flags = (flags & (~tintFlags | tintSet)) | new_flags;
874 return true; 1112 return true;
875 } 1113 }
876 1114
877 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;
878} 1293}
879 1294
880/* make_transparency_pixmap() 1295/* make_transparency_pixmap()
881 * 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
882 * 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
… …
901 unsigned int root_pmap_width, root_pmap_height; 1316 unsigned int root_pmap_width, root_pmap_height;
902 int window_width = target->szHint.width; 1317 int window_width = target->szHint.width;
903 int window_height = target->szHint.height; 1318 int window_height = target->szHint.height;
904 int sx, sy; 1319 int sx, sy;
905 XGCValues gcv; 1320 XGCValues gcv;
1321 GC gc;
906 1322
907 TIMING_TEST_START (tp); 1323 TIMING_TEST_START (tp);
908 target->get_window_origin (sx, sy); 1324 target->get_window_origin (sx, sy);
909 1325
910 /* 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 : */
… …
912 || sx >= root_width || sy >= root_height) 1328 || sx >= root_width || sy >= root_height)
913 return 0; 1329 return 0;
914 1330
915 if (root_pixmap != None) 1331 if (root_pixmap != None)
916 { 1332 {
917 /* 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 : */
918 int junk; 1334 int junk;
919 unsigned int ujunk; 1335 unsigned int ujunk;
920 /* root pixmap may be bad - allow a error */ 1336 /* root pixmap may be bad - allow a error */
921 target->allowedxerror = -1; 1337 target->allowedxerror = -1;
922 1338
… …
924 root_pixmap = None; 1340 root_pixmap = None;
925 1341
926 target->allowedxerror = 0; 1342 target->allowedxerror = 0;
927 } 1343 }
928 1344
1345 if (root_pixmap == None)
1346 return 0;
1347
929 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);
930 GC gc = NULL;
931 1349
932 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1350 if (tiled_root_pmap == None) /* something really bad happened - abort */
933 return 0; 1351 return 0;
934 1352
935 if (root_pixmap == None)
936 {
937 /* use tricks to obtain the root background image :*/
938 /* we want to create Overrideredirect window overlapping out window
939 with background type of Parent Relative and then grab it */
940 XSetWindowAttributes attr;
941 Window src;
942 bool success = false;
943
944 attr.background_pixmap = ParentRelative;
945 attr.backing_store = Always;
946 attr.event_mask = ExposureMask;
947 attr.override_redirect = True;
948 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
949 CopyFromParent, CopyFromParent, CopyFromParent,
950 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
951 &attr);
952
953 if (src != None)
954 {
955 XEvent event;
956 int ev_count = 0;
957 XGrabServer (dpy);
958 XMapRaised (dpy, src);
959 XSync (dpy, False);
960
961 /* XSync should get window where it's properly exposed,
962 * but to be on the safe side - let's check for the actual event to arrive : */
963 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
964 ++ev_count;
965
966 if (ev_count > 0);
967 {
968 /* hooray! - we can grab the image! */
969 gc = XCreateGC (dpy, root, 0, NULL);
970 if (gc)
971 {
972 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
973 success = true;
974 }
975 }
976
977 XDestroyWindow (dpy, src);
978 XUngrabServer (dpy);
979 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
980 }
981
982 if (!success)
983 {
984 XFreePixmap (dpy, tiled_root_pmap);
985 tiled_root_pmap = None;
986 }
987 else
988 result |= transpPmapTiled;
989 }
990 else
991 {
992 /* straightforward pixmap copy */ 1353 /* straightforward pixmap copy */
993 gcv.tile = root_pixmap; 1354 gcv.tile = root_pixmap;
994 gcv.fill_style = FillTiled; 1355 gcv.fill_style = FillTiled;
995 1356
996 while (sx < 0) sx += (int)root_width; 1357 while (sx < 0) sx += (int)root_width;
997 while (sy < 0) sy += (int)root_height; 1358 while (sy < 0) sy += (int)root_height;
998 1359
999 gcv.ts_x_origin = -sx; 1360 gcv.ts_x_origin = -sx;
1000 gcv.ts_y_origin = -sy; 1361 gcv.ts_y_origin = -sy;
1001 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1362 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1002 1363
1003 if (gc) 1364 if (gc)
1004 { 1365 {
1005 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);
1006 result |= transpPmapTiled; 1367 result |= transpPmapTiled;
1007 } 1368 XFreeGC (dpy, gc);
1008 } 1369 }
1009 TIMING_TEST_PRINT_RESULT (tp); 1370 TIMING_TEST_PRINT_RESULT (tp);
1010 1371
1011 if (tiled_root_pmap != None) 1372 if (tiled_root_pmap != None)
1012 { 1373 {
1013 if (!need_client_side_rendering ()) 1374 if (!need_client_side_rendering ())
1014 { 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 }
1015 if ((flags & tintNeeded)) 1381 if ((flags & tintNeeded))
1016 { 1382 {
1017 if (flags & tintWholesome) 1383 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height))
1018 {
1019 /* In this case we can tint image server-side getting significant
1020 * performance improvements, as we eliminate XImage transfer
1021 */
1022 gcv.foreground = Pixel (tint);
1023 gcv.function = GXand;
1024 gcv.fill_style = FillSolid;
1025 if (gc)
1026 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcv);
1027 else
1028 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv);
1029 if (gc)
1030 {
1031 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1032 result |= transpPmapTinted; 1384 result |= transpPmapTinted;
1033 }
1034 }
1035 else
1036 {
1037# if XFT
1038 Picture back_pic = 0;
1039 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1040
1041 if (flags & tintSet)
1042 tint.get (c);
1043
1044 if (shade > 0 && shade < 100)
1045 {
1046 c.r = (c.r * shade) / 100;
1047 c.g = (c.g * shade) / 100;
1048 c.b = (c.b * shade) / 100;
1049 }
1050 else if (shade > 100 && shade < 200)
1051 {
1052 c.r = (c.r * (200 - shade)) / 100;
1053 c.g = (c.g * (200 - shade)) / 100;
1054 c.b = (c.b * (200 - shade)) / 100;
1055 }
1056
1057 XRenderPictFormat pf;
1058 pf.type = PictTypeDirect;
1059 pf.depth = 32;
1060 pf.direct.redMask = 0xff;
1061 pf.direct.greenMask = 0xff;
1062 pf.direct.blueMask = 0xff;
1063 pf.direct.alphaMask = 0xff;
1064
1065 XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
1066 (PictFormatType|
1067 PictFormatDepth|
1068 PictFormatRedMask|
1069 PictFormatGreenMask|
1070 PictFormatBlueMask|
1071 PictFormatAlphaMask),
1072 &pf,
1073 0);
1074 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
1075 XRenderPictureAttributes pa ;
1076
1077 back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa);
1078
1079 pa.repeat = True;
1080
1081 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1082 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1083 XFreePixmap (dpy, overlay_pmap);
1084
1085 pa.component_alpha = True;
1086 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1087 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1088 XFreePixmap (dpy, mask_pmap);
1089
1090 if (mask_pic && overlay_pic && back_pic)
1091 {
1092 XRenderColor mask_c;
1093
1094 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1095 mask_c.alpha = 0xffff;
1096 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1097
1098 mask_c.alpha = 0;
1099 mask_c.red = 0xffff - c.r;
1100 mask_c.green = 0xffff - c.g;
1101 mask_c.blue = 0xffff - c.b;
1102 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1103 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
1104 result |= transpPmapTinted;
1105 }
1106
1107 XRenderFreePicture (dpy, mask_pic);
1108 XRenderFreePicture (dpy, overlay_pic);
1109 XRenderFreePicture (dpy, back_pic);
1110# if DO_TIMING_TEST
1111 XSync (dpy, False);
1112# endif
1113# endif
1114 }
1115 } 1385 }
1116 } /* server side rendering completed */ 1386 } /* server side rendering completed */
1117 1387
1118 if (pixmap) 1388 if (pixmap)
1119 XFreePixmap (dpy, pixmap); 1389 XFreePixmap (dpy, pixmap);
… …
1121 pixmap = tiled_root_pmap; 1391 pixmap = tiled_root_pmap;
1122 pmap_width = window_width; 1392 pmap_width = window_width;
1123 pmap_height = window_height; 1393 pmap_height = window_height;
1124 pmap_depth = root_depth; 1394 pmap_depth = root_depth;
1125 } 1395 }
1126
1127 if (gc)
1128 XFreeGC (dpy, gc);
1129 1396
1130 TIMING_TEST_PRINT_RESULT (tp); 1397 TIMING_TEST_PRINT_RESULT (tp);
1131 1398
1132 return result; 1399 return result;
1133} 1400}
… …
1189 XImage *result = NULL; 1456 XImage *result = NULL;
1190 1457
1191 if (background_flags && (flags & isInvalid)) 1458 if (background_flags && (flags & isInvalid))
1192 { 1459 {
1193 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1460 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1461 }
1194 1462
1463 if (result)
1464 {
1195# if !defined(HAVE_AFTERIMAGE) && !XFT 1465# if !defined(HAVE_AFTERIMAGE) && !XFT
1196 /* our own client-side tinting */ 1466 /* our own client-side tinting */
1197 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side. 1467 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1198 This may need to be changed in need_client_side_rendering() logic is altered !!! */ 1468 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1199 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1469 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1200 { 1470 {
1201 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1471 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1202 if (flags & tintSet) 1472 if (flags & tintSet)
1203 tint.get (c); 1473 tint.get (c);
1204 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1474 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1205 } 1475 }
1206# endif 1476# endif
1207 }
1208 1477
1209 if (result)
1210 {
1211 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1478 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1212 1479
1213 if (gc) 1480 if (gc)
1214 { 1481 {
1215 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1482 if (/*pmap_depth != target->depth &&*/ pixmap != None)
… …
1359 int i; 1626 int i;
1360 1627
1361 Visual *visual = term->visual; 1628 Visual *visual = term->visual;
1362 1629
1363 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1630 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ;
1364
1365 if (shade == 0)
1366 shade = 100;
1367 1631
1368 /* for convenience */ 1632 /* for convenience */
1369 mask_r = visual->red_mask; 1633 mask_r = visual->red_mask;
1370 mask_g = visual->green_mask; 1634 mask_g = visual->green_mask;
1371 mask_b = visual->blue_mask; 1635 mask_b = visual->blue_mask;
… …
1427 default: 1691 default:
1428 return; /* we do not support this color depth */ 1692 return; /* we do not support this color depth */
1429 } 1693 }
1430 1694
1431 /* prepare limits for color transformation (each channel is handled separately) */ 1695 /* prepare limits for color transformation (each channel is handled separately) */
1432 if (shade < 0) { 1696 if (shade > 100) {
1433 shade = -shade; 1697 shade = 200 - shade;
1434 if (shade < 0) shade = 0;
1435 if (shade > 100) shade = 100;
1436 1698
1437 lower_lim_r = 65535-rm; 1699 lower_lim_r = 65535-rm;
1438 lower_lim_g = 65535-gm; 1700 lower_lim_g = 65535-gm;
1439 lower_lim_b = 65535-bm; 1701 lower_lim_b = 65535-bm;
1440 1702
… …
1442 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);
1443 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);
1444 1706
1445 upper_lim_r = upper_lim_g = upper_lim_b = 65535; 1707 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1446 } else { 1708 } else {
1447 if (shade < 0) shade = 0;
1448 if (shade > 100) shade = 100;
1449 1709
1450 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1710 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1451 1711
1452 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100); 1712 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1453 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