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.188 by sf-exg, Thu Dec 29 12:25:50 2011 UTC vs.
Revision 1.201 by sf-exg, Sat Feb 4 21:47:06 2012 UTC

20 * You should have received a copy of the GNU General Public License 20 * You should have received a copy of the GNU General Public License
21 * along with this program; if not, write to the Free Software 21 * along with this program; if not, write to the Free Software
22 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 22 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
23 *---------------------------------------------------------------------*/ 23 *---------------------------------------------------------------------*/
24 24
25#include <cmath> 25#include <math.h>
26#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
27#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
28 28
29#if XRENDER 29#if XRENDER
30# include <X11/extensions/Xrender.h> 30# include <X11/extensions/Xrender.h>
31#endif 31#endif
32 32
33#ifndef FilterConvolution 33#ifndef FilterConvolution
34#define FilterConvolution "convolution" 34#define FilterConvolution "convolution"
35#endif
36
37#ifndef RepeatPad
38#define RepeatPad True
35#endif 39#endif
36 40
37#ifdef HAVE_BG_PIXMAP 41#ifdef HAVE_BG_PIXMAP
38# if XRENDER 42# if XRENDER
39static Picture 43static Picture
54# endif 58# endif
55 59
56void 60void
57rxvt_term::bg_destroy () 61rxvt_term::bg_destroy ()
58{ 62{
59#ifdef HAVE_AFTERIMAGE
60 if (original_asim)
61 safe_asimage_destroy (original_asim);
62 if (asv)
63 destroy_asvisual (asv, 0);
64 if (asimman)
65 destroy_image_manager (asimman, 0);
66#endif
67
68#ifdef HAVE_PIXBUF 63#ifdef HAVE_PIXBUF
69 if (pixbuf) 64 if (pixbuf)
70 g_object_unref (pixbuf); 65 g_object_unref (pixbuf);
71#endif 66#endif
72 67
125 120
126 return false; 121 return false;
127} 122}
128 123
129# ifdef BG_IMAGE_FROM_FILE 124# ifdef BG_IMAGE_FROM_FILE
130static inline bool
131check_set_scale_value (int geom_flags, int flag, unsigned int &scale, unsigned int new_value)
132{
133 if (geom_flags & flag)
134 {
135 if (new_value > 1000)
136 new_value = 1000;
137 if (new_value != scale)
138 {
139 scale = new_value;
140 return true;
141 }
142 }
143 return false;
144}
145
146static inline bool
147check_set_align_value (int geom_flags, int flag, int &align, int new_value)
148{
149 if (geom_flags & flag)
150 {
151 if (new_value < -100)
152 new_value = -100;
153 else if (new_value > 200)
154 new_value = 200;
155 if (new_value != align)
156 {
157 align = new_value;
158 return true;
159 }
160 }
161 return false;
162}
163
164static inline int 125static inline int
165make_align_position (int align, int window_size, int image_size) 126make_align_position (int align, int window_size, int image_size)
166{ 127{
167 int diff = window_size - image_size; 128 int diff = window_size - image_size;
168 int smaller = min (image_size, window_size); 129 int smaller = min (image_size, window_size);
187 src_pos = -pos; 148 src_pos = -pos;
188 dst_pos = 0; 149 dst_pos = 0;
189 dst_size += pos; 150 dst_size += pos;
190 } 151 }
191 152
192 if (dst_pos + dst_size > target_size)
193 dst_size = target_size - dst_pos; 153 min_it (dst_size, target_size - dst_pos);
194 return src_pos; 154 return src_pos;
195} 155}
196 156
197bool 157bool
198rxvt_term::bg_set_geometry (const char *geom, bool update) 158rxvt_term::bg_set_geometry (const char *geom, bool update)
199{ 159{
200 bool changed = false; 160 bool changed = false;
201 int geom_flags = 0; 161 int geom_flags = 0;
202 int x = 0, y = 0; 162 int x = h_align;
163 int y = v_align;
203 unsigned int w = 0, h = 0; 164 unsigned int w = h_scale;
165 unsigned int h = v_scale;
204 unsigned long new_flags = 0; 166 unsigned long new_flags = 0;
205 167
206 if (geom == NULL) 168 if (geom == NULL)
207 return false; 169 return false;
208 170
317 w = h = defaultScale; 279 w = h = defaultScale;
318 else if (!(geom_flags & HeightValue)) 280 else if (!(geom_flags & HeightValue))
319 h = w; 281 h = w;
320 else if (!(geom_flags & WidthValue)) 282 else if (!(geom_flags & WidthValue))
321 w = h; 283 w = h;
322
323 geom_flags |= WidthValue|HeightValue|XValue|YValue;
324 } 284 }
325 285
326 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true; 286 min_it (w, 1000);
327 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true; 287 min_it (h, 1000);
328 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true; 288 clamp_it (x, -100, 200);
329 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true; 289 clamp_it (y, -100, 200);
330 290
331 if (new_flags != bg_flags) 291 if (bg_flags != new_flags
292 || h_scale != w
293 || v_scale != h
294 || h_align != x
295 || v_align != y)
332 { 296 {
333 bg_flags = new_flags; 297 bg_flags = new_flags;
298 h_scale = w;
299 v_scale = h;
300 h_align = x;
301 v_align = y;
334 changed = true; 302 changed = true;
335 } 303 }
336 304
337 return changed; 305 return changed;
338} 306}
373 || h_scale || v_scale 341 || h_scale || v_scale
374 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align)) 342 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
375 || w > target_width || h > target_height) 343 || w > target_width || h > target_height)
376 bg_flags |= BG_IS_SIZE_SENSITIVE; 344 bg_flags |= BG_IS_SIZE_SENSITIVE;
377} 345}
378
379# ifdef HAVE_AFTERIMAGE
380bool
381rxvt_term::render_image (unsigned long tr_flags)
382{
383 init_asv ();
384
385 ASImage *background = NULL;
386 ARGB32 background_tint = TINT_LEAVE_SAME;
387
388# ifdef ENABLE_TRANSPARENCY
389 if (tr_flags)
390 background = pixmap2ximage (asv, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, 100);
391
392 if (tr_flags & BG_NEEDS_TINT)
393 {
394 ShadingInfo as_shade;
395 as_shade.shading = shade;
396
397 rgba c;
398 tint.get (c);
399 as_shade.tintColor.red = c.r;
400 as_shade.tintColor.green = c.g;
401 as_shade.tintColor.blue = c.b;
402
403 background_tint = shading2tint32 (&as_shade);
404 }
405
406 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
407 {
408 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
409 ASA_XImage,
410 100, ASIMAGE_QUALITY_DEFAULT);
411 if (tmp)
412 {
413 destroy_asimage (&background);
414 background = tmp;
415 }
416 }
417# endif
418
419 ASImage *result = 0;
420
421 int target_width = szHint.width;
422 int target_height = szHint.height;
423 int new_pmap_width = target_width;
424 int new_pmap_height = target_height;
425
426 int x = 0;
427 int y = 0;
428 int w = 0;
429 int h = 0;
430
431 if (original_asim)
432 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
433
434 if (!original_asim
435 || (!(bg_flags & BG_ROOT_ALIGN)
436 && (x >= target_width
437 || y >= target_height
438 || x + w <= 0
439 || y + h <= 0)))
440 {
441 if (background)
442 {
443 new_pmap_width = background->width;
444 new_pmap_height = background->height;
445 result = background;
446
447 if (background_tint != TINT_LEAVE_SAME)
448 {
449 ASImage *tmp = tile_asimage (asv, background, 0, 0,
450 target_width, target_height, background_tint,
451 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
452 if (tmp)
453 result = tmp;
454 }
455 }
456 else
457 new_pmap_width = new_pmap_height = 0;
458 }
459 else
460 {
461 result = original_asim;
462
463 if (w != original_asim->width
464 || h != original_asim->height)
465 {
466 result = scale_asimage (asv, original_asim,
467 w, h,
468 ASA_XImage,
469 100, ASIMAGE_QUALITY_DEFAULT);
470 }
471
472 if (background == NULL)
473 {
474 if (bg_flags & BG_TILE)
475 {
476 /* if tiling - pixmap has to be sized exactly as the image,
477 but there is no need to make it bigger than the window! */
478 new_pmap_width = min (result->width, target_width);
479 new_pmap_height = min (result->height, target_height);
480
481 /* we also need to tile our image in both directions */
482 ASImage *tmp = tile_asimage (asv, result,
483 (int)result->width - x,
484 (int)result->height - y,
485 new_pmap_width,
486 new_pmap_height,
487 TINT_LEAVE_SAME, ASA_XImage,
488 100, ASIMAGE_QUALITY_DEFAULT);
489 if (tmp)
490 {
491 if (result != original_asim)
492 destroy_asimage (&result);
493
494 result = tmp;
495 }
496 }
497 }
498 else
499 {
500 /* if blending background and image - pixmap has to be sized same as target window */
501 ASImageLayer *layers = create_image_layers (2);
502
503 layers[0].im = background;
504 layers[0].clip_width = target_width;
505 layers[0].clip_height = target_height;
506 layers[0].tint = background_tint;
507 layers[1].im = result;
508
509 if (bg_flags & BG_TILE)
510 {
511 /* tile horizontally */
512 while (x > 0) x -= (int)result->width;
513 layers[1].dst_x = x;
514 layers[1].clip_width = result->width+target_width;
515 }
516 else
517 {
518 /* clip horizontally */
519 layers[1].dst_x = x;
520 layers[1].clip_width = result->width;
521 }
522
523 if (bg_flags & BG_TILE)
524 {
525 while (y > 0) y -= (int)result->height;
526 layers[1].dst_y = y;
527 layers[1].clip_height = result->height + target_height;
528 }
529 else
530 {
531 layers[1].dst_y = y;
532 layers[1].clip_height = result->height;
533 }
534
535 if (rs[Rs_blendtype])
536 {
537 layers[1].merge_scanlines = blend_scanlines_name2func (rs[Rs_blendtype]);
538 if (layers[1].merge_scanlines == NULL)
539 layers[1].merge_scanlines = alphablend_scanlines;
540 }
541
542 ASImage *tmp = merge_layers (asv, layers, 2, target_width, target_height,
543 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
544
545 if (tmp)
546 {
547 if (result != original_asim)
548 destroy_asimage (&result);
549
550 result = tmp;
551 }
552
553 free (layers);
554 }
555 }
556
557 bool ret = false;
558
559 if (result)
560 {
561 XGCValues gcv;
562 GC gc;
563
564 /* create Pixmap */
565 if (bg_pixmap == None
566 || bg_pmap_width != new_pmap_width
567 || bg_pmap_height != new_pmap_height)
568 {
569 if (bg_pixmap)
570 XFreePixmap (dpy, bg_pixmap);
571 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
572 bg_pmap_width = new_pmap_width;
573 bg_pmap_height = new_pmap_height;
574 }
575 /* fill with background color (if result's not completely overlapping it) */
576 gcv.foreground = pix_colors[Color_bg];
577 gc = XCreateGC (dpy, vt, GCForeground, &gcv);
578
579 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
580 int dst_width = result->width, dst_height = result->height;
581 if (background == NULL)
582 {
583 if (!(bg_flags & BG_TILE))
584 {
585 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
586 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
587 }
588
589 if (dst_x > 0 || dst_y > 0
590 || dst_x + dst_width < new_pmap_width
591 || dst_y + dst_height < new_pmap_height)
592 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
593 }
594
595 /* put result on pixmap */
596 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
597 asimage2drawable (asv, bg_pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
598
599 if (result != background && result != original_asim)
600 destroy_asimage (&result);
601
602 XFreeGC (dpy, gc);
603
604 ret = true;
605 }
606
607 if (background)
608 destroy_asimage (&background);
609
610 return ret;
611}
612# endif /* HAVE_AFTERIMAGE */
613 346
614# ifdef HAVE_PIXBUF 347# ifdef HAVE_PIXBUF
615bool 348bool
616rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc, 349rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
617 int src_x, int src_y, int dst_x, int dst_y, 350 int src_x, int src_y, int dst_x, int dst_y,
819 } 552 }
820 553
821#if XRENDER 554#if XRENDER
822 if (tr_flags) 555 if (tr_flags)
823 { 556 {
824 XRenderPictureAttributes pa;
825
826 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, visual); 557 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
558
827 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 559 Picture src = XRenderCreatePicture (dpy, root_pmap, format, 0, 0);
828 560
829 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
830 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, dst_format, 0, &pa); 561 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, format, 0, 0);
831 562
832 Picture mask = create_xrender_mask (dpy, vt, False, False); 563 Picture mask = create_xrender_mask (dpy, vt, False, False);
833 564
834 XRenderColor mask_c; 565 XRenderColor mask_c;
835 566
836 mask_c.alpha = 0x8000; 567 mask_c.alpha = 0x8000;
837 mask_c.red = 0; 568 mask_c.red =
838 mask_c.green = 0; 569 mask_c.green =
839 mask_c.blue = 0; 570 mask_c.blue = 0;
840 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1); 571 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
572
841 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height); 573 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
842 574
843 XRenderFreePicture (dpy, src); 575 XRenderFreePicture (dpy, src);
844 XRenderFreePicture (dpy, dst); 576 XRenderFreePicture (dpy, dst);
845 XRenderFreePicture (dpy, mask); 577 XRenderFreePicture (dpy, mask);
877 memcpy (f, file, len); 609 memcpy (f, file, len);
878 f[len] = '\0'; 610 f[len] = '\0';
879 file = f; 611 file = f;
880 } 612 }
881 613
882# ifdef HAVE_AFTERIMAGE
883 if (!asimman)
884 asimman = create_generic_imageman (rs[Rs_path]);
885 ASImage *image = get_asimage (asimman, file, 0xFFFFFFFF, 100);
886 if (image)
887 {
888 if (original_asim)
889 safe_asimage_destroy (original_asim);
890 original_asim = image;
891 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
892 ret = true;
893 }
894# endif
895
896# ifdef HAVE_PIXBUF 614# ifdef HAVE_PIXBUF
897 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 615 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
898 if (image) 616 if (image)
899 { 617 {
900 if (pixbuf) 618 if (pixbuf)
957 { 675 {
958 changed = true; 676 changed = true;
959 v_blurRadius = vr; 677 v_blurRadius = vr;
960 } 678 }
961 679
962 if (v_blurRadius == 0 && h_blurRadius == 0) 680 if (h_blurRadius == 0 || v_blurRadius == 0)
963 bg_flags &= ~BG_NEEDS_BLUR; 681 bg_flags &= ~BG_NEEDS_BLUR;
964 else 682 else
965 bg_flags |= BG_NEEDS_BLUR; 683 bg_flags |= BG_NEEDS_BLUR;
966 684
967 return changed; 685 return changed;
973 rgba c; 691 rgba c;
974 bool has_shade = shade != 100; 692 bool has_shade = shade != 100;
975 693
976 bg_flags &= ~BG_TINT_FLAGS; 694 bg_flags &= ~BG_TINT_FLAGS;
977 695
696 if (bg_flags & BG_TINT_SET)
697 {
978 tint.get (c); 698 tint.get (c);
979
980 if (!has_shade 699 if (!has_shade
981 && (c.r <= 0x00ff || c.r >= 0xff00) 700 && (c.r <= 0x00ff || c.r >= 0xff00)
982 && (c.g <= 0x00ff || c.g >= 0xff00) 701 && (c.g <= 0x00ff || c.g >= 0xff00)
983 && (c.b <= 0x00ff || c.b >= 0xff00)) 702 && (c.b <= 0x00ff || c.b >= 0xff00))
984 bg_flags |= BG_TINT_BITAND; 703 bg_flags |= BG_TINT_BITAND;
704 }
985 705
986 if (has_shade 706 if (has_shade || (bg_flags & BG_TINT_SET))
987 || c.r < 0xff00
988 || c.g < 0xff00
989 || c.b < 0xff00)
990 bg_flags |= BG_NEEDS_TINT; 707 bg_flags |= BG_NEEDS_TINT;
991} 708}
992 709
993bool 710bool
994rxvt_term::bg_set_tint (rxvt_color &new_tint) 711rxvt_term::bg_set_tint (rxvt_color &new_tint)
995{ 712{
996 if (tint != new_tint) 713 if (!(bg_flags & BG_TINT_SET) || tint != new_tint)
997 { 714 {
998 tint = new_tint; 715 tint = new_tint;
716 bg_flags |= BG_TINT_SET;
999 set_tint_shade_flags (); 717 set_tint_shade_flags ();
1000 return true; 718 return true;
1001 } 719 }
1002 720
1003 return false; 721 return false;
1044 params[i+2] = XDoubleToFixed (kernel[i] / sum); 762 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1045} 763}
1046#endif 764#endif
1047 765
1048bool 766bool
1049rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 767rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height, int depth)
1050{ 768{
1051 bool ret = false; 769 bool ret = false;
1052#if XRENDER 770#if XRENDER
1053 if (!(bg_flags & BG_HAS_RENDER_CONV)) 771 if (!(bg_flags & BG_HAS_RENDER_CONV))
1054 return false; 772 return false;
1058 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 776 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1059 777
1060 XRenderPictureAttributes pa; 778 XRenderPictureAttributes pa;
1061 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 779 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1062 780
781 pa.repeat = RepeatPad;
1063 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 782 Picture src = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
783 Pixmap tmp = XCreatePixmap (dpy, pixmap, width, height, depth);
1064 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 784 Picture dst = XRenderCreatePicture (dpy, tmp, format, CPRepeat, &pa);
785 XFreePixmap (dpy, tmp);
1065 786
1066 if (kernel && params) 787 if (kernel && params)
1067 { 788 {
1068 if (h_blurRadius)
1069 {
1070 size = h_blurRadius * 2 + 1; 789 size = h_blurRadius * 2 + 1;
1071 get_gaussian_kernel (h_blurRadius, size, kernel, params); 790 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1072 791
1073 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 792 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1074 XRenderComposite (dpy, 793 XRenderComposite (dpy,
1075 PictOpSrc, 794 PictOpSrc,
1076 src, 795 src,
1077 None, 796 None,
1078 dst, 797 dst,
1079 0, 0, 798 0, 0,
1080 0, 0, 799 0, 0,
1081 0, 0, 800 0, 0,
1082 width, height); 801 width, height);
1083 }
1084 802
1085 if (v_blurRadius) 803 ::swap (src, dst);
1086 { 804
1087 size = v_blurRadius * 2 + 1; 805 size = v_blurRadius * 2 + 1;
1088 get_gaussian_kernel (v_blurRadius, size, kernel, params); 806 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1089 ::swap (params[0], params[1]); 807 ::swap (params[0], params[1]);
1090 808
1091 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 809 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1092 XRenderComposite (dpy, 810 XRenderComposite (dpy,
1093 PictOpSrc, 811 PictOpSrc,
1094 src, 812 src,
1095 None, 813 None,
1096 dst, 814 dst,
1097 0, 0, 815 0, 0,
1098 0, 0, 816 0, 0,
1099 0, 0, 817 0, 0,
1100 width, height); 818 width, height);
1101 }
1102 819
1103 ret = true; 820 ret = true;
1104 } 821 }
1105 822
1106 free (kernel); 823 free (kernel);
1136 } 853 }
1137 } 854 }
1138# if XRENDER 855# if XRENDER
1139 else if (bg_flags & BG_HAS_RENDER) 856 else if (bg_flags & BG_HAS_RENDER)
1140 { 857 {
1141 rgba c; 858 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1142 859
860 if (bg_flags & BG_TINT_SET)
1143 tint.get (c); 861 tint.get (c);
1144 862
1145 if (shade <= 100) 863 if (shade <= 100)
1146 { 864 {
1147 c.r = c.r * shade / 100; 865 c.r = c.r * shade / 100;
1148 c.g = c.g * shade / 100; 866 c.g = c.g * shade / 100;
1154 c.g = c.g * (200 - shade) / 100; 872 c.g = c.g * (200 - shade) / 100;
1155 c.b = c.b * (200 - shade) / 100; 873 c.b = c.b * (200 - shade) / 100;
1156 } 874 }
1157 875
1158 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 876 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1159 XRenderPictureAttributes pa;
1160 877
1161 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 878 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, 0);
1162 879
1163 Picture overlay_pic = create_xrender_mask (dpy, pixmap, True, False); 880 Picture overlay_pic = create_xrender_mask (dpy, pixmap, True, False);
1164 881
1165 Picture mask_pic = create_xrender_mask (dpy, pixmap, True, True); 882 Picture mask_pic = create_xrender_mask (dpy, pixmap, True, True);
1166 883
1175 mask_c.alpha = 0; 892 mask_c.alpha = 0;
1176 mask_c.red = 0xffff - c.r; 893 mask_c.red = 0xffff - c.r;
1177 mask_c.green = 0xffff - c.g; 894 mask_c.green = 0xffff - c.g;
1178 mask_c.blue = 0xffff - c.b; 895 mask_c.blue = 0xffff - c.b;
1179 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 896 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
897
1180 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height); 898 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1181 899
1182 if (shade > 100) 900 if (shade > 100)
1183 { 901 {
1184 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1185 mask_c.alpha = 0; 902 mask_c.alpha = 0;
903 mask_c.red =
904 mask_c.green =
905 mask_c.blue = 0xffff * (shade - 100) / 100;
1186 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 906 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1187 907
1188 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height); 908 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1189 } 909 }
1190 910
1253#if XRENDER 973#if XRENDER
1254 if (bg_flags & BG_HAS_RENDER) 974 if (bg_flags & BG_HAS_RENDER)
1255 { 975 {
1256 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth); 976 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
1257 977
1258 XRenderPictureAttributes pa;
1259
1260 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen)); 978 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1261 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa); 979 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, 0);
1262 980
1263 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual); 981 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
1264 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa); 982 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, 0);
1265 983
1266 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height); 984 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1267 985
1268 XRenderFreePicture (dpy, src); 986 XRenderFreePicture (dpy, src);
1269 XRenderFreePicture (dpy, dst); 987 XRenderFreePicture (dpy, dst);
1299 1017
1300 if (gc) 1018 if (gc)
1301 { 1019 {
1302 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height); 1020 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1303 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1021 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS);
1304 XFreeGC (dpy, gc);
1305 1022
1306 if (!(bg_flags & BG_CLIENT_RENDER)) 1023 if (!(bg_flags & BG_CLIENT_RENDER))
1307 { 1024 {
1308 if (bg_flags & BG_NEEDS_BLUR) 1025 if (bg_flags & BG_NEEDS_BLUR)
1309 { 1026 {
1310 if (blur_pixmap (bg_pixmap, visual, window_width, window_height)) 1027 if (blur_pixmap (bg_pixmap, visual, window_width, window_height, depth))
1311 result &= ~BG_NEEDS_BLUR; 1028 result &= ~BG_NEEDS_BLUR;
1312 } 1029 }
1313 if (bg_flags & BG_NEEDS_TINT) 1030 if (bg_flags & BG_NEEDS_TINT)
1314 { 1031 {
1315 if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) 1032 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1316 result &= ~BG_NEEDS_TINT; 1033 result &= ~BG_NEEDS_TINT;
1317 } 1034 }
1035 if (result & BG_NEEDS_TINT)
1036 {
1037 XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1038 if (ximage)
1039 {
1040 /* our own client-side tinting */
1041 tint_ximage (DefaultVisual (dpy, display->screen), ximage);
1042
1043 XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height);
1044 XDestroyImage (ximage);
1045 }
1046 }
1318 } /* server side rendering completed */ 1047 } /* server side rendering completed */
1048
1049 XFreeGC (dpy, gc);
1319 } 1050 }
1320 1051
1321 if (recoded_root_pmap != root_pixmap) 1052 if (recoded_root_pmap != root_pixmap)
1322 XFreePixmap (dpy, recoded_root_pmap); 1053 XFreePixmap (dpy, recoded_root_pmap);
1323 1054
1344# ifdef ENABLE_TRANSPARENCY 1075# ifdef ENABLE_TRANSPARENCY
1345 if (bg_flags & BG_IS_TRANSPARENT) 1076 if (bg_flags & BG_IS_TRANSPARENT)
1346 { 1077 {
1347 /* we need to re-generate transparency pixmap in that case ! */ 1078 /* we need to re-generate transparency pixmap in that case ! */
1348 tr_flags = make_transparency_pixmap (); 1079 tr_flags = make_transparency_pixmap ();
1349 if (tr_flags == 0) 1080 if (tr_flags)
1350 return false;
1351 bg_flags |= BG_IS_VALID; 1081 bg_flags |= BG_IS_VALID;
1352 } 1082 }
1353# endif 1083# endif
1354 1084
1355# ifdef BG_IMAGE_FROM_FILE 1085# ifdef BG_IMAGE_FROM_FILE
1356 if ((bg_flags & BG_IS_FROM_FILE) 1086 if ((bg_flags & BG_IS_FROM_FILE)
1359 if (render_image (tr_flags)) 1089 if (render_image (tr_flags))
1360 bg_flags |= BG_IS_VALID; 1090 bg_flags |= BG_IS_VALID;
1361 } 1091 }
1362# endif 1092# endif
1363 1093
1364# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1365 XImage *result = NULL;
1366
1367 if (tr_flags & BG_NEEDS_TINT)
1368 {
1369 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1370 }
1371
1372 if (result)
1373 {
1374 /* our own client-side tinting */
1375 //if (tr_flags & BG_NEEDS_TINT)
1376 if (1)
1377 tint_ximage (DefaultVisual (dpy, display->screen), result);
1378
1379 GC gc = XCreateGC (dpy, vt, 0UL, NULL);
1380
1381 if (gc)
1382 {
1383 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1384
1385 XFreeGC (dpy, gc);
1386 }
1387
1388 XDestroyImage (result);
1389 }
1390# endif
1391
1392 if (!(bg_flags & BG_IS_VALID)) 1094 if (!(bg_flags & BG_IS_VALID))
1393 { 1095 {
1394 if (bg_pixmap != None) 1096 if (bg_pixmap != None)
1395 { 1097 {
1396 XFreePixmap (dpy, bg_pixmap); 1098 XFreePixmap (dpy, bg_pixmap);
1408 1110
1409void 1111void
1410rxvt_term::bg_init () 1112rxvt_term::bg_init ()
1411{ 1113{
1412#ifdef ENABLE_TRANSPARENCY 1114#ifdef ENABLE_TRANSPARENCY
1413 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1414 tint.set (this, c);
1415 shade = 100; 1115 shade = 100;
1416#endif 1116#endif
1417 1117
1418 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV); 1118 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV);
1419#if XRENDER 1119#if XRENDER
1432#endif 1132#endif
1433} 1133}
1434 1134
1435#endif /* HAVE_BG_PIXMAP */ 1135#endif /* HAVE_BG_PIXMAP */
1436 1136
1437#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1137#ifdef ENABLE_TRANSPARENCY
1438/* based on code from aterm-0.4.2 */ 1138/* based on code from aterm-0.4.2 */
1439 1139
1440static inline void 1140static inline void
1441fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high) 1141fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1442{ 1142{
1522 break; 1222 break;
1523 default: 1223 default:
1524 return; /* we do not support this color depth */ 1224 return; /* we do not support this color depth */
1525 } 1225 }
1526 1226
1527 rgba c; 1227 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1528 1228
1229 if (bg_flags & BG_TINT_SET)
1529 tint.get (c); 1230 tint.get (c);
1530 1231
1531 /* prepare limits for color transformation (each channel is handled separately) */ 1232 /* prepare limits for color transformation (each channel is handled separately) */
1532 if (shade > 100) 1233 if (shade > 100)
1533 { 1234 {
1534 c.r = c.r * (200 - shade) / 100; 1235 c.r = c.r * (200 - shade) / 100;
1587 } 1288 }
1588 } 1289 }
1589 1290
1590 free (lookup); 1291 free (lookup);
1591} 1292}
1592#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1293#endif /* ENABLE_TRANSPARENCY */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines