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.54 by sf-exg, Wed Sep 1 22:49:35 2010 UTC vs.
Revision 1.78 by sf-exg, Wed Oct 13 10:27:22 2010 UTC

… …
96 // this is basically redundant as bgPixmap_t is only used in 96 // this is basically redundant as bgPixmap_t is only used in
97 // zero_initialised-derived structs 97 // zero_initialised-derived structs
98#ifdef HAVE_AFTERIMAGE 98#ifdef HAVE_AFTERIMAGE
99 original_asim = NULL; 99 original_asim = NULL;
100#endif 100#endif
101#ifdef HAVE_PIXBUF
102 pixbuf = NULL;
103#endif
101#ifdef BG_IMAGE_FROM_FILE 104#ifdef BG_IMAGE_FROM_FILE
102 have_image = false; 105 have_image = false;
103 h_scale = v_scale = 0; 106 h_scale = v_scale = 0;
104 h_align = v_align = 0; 107 h_align = v_align = 0;
105#endif 108#endif
109#ifdef ENABLE_TRANSPARENCY
110 shade = 100;
111#endif
106 flags = 0; 112 flags = 0;
107 pixmap = None; 113 pixmap = None;
108 valid_since = invalid_since = 0; 114 valid_since = invalid_since = 0;
109 target = 0; 115 target = 0;
110} 116}
… …
115#ifdef HAVE_AFTERIMAGE 121#ifdef HAVE_AFTERIMAGE
116 if (original_asim) 122 if (original_asim)
117 safe_asimage_destroy (original_asim); 123 safe_asimage_destroy (original_asim);
118#endif 124#endif
119 125
126#ifdef HAVE_PIXBUF
127 if (pixbuf)
128 g_object_unref (pixbuf);
129#endif
130
120 if (pixmap && target) 131 if (pixmap && target)
121 XFreePixmap (target->dpy, pixmap); 132 XFreePixmap (target->dpy, pixmap);
122} 133}
123 134
124bool 135bool
… …
130# endif 141# endif
131 142
132# ifdef BG_IMAGE_FROM_FILE 143# ifdef BG_IMAGE_FROM_FILE
133 if (have_image) 144 if (have_image)
134 { 145 {
135 if (h_scale != 0 || v_scale != 0 146 if (flags & sizeSensitive)
136 || h_align != 0 || v_align != 0)
137 return true; 147 return true;
138 } 148 }
139# endif 149# endif
140 150
141 return false; 151 return false;
… …
150# endif 160# endif
151 161
152# ifdef BG_IMAGE_FROM_FILE 162# ifdef BG_IMAGE_FROM_FILE
153 if (have_image) 163 if (have_image)
154 { 164 {
155 if (h_align == rootAlign || v_align == rootAlign) 165 if (flags & rootAlign)
156 return true; 166 return true;
157 } 167 }
158# endif 168# endif
159 169
160 return false; 170 return false;
… …
200static inline bool 210static inline bool
201check_set_align_value (int geom_flags, int flag, int &align, int new_value) 211check_set_align_value (int geom_flags, int flag, int &align, int new_value)
202{ 212{
203 if (geom_flags & flag) 213 if (geom_flags & flag)
204 { 214 {
205 if (new_value != bgPixmap_t::rootAlign)
206 {
207 if (new_value < -100) 215 if (new_value < -100)
208 new_value = -100; 216 new_value = -100;
209 else if (new_value > 200) 217 else if (new_value > 200)
210 new_value = 200; 218 new_value = 200;
211 }
212 if (new_value != align) 219 if (new_value != align)
213 { 220 {
214 align = new_value; 221 align = new_value;
215 return true; 222 return true;
216 } 223 }
… …
220 227
221static inline int 228static inline int
222make_align_position (int align, int window_size, int image_size) 229make_align_position (int align, int window_size, int image_size)
223{ 230{
224 int diff = window_size - image_size; 231 int diff = window_size - image_size;
225 int smaller = MIN (image_size,window_size); 232 int smaller = min (image_size, window_size);
226 233
227 if (align >= 0 && align <= 50) 234 if (align >= 0 && align <= 100)
228 return diff * align / 100; 235 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 ) 236 else if (align > 100 && align <= 200 )
232 return ((align - 100) * smaller / 100) + window_size - smaller; 237 return ((align - 100) * smaller / 100) + window_size - smaller;
233 else if (align > -100 && align < 0) 238 else if (align >= -100 && align < 0)
234 return ((align + 100) * smaller / 100) - image_size; 239 return ((align + 100) * smaller / 100) - image_size;
235 return 0; 240 return 0;
236} 241}
237 242
238static inline int 243static inline int
239make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 244make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
240{ 245{
241 int src_pos = 0; 246 int src_pos = 0;
242 dst_pos = 0; 247 dst_pos = pos;
243 dst_size = size; 248 dst_size = size;
244 if (pos < 0 && size > target_size) 249 if (pos < 0)
245 { 250 {
246 src_pos = -pos; 251 src_pos = -pos;
252 dst_pos = 0;
247 dst_size += pos; 253 dst_size += pos;
248 } 254 }
249 else if (pos > 0)
250 dst_pos = pos;
251 255
252 if (dst_pos + dst_size > target_size) 256 if (dst_pos + dst_size > target_size)
253 dst_size = target_size - dst_pos; 257 dst_size = target_size - dst_pos;
254 return src_pos; 258 return src_pos;
255} 259}
… …
380 w = h = noScale; 384 w = h = noScale;
381 geom_flags |= WidthValue|HeightValue; 385 geom_flags |= WidthValue|HeightValue;
382 } 386 }
383 else if (CHECK_GEOM_OPS ("propscale")) 387 else if (CHECK_GEOM_OPS ("propscale"))
384 { 388 {
385 if (w == 0 && h == 0)
386 {
387 w = windowScale;
388 geom_flags |= WidthValue;
389 }
390 new_flags |= propScale; 389 new_flags |= propScale;
391 } 390 }
392 else if (CHECK_GEOM_OPS ("hscale")) 391 else if (CHECK_GEOM_OPS ("hscale"))
393 { 392 {
394 if (w == 0) w = windowScale; 393 if (w == 0) w = windowScale;
… …
416 x = y = centerAlign; 415 x = y = centerAlign;
417 geom_flags |= WidthValue|HeightValue|XValue|YValue; 416 geom_flags |= WidthValue|HeightValue|XValue|YValue;
418 } 417 }
419 else if (CHECK_GEOM_OPS ("root")) 418 else if (CHECK_GEOM_OPS ("root"))
420 { 419 {
420 new_flags |= rootAlign;
421 w = h = noScale; 421 w = h = noScale;
422 x = y = rootAlign;
423 geom_flags |= WidthValue|HeightValue|XValue|YValue; 422 geom_flags |= WidthValue|HeightValue;
424 } 423 }
425# undef CHECK_GEOM_OPS 424# undef CHECK_GEOM_OPS
426 425
427 while (*ops != ':' && *ops != '\0') ++ops; 426 while (*ops != ':' && *ops != '\0') ++ops;
428 } /* done parsing ops */ 427 } /* done parsing ops */
… …
443 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 442 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
444 // flags, h_scale, v_scale, h_align, v_align); 443 // flags, h_scale, v_scale, h_align, v_align);
445 return (changed > 0); 444 return (changed > 0);
446} 445}
447 446
447void
448bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
449{
450 int target_width = target->szHint.width;
451 int target_height = target->szHint.height;
452
453 if (flags & propScale)
454 {
455 float scale = (float)target_width / image_width;
456 min_it (scale, (float)target_height / image_height);
457 w = image_width * scale + 0.5;
458 h = image_height * scale + 0.5;
459 }
460 else
461 {
462 w = h_scale * target_width / 100;
463 h = v_scale * target_height / 100;
464 }
465
466 if (!w) w = image_width;
467 if (!h) h = image_height;
468
469 if (flags & rootAlign)
470 {
471 target->get_window_origin (x, y);
472 x = -x;
473 y = -y;
474 }
475 else
476 {
477 x = make_align_position (h_align, target_width, w);
478 y = make_align_position (v_align, target_height, h);
479 }
480
481 flags &= ~sizeSensitive;
482 if (h_scale != 0 || v_scale != 0
483 || h_align != 0 || v_align != 0
484 || w > target_width || h > target_height)
485 flags |= sizeSensitive;
486}
487
448# ifdef HAVE_AFTERIMAGE 488# ifdef HAVE_AFTERIMAGE
449bool 489bool
450bgPixmap_t::render_image (unsigned long background_flags) 490bgPixmap_t::render_image (unsigned long background_flags)
451{ 491{
452 if (target == NULL) 492 if (target == NULL)
… …
462 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); 502 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
463 503
464 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 504 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
465 { 505 {
466 ShadingInfo as_shade; 506 ShadingInfo as_shade;
467 as_shade.shading = (shade == 0) ? 100 : shade; 507 as_shade.shading = shade;
468 508
469 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 509 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
470 if (flags & tintSet) 510 if (flags & tintSet)
471 tint.get (c); 511 tint.get (c);
472 as_shade.tintColor.red = c.r; 512 as_shade.tintColor.red = c.r;
… …
474 as_shade.tintColor.blue = c.b; 514 as_shade.tintColor.blue = c.b;
475 515
476 background_tint = shading2tint32 (&as_shade); 516 background_tint = shading2tint32 (&as_shade);
477 } 517 }
478 518
479 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL) 519 if (!(background_flags & transpPmapBlurred) && (flags & blurNeeded) && background != NULL)
480 { 520 {
481 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 521 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, 522 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
483 100, ASIMAGE_QUALITY_DEFAULT); 523 100, ASIMAGE_QUALITY_DEFAULT);
484 if (tmp) 524 if (tmp)
… …
496 int new_pmap_width = target_width; 536 int new_pmap_width = target_width;
497 int new_pmap_height = target_height; 537 int new_pmap_height = target_height;
498 538
499 int x = 0; 539 int x = 0;
500 int y = 0; 540 int y = 0;
501 int w = h_scale * target_width / 100; 541 int w = 0;
502 int h = v_scale * target_height / 100; 542 int h = 0;
503 543
504 TIMING_TEST_START (asim); 544 TIMING_TEST_START (asim);
505 545
506 if (original_asim) 546 if (original_asim)
507 { 547 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 548
522 if (!original_asim 549 if (!original_asim
550 || (!(flags & rootAlign)
523 || x >= target_width 551 && (x >= target_width
524 || y >= target_height 552 || y >= target_height
525 || (w > 0 && x + w <= 0) 553 || (x + w <= 0)
526 || (h > 0 && y + h <= 0)) 554 || (y + h <= 0))))
527 { 555 {
528 if (background) 556 if (background)
529 { 557 {
530 new_pmap_width = background->width; 558 new_pmap_width = background->width;
531 new_pmap_height = background->height; 559 new_pmap_height = background->height;
… …
545 } 573 }
546 else 574 else
547 { 575 {
548 result = original_asim; 576 result = original_asim;
549 577
550 if ((w > 0 && w != original_asim->width) 578 if ((w != original_asim->width)
551 || (h > 0 && h != original_asim->height)) 579 || (h != original_asim->height))
552 { 580 {
553 result = scale_asimage (target->asv, original_asim, 581 result = scale_asimage (target->asv, original_asim,
554 w > 0 ? w : original_asim->width, 582 w, h,
555 h > 0 ? h : original_asim->height,
556 background ? ASA_ASImage : ASA_XImage, 583 background ? ASA_ASImage : ASA_XImage,
557 100, ASIMAGE_QUALITY_DEFAULT); 584 100, ASIMAGE_QUALITY_DEFAULT);
558 } 585 }
559 586
560 if (background == NULL) 587 if (background == NULL)
561 { 588 {
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) 589 if (h_scale == 0 || v_scale == 0)
570 { 590 {
591 /* if tiling - pixmap has to be sized exactly as the image,
592 but there is no need to make it bigger than the window! */
593 new_pmap_width = min (result->width, target_width);
594 new_pmap_height = min (result->height, target_height);
595
596 /* we also need to tile our image in both directions */
571 ASImage *tmp = tile_asimage (target->asv, result, 597 ASImage *tmp = tile_asimage (target->asv, result,
572 (h_scale > 0) ? 0 : (int)result->width - x, 598 (int)result->width - x,
573 (v_scale > 0) ? 0 : (int)result->height - y, 599 (int)result->height - y,
574 new_pmap_width, 600 new_pmap_width,
575 new_pmap_height, 601 new_pmap_height,
576 TINT_LEAVE_SAME, ASA_XImage, 602 TINT_LEAVE_SAME, ASA_XImage,
577 100, ASIMAGE_QUALITY_DEFAULT); 603 100, ASIMAGE_QUALITY_DEFAULT);
578 if (tmp) 604 if (tmp)
… …
593 layers[0].clip_width = target_width; 619 layers[0].clip_width = target_width;
594 layers[0].clip_height = target_height; 620 layers[0].clip_height = target_height;
595 layers[0].tint = background_tint; 621 layers[0].tint = background_tint;
596 layers[1].im = result; 622 layers[1].im = result;
597 623
598 if (w <= 0) 624 if (h_scale == 0 || v_scale == 0)
599 { 625 {
600 /* tile horizontally */ 626 /* tile horizontally */
601 while (x > 0) x -= (int)result->width; 627 while (x > 0) x -= (int)result->width;
602 layers[1].dst_x = x; 628 layers[1].dst_x = x;
603 layers[1].clip_width = result->width+target_width; 629 layers[1].clip_width = result->width+target_width;
… …
607 /* clip horizontally */ 633 /* clip horizontally */
608 layers[1].dst_x = x; 634 layers[1].dst_x = x;
609 layers[1].clip_width = result->width; 635 layers[1].clip_width = result->width;
610 } 636 }
611 637
612 if (h <= 0) 638 if (h_scale == 0 || v_scale == 0)
613 { 639 {
614 while (y > 0) y -= (int)result->height; 640 while (y > 0) y -= (int)result->height;
615 layers[1].dst_y = y; 641 layers[1].dst_y = y;
616 layers[1].clip_height = result->height + target_height; 642 layers[1].clip_height = result->height + target_height;
617 } 643 }
… …
676 702
677 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 703 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
678 int dst_width = result->width, dst_height = result->height; 704 int dst_width = result->width, dst_height = result->height;
679 if (background == NULL) 705 if (background == NULL)
680 { 706 {
707 if (!(h_scale == 0 || v_scale == 0))
708 {
681 if (h_scale > 0) src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width ); 709 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); 710 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
711 }
683 712
684 if (dst_x > 0 || dst_y > 0 713 if (dst_x > 0 || dst_y > 0
685 || dst_x + dst_width < new_pmap_width 714 || dst_x + dst_width < new_pmap_width
686 || dst_y + dst_height < new_pmap_height) 715 || dst_y + dst_height < new_pmap_height)
687 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 716 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
… …
704 destroy_asimage (&background); 733 destroy_asimage (&background);
705 734
706 return ret; 735 return ret;
707} 736}
708# endif /* HAVE_AFTERIMAGE */ 737# endif /* HAVE_AFTERIMAGE */
738
739# ifdef HAVE_PIXBUF
740bool
741bgPixmap_t::render_image (unsigned long background_flags)
742{
743 if (target == NULL)
744 return false;
745
746 if (!pixbuf)
747 return false;
748
749 // TODO: add alpha blending
750 if (background_flags)
751 return false;
752
753 GdkPixbuf *result;
754
755 int image_width = gdk_pixbuf_get_width (pixbuf);
756 int image_height = gdk_pixbuf_get_height (pixbuf);
757
758 int target_width = target->szHint.width;
759 int target_height = target->szHint.height;
760 int new_pmap_width = target_width;
761 int new_pmap_height = target_height;
762
763 int x = 0;
764 int y = 0;
765 int w = 0;
766 int h = 0;
767
768 get_image_geometry (image_width, image_height, w, h, x, y);
769
770 if (!(flags & rootAlign)
771 && (x >= target_width
772 || y >= target_height
773 || (x + w <= 0)
774 || (y + h <= 0)))
775 return false;
776
777 result = pixbuf;
778
779 if ((w != image_width)
780 || (h != image_height))
781 {
782 result = gdk_pixbuf_scale_simple (pixbuf,
783 w, h,
784 GDK_INTERP_BILINEAR);
785 }
786
787 bool ret = false;
788
789 if (result)
790 {
791 XGCValues gcv;
792 GC gc;
793
794 image_width = gdk_pixbuf_get_width (result);
795 image_height = gdk_pixbuf_get_height (result);
796
797 if (h_scale == 0 || v_scale == 0)
798 {
799 new_pmap_width = min (image_width, target_width);
800 new_pmap_height = min (image_height, target_height);
801 }
802
803 if (pixmap)
804 {
805 if (pmap_width != new_pmap_width
806 || pmap_height != new_pmap_height
807 || pmap_depth != target->depth)
808 {
809 XFreePixmap (target->dpy, pixmap);
810 pixmap = None;
811 }
812 }
813
814 if (pixmap == None)
815 {
816 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
817 pmap_width = new_pmap_width;
818 pmap_height = new_pmap_height;
819 pmap_depth = target->depth;
820 }
821
822 gcv.foreground = target->pix_colors[Color_bg];
823 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
824
825 if (h_scale == 0 || v_scale == 0)
826 {
827 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
828 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc,
829 0, 0,
830 0, 0,
831 image_width, image_height,
832 XLIB_RGB_DITHER_NONE,
833 0, 0);
834
835 gcv.tile = tile;
836 gcv.fill_style = FillTiled;
837 gcv.ts_x_origin = x;
838 gcv.ts_y_origin = y;
839 XChangeGC (target->dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
840
841 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
842 XFreePixmap (target->dpy, tile);
843 }
844 else
845 {
846 int src_x, src_y, dst_x, dst_y;
847 int dst_width, dst_height;
848
849 src_x = make_clip_rectangle (x, image_width , new_pmap_width , dst_x, dst_width );
850 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
851
852 if (dst_x > 0 || dst_y > 0
853 || dst_x + dst_width < new_pmap_width
854 || dst_y + dst_height < new_pmap_height)
855 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
856
857 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
858 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc,
859 src_x, src_y,
860 dst_x, dst_y,
861 dst_width, dst_height,
862 XLIB_RGB_DITHER_NONE,
863 0, 0);
864 }
865
866 if (result != pixbuf)
867 g_object_unref (result);
868
869 XFreeGC (target->dpy, gc);
870
871 ret = true;
872 }
873
874 return ret;
875}
876# endif /* HAVE_PIXBUF */
709 877
710bool 878bool
711bgPixmap_t::set_file (const char *file) 879bgPixmap_t::set_file (const char *file)
712{ 880{
713 assert (file); 881 assert (file);
… …
729 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 897 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
730 if (original_asim) 898 if (original_asim)
731 have_image = true; 899 have_image = true;
732 return have_image; 900 return have_image;
733# endif 901# endif
902
903# ifdef HAVE_PIXBUF
904 pixbuf = gdk_pixbuf_new_from_file (file, NULL);
905 if (pixbuf)
906 have_image = true;
907 return have_image;
908# endif
734 } 909 }
735 910
736 return false; 911 return false;
737} 912}
738 913
… …
787static inline unsigned long 962static inline unsigned long
788compute_tint_shade_flags (rxvt_color *tint, int shade) 963compute_tint_shade_flags (rxvt_color *tint, int shade)
789{ 964{
790 unsigned long flags = 0; 965 unsigned long flags = 0;
791 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 966 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
792 bool has_shade = (shade > 0 && shade < 100) || (shade > 100 && shade < 200); 967 bool has_shade = shade != 100;
793 968
794 if (tint) 969 if (tint)
795 { 970 {
796 tint->get (c); 971 tint->get (c);
797# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 972# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
… …
829} 1004}
830 1005
831bool 1006bool
832bgPixmap_t::set_tint (rxvt_color &new_tint) 1007bgPixmap_t::set_tint (rxvt_color &new_tint)
833{ 1008{
834 if (tint != new_tint) 1009 if (!(flags & tintSet) || tint != new_tint)
835 { 1010 {
836 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1011 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
837 tint = new_tint; 1012 tint = new_tint;
838 flags = (flags & ~tintFlags) | new_flags | tintSet; 1013 flags = (flags & ~tintFlags) | new_flags | tintSet;
839 return true; 1014 return true;
… …
857} 1032}
858 1033
859bool 1034bool
860bgPixmap_t::set_shade (const char *shade_str) 1035bgPixmap_t::set_shade (const char *shade_str)
861{ 1036{
862 int new_shade = (shade_str) ? atoi (shade_str) : 0; 1037 int new_shade = (shade_str) ? atoi (shade_str) : 100;
863 1038
864 if (new_shade < 0 && new_shade > -100) 1039 clamp_it (new_shade, -100, 200);
1040 if (new_shade < 0)
865 new_shade = 200 - (100 + new_shade); 1041 new_shade = 200 - (100 + new_shade);
866 else if (new_shade == 100)
867 new_shade = 0;
868 1042
869 if (new_shade != shade) 1043 if (new_shade != shade)
870 { 1044 {
871 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 1045 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
872 shade = new_shade; 1046 shade = new_shade;
873 flags = (flags & (~tintFlags | tintSet)) | new_flags; 1047 flags = (flags & (~tintFlags | tintSet)) | new_flags;
874 return true; 1048 return true;
875 } 1049 }
876 1050
877 return false; 1051 return false;
1052}
1053
1054bool
1055bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1056{
1057 Display *dpy = target->dpy;
1058 bool ret = false;
1059
1060 if (flags & tintWholesome)
1061 {
1062 XGCValues gcv;
1063 GC gc;
1064
1065 /* In this case we can tint image server-side getting significant
1066 * performance improvements, as we eliminate XImage transfer
1067 */
1068 gcv.foreground = Pixel (tint);
1069 gcv.function = GXand;
1070 gcv.fill_style = FillSolid;
1071 gc = XCreateGC (dpy, pixmap, GCFillStyle | GCForeground | GCFunction, &gcv);
1072 if (gc)
1073 {
1074 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1075 ret = true;
1076 XFreeGC (dpy, gc);
1077 }
1078 }
1079 else
1080 {
1081# if XFT
1082 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1083
1084 if (flags & tintSet)
1085 tint.get (c);
1086
1087 if (shade <= 100)
1088 {
1089 c.r = (c.r * shade) / 100;
1090 c.g = (c.g * shade) / 100;
1091 c.b = (c.b * shade) / 100;
1092 }
1093 else
1094 {
1095 c.r = ((0xffff - c.r) * (200 - shade)) / 100;
1096 c.g = ((0xffff - c.g) * (200 - shade)) / 100;
1097 c.b = ((0xffff - c.b) * (200 - shade)) / 100;
1098 }
1099
1100 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1101 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1102 XRenderPictureAttributes pa;
1103
1104 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1105
1106 pa.repeat = True;
1107
1108 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1109 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1110 XFreePixmap (dpy, overlay_pmap);
1111
1112 pa.component_alpha = True;
1113 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1114 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1115 XFreePixmap (dpy, mask_pmap);
1116
1117 if (mask_pic && overlay_pic && back_pic)
1118 {
1119 XRenderColor mask_c;
1120
1121 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1122 mask_c.alpha = 0xffff;
1123 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1124
1125 mask_c.alpha = 0;
1126 mask_c.red = 0xffff - c.r;
1127 mask_c.green = 0xffff - c.g;
1128 mask_c.blue = 0xffff - c.b;
1129 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1130 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1131 ret = true;
1132 }
1133
1134 XRenderFreePicture (dpy, mask_pic);
1135 XRenderFreePicture (dpy, overlay_pic);
1136 XRenderFreePicture (dpy, back_pic);
1137# if DO_TIMING_TEST
1138 XSync (dpy, False);
1139# endif
1140# endif
1141 }
1142
1143 return ret;
878} 1144}
879 1145
880/* make_transparency_pixmap() 1146/* make_transparency_pixmap()
881 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1147 * 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 1148 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by
… …
912 || sx >= root_width || sy >= root_height) 1178 || sx >= root_width || sy >= root_height)
913 return 0; 1179 return 0;
914 1180
915 if (root_pixmap != None) 1181 if (root_pixmap != None)
916 { 1182 {
917 /* we want to validate the pixmap and get it's size at the same time : */ 1183 /* we want to validate the pixmap and get its size at the same time : */
918 int junk; 1184 int junk;
919 unsigned int ujunk; 1185 unsigned int ujunk;
920 /* root pixmap may be bad - allow a error */ 1186 /* root pixmap may be bad - allow a error */
921 target->allowedxerror = -1; 1187 target->allowedxerror = -1;
922 1188
… …
1012 { 1278 {
1013 if (!need_client_side_rendering ()) 1279 if (!need_client_side_rendering ())
1014 { 1280 {
1015 if ((flags & tintNeeded)) 1281 if ((flags & tintNeeded))
1016 { 1282 {
1017 if (flags & tintWholesome) 1283 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; 1284 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 } 1285 }
1116 } /* server side rendering completed */ 1286 } /* server side rendering completed */
1117 1287
1118 if (pixmap) 1288 if (pixmap)
1119 XFreePixmap (dpy, pixmap); 1289 XFreePixmap (dpy, pixmap);
… …
1359 int i; 1529 int i;
1360 1530
1361 Visual *visual = term->visual; 1531 Visual *visual = term->visual;
1362 1532
1363 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1533 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ;
1364
1365 if (shade == 0)
1366 shade = 100;
1367 1534
1368 /* for convenience */ 1535 /* for convenience */
1369 mask_r = visual->red_mask; 1536 mask_r = visual->red_mask;
1370 mask_g = visual->green_mask; 1537 mask_g = visual->green_mask;
1371 mask_b = visual->blue_mask; 1538 mask_b = visual->blue_mask;
… …
1427 default: 1594 default:
1428 return; /* we do not support this color depth */ 1595 return; /* we do not support this color depth */
1429 } 1596 }
1430 1597
1431 /* prepare limits for color transformation (each channel is handled separately) */ 1598 /* prepare limits for color transformation (each channel is handled separately) */
1432 if (shade < 0) { 1599 if (shade > 100) {
1433 shade = -shade; 1600 shade = 200 - shade;
1434 if (shade < 0) shade = 0;
1435 if (shade > 100) shade = 100;
1436 1601
1437 lower_lim_r = 65535-rm; 1602 lower_lim_r = 65535-rm;
1438 lower_lim_g = 65535-gm; 1603 lower_lim_g = 65535-gm;
1439 lower_lim_b = 65535-bm; 1604 lower_lim_b = 65535-bm;
1440 1605
… …
1442 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1607 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); 1608 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
1444 1609
1445 upper_lim_r = upper_lim_g = upper_lim_b = 65535; 1610 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1446 } else { 1611 } else {
1447 if (shade < 0) shade = 0;
1448 if (shade > 100) shade = 100;
1449 1612
1450 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1613 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1451 1614
1452 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100); 1615 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1453 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100); 1616 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);

Diff Legend

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