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.189 by sf-exg, Thu Dec 29 16:45:22 2011 UTC vs.
Revision 1.204 by sf-exg, Tue Apr 10 15:19:22 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}
366 { 334 {
367 x = make_align_position (h_align, target_width, w); 335 x = make_align_position (h_align, target_width, w);
368 y = make_align_position (v_align, target_height, h); 336 y = make_align_position (v_align, target_height, h);
369 } 337 }
370 338
371 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
372 if (!(bg_flags & BG_TILE) 339 if (!(bg_flags & BG_TILE)
373 || h_scale || v_scale 340 || h_scale || v_scale
374 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align)) 341 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
375 || w > target_width || h > target_height) 342 || image_width > target_width || image_height > target_height)
376 bg_flags |= BG_IS_SIZE_SENSITIVE; 343 bg_flags |= BG_IS_SIZE_SENSITIVE;
377}
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 344 else
460 { 345 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
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} 346}
612# endif /* HAVE_AFTERIMAGE */
613 347
614# ifdef HAVE_PIXBUF 348# ifdef HAVE_PIXBUF
615bool 349bool
616rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc, 350rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
617 int src_x, int src_y, int dst_x, int dst_y, 351 int src_x, int src_y, int dst_x, int dst_y,
694 XDestroyImage (ximage); 428 XDestroyImage (ximage);
695 return true; 429 return true;
696} 430}
697 431
698bool 432bool
699rxvt_term::render_image (unsigned long tr_flags) 433rxvt_term::render_image (bool transparent)
700{ 434{
701 if (!pixbuf) 435 if (!pixbuf)
702 return false; 436 return false;
703 437
704 if (tr_flags 438 if (transparent
705 && !(bg_flags & BG_HAS_RENDER)) 439 && !(bg_flags & BG_HAS_RENDER))
706 return false; 440 return false;
707 441
708 GdkPixbuf *result; 442 GdkPixbuf *result;
709 443
749 Pixmap root_pmap; 483 Pixmap root_pmap;
750 484
751 image_width = gdk_pixbuf_get_width (result); 485 image_width = gdk_pixbuf_get_width (result);
752 image_height = gdk_pixbuf_get_height (result); 486 image_height = gdk_pixbuf_get_height (result);
753 487
754 if (tr_flags) 488 if (transparent)
755 { 489 {
756 root_pmap = bg_pixmap; 490 root_pmap = bg_pixmap;
757 bg_pixmap = None; 491 bg_pixmap = None;
758 } 492 }
759 else 493 else
817 dst_x, dst_y, 551 dst_x, dst_y,
818 dst_width, dst_height); 552 dst_width, dst_height);
819 } 553 }
820 554
821#if XRENDER 555#if XRENDER
822 if (tr_flags) 556 if (transparent)
823 { 557 {
824 XRenderPictureAttributes pa;
825
826 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, visual); 558 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
559
827 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 560 Picture src = XRenderCreatePicture (dpy, root_pmap, format, 0, 0);
828 561
829 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
830 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, dst_format, 0, &pa); 562 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, format, 0, 0);
831 563
832 Picture mask = create_xrender_mask (dpy, vt, False, False); 564 Picture mask = create_xrender_mask (dpy, vt, False, False);
833 565
834 XRenderColor mask_c; 566 XRenderColor mask_c;
835 567
836 mask_c.alpha = 0x8000; 568 mask_c.alpha = 0x8000;
837 mask_c.red = 0; 569 mask_c.red =
838 mask_c.green = 0; 570 mask_c.green =
839 mask_c.blue = 0; 571 mask_c.blue = 0;
840 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1); 572 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
573
841 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height); 574 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
842 575
843 XRenderFreePicture (dpy, src); 576 XRenderFreePicture (dpy, src);
844 XRenderFreePicture (dpy, dst); 577 XRenderFreePicture (dpy, dst);
845 XRenderFreePicture (dpy, mask); 578 XRenderFreePicture (dpy, mask);
852 } 585 }
853 586
854 if (result != pixbuf) 587 if (result != pixbuf)
855 g_object_unref (result); 588 g_object_unref (result);
856 589
857 if (tr_flags) 590 if (transparent)
858 XFreePixmap (dpy, root_pmap); 591 XFreePixmap (dpy, root_pmap);
859 592
860 return ret; 593 return ret;
861} 594}
862# endif /* HAVE_PIXBUF */ 595# endif /* HAVE_PIXBUF */
877 memcpy (f, file, len); 610 memcpy (f, file, len);
878 f[len] = '\0'; 611 f[len] = '\0';
879 file = f; 612 file = f;
880 } 613 }
881 614
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 615# ifdef HAVE_PIXBUF
897 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 616 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
898 if (image) 617 if (image)
899 { 618 {
900 if (pixbuf) 619 if (pixbuf)
957 { 676 {
958 changed = true; 677 changed = true;
959 v_blurRadius = vr; 678 v_blurRadius = vr;
960 } 679 }
961 680
962 if (v_blurRadius == 0 && h_blurRadius == 0) 681 if (h_blurRadius && v_blurRadius)
682 bg_flags |= BG_NEEDS_BLUR;
683 else
963 bg_flags &= ~BG_NEEDS_BLUR; 684 bg_flags &= ~BG_NEEDS_BLUR;
964 else
965 bg_flags |= BG_NEEDS_BLUR;
966 685
967 return changed; 686 return changed;
968} 687}
969 688
970void 689void
971rxvt_term::set_tint_shade_flags () 690rxvt_term::set_tint_shade_flags ()
972{ 691{
973 rgba c; 692 if (shade != 100 || (bg_flags & BG_TINT_SET))
974 bool has_shade = shade != 100;
975
976 bg_flags &= ~BG_TINT_FLAGS;
977
978 tint.get (c);
979
980 if (!has_shade
981 && (c.r <= 0x00ff || c.r >= 0xff00)
982 && (c.g <= 0x00ff || c.g >= 0xff00)
983 && (c.b <= 0x00ff || c.b >= 0xff00))
984 bg_flags |= BG_TINT_BITAND;
985
986 if (has_shade
987 || c.r < 0xff00
988 || c.g < 0xff00
989 || c.b < 0xff00)
990 bg_flags |= BG_NEEDS_TINT; 693 bg_flags |= BG_NEEDS_TINT;
694 else
695 bg_flags &= ~BG_NEEDS_TINT;
991} 696}
992 697
993bool 698bool
994rxvt_term::bg_set_tint (rxvt_color &new_tint) 699rxvt_term::bg_set_tint (rxvt_color &new_tint)
995{ 700{
996 if (tint != new_tint) 701 if (!(bg_flags & BG_TINT_SET) || tint != new_tint)
997 { 702 {
998 tint = new_tint; 703 tint = new_tint;
704 bg_flags |= BG_TINT_SET;
705
706 rgba c;
707 tint.get (c);
708 if ((c.r <= 0x00ff || c.r >= 0xff00)
709 && (c.g <= 0x00ff || c.g >= 0xff00)
710 && (c.b <= 0x00ff || c.b >= 0xff00))
711 bg_flags |= BG_TINT_BITAND;
712 else
713 bg_flags &= ~BG_TINT_BITAND;
714
999 set_tint_shade_flags (); 715 set_tint_shade_flags ();
1000 return true; 716 return true;
1001 } 717 }
1002 718
1003 return false; 719 return false;
1044 params[i+2] = XDoubleToFixed (kernel[i] / sum); 760 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1045} 761}
1046#endif 762#endif
1047 763
1048bool 764bool
1049rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 765rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height, int depth)
1050{ 766{
1051 bool ret = false; 767 bool ret = false;
1052#if XRENDER 768#if XRENDER
1053 if (!(bg_flags & BG_HAS_RENDER_CONV)) 769 if (!(bg_flags & BG_HAS_RENDER_CONV))
1054 return false; 770 return false;
1058 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 774 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1059 775
1060 XRenderPictureAttributes pa; 776 XRenderPictureAttributes pa;
1061 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 777 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1062 778
779 pa.repeat = RepeatPad;
1063 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 780 Picture src = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
781 Pixmap tmp = XCreatePixmap (dpy, pixmap, width, height, depth);
1064 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 782 Picture dst = XRenderCreatePicture (dpy, tmp, format, CPRepeat, &pa);
783 XFreePixmap (dpy, tmp);
1065 784
1066 if (kernel && params) 785 if (kernel && params)
1067 { 786 {
1068 if (h_blurRadius)
1069 {
1070 size = h_blurRadius * 2 + 1; 787 size = h_blurRadius * 2 + 1;
1071 get_gaussian_kernel (h_blurRadius, size, kernel, params); 788 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1072 789
1073 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 790 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1074 XRenderComposite (dpy, 791 XRenderComposite (dpy,
1075 PictOpSrc, 792 PictOpSrc,
1076 src, 793 src,
1077 None, 794 None,
1078 dst, 795 dst,
1079 0, 0, 796 0, 0,
1080 0, 0, 797 0, 0,
1081 0, 0, 798 0, 0,
1082 width, height); 799 width, height);
1083 }
1084 800
1085 if (v_blurRadius) 801 ::swap (src, dst);
1086 { 802
1087 size = v_blurRadius * 2 + 1; 803 size = v_blurRadius * 2 + 1;
1088 get_gaussian_kernel (v_blurRadius, size, kernel, params); 804 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1089 ::swap (params[0], params[1]); 805 ::swap (params[0], params[1]);
1090 806
1091 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 807 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1092 XRenderComposite (dpy, 808 XRenderComposite (dpy,
1093 PictOpSrc, 809 PictOpSrc,
1094 src, 810 src,
1095 None, 811 None,
1096 dst, 812 dst,
1097 0, 0, 813 0, 0,
1098 0, 0, 814 0, 0,
1099 0, 0, 815 0, 0,
1100 width, height); 816 width, height);
1101 }
1102 817
1103 ret = true; 818 ret = true;
1104 } 819 }
1105 820
1106 free (kernel); 821 free (kernel);
1114bool 829bool
1115rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 830rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1116{ 831{
1117 bool ret = false; 832 bool ret = false;
1118 833
1119 if (bg_flags & BG_TINT_BITAND) 834 if (shade == 100 && (bg_flags & BG_TINT_BITAND))
1120 { 835 {
1121 XGCValues gcv; 836 XGCValues gcv;
1122 GC gc; 837 GC gc;
1123 838
1124 /* In this case we can tint image server-side getting significant 839 /* In this case we can tint image server-side getting significant
1136 } 851 }
1137 } 852 }
1138# if XRENDER 853# if XRENDER
1139 else if (bg_flags & BG_HAS_RENDER) 854 else if (bg_flags & BG_HAS_RENDER)
1140 { 855 {
1141 rgba c; 856 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1142 857
858 if (bg_flags & BG_TINT_SET)
1143 tint.get (c); 859 tint.get (c);
1144 860
1145 if (shade <= 100) 861 if (shade <= 100)
1146 { 862 {
1147 c.r = c.r * shade / 100; 863 c.r = c.r * shade / 100;
1148 c.g = c.g * shade / 100; 864 c.g = c.g * shade / 100;
1154 c.g = c.g * (200 - shade) / 100; 870 c.g = c.g * (200 - shade) / 100;
1155 c.b = c.b * (200 - shade) / 100; 871 c.b = c.b * (200 - shade) / 100;
1156 } 872 }
1157 873
1158 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 874 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1159 XRenderPictureAttributes pa;
1160 875
1161 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 876 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, 0);
1162 877
1163 Picture overlay_pic = create_xrender_mask (dpy, pixmap, True, False); 878 Picture overlay_pic = create_xrender_mask (dpy, pixmap, True, False);
1164 879
1165 Picture mask_pic = create_xrender_mask (dpy, pixmap, True, True); 880 Picture mask_pic = create_xrender_mask (dpy, pixmap, True, True);
1166 881
1175 mask_c.alpha = 0; 890 mask_c.alpha = 0;
1176 mask_c.red = 0xffff - c.r; 891 mask_c.red = 0xffff - c.r;
1177 mask_c.green = 0xffff - c.g; 892 mask_c.green = 0xffff - c.g;
1178 mask_c.blue = 0xffff - c.b; 893 mask_c.blue = 0xffff - c.b;
1179 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 894 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
895
1180 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height); 896 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1181 897
1182 if (shade > 100) 898 if (shade > 100)
1183 { 899 {
1184 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1185 mask_c.alpha = 0; 900 mask_c.alpha = 0;
901 mask_c.red =
902 mask_c.green =
903 mask_c.blue = 0xffff * (shade - 100) / 100;
1186 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 904 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1187 905
1188 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height); 906 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1189 } 907 }
1190 908
1202/* 920/*
1203 * Builds a pixmap of the same size as the terminal window that contains 921 * Builds a pixmap of the same size as the terminal window that contains
1204 * the tiled portion of the root pixmap that is supposed to be covered by 922 * the tiled portion of the root pixmap that is supposed to be covered by
1205 * our window. 923 * our window.
1206 */ 924 */
1207unsigned long 925bool
1208rxvt_term::make_transparency_pixmap () 926rxvt_term::make_transparency_pixmap ()
1209{ 927{
1210 unsigned long result = 0; 928 bool ret = false;
1211 929
1212 /* root dimensions may change from call to call - but Display structure should 930 /* root dimensions may change from call to call - but Display structure should
1213 * be always up-to-date, so let's use it : 931 * be always up-to-date, so let's use it :
1214 */ 932 */
1215 int screen = display->screen; 933 int screen = display->screen;
1253#if XRENDER 971#if XRENDER
1254 if (bg_flags & BG_HAS_RENDER) 972 if (bg_flags & BG_HAS_RENDER)
1255 { 973 {
1256 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth); 974 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
1257 975
1258 XRenderPictureAttributes pa;
1259
1260 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen)); 976 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1261 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa); 977 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, 0);
1262 978
1263 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual); 979 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
1264 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa); 980 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, 0);
1265 981
1266 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height); 982 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1267 983
1268 XRenderFreePicture (dpy, src); 984 XRenderFreePicture (dpy, src);
1269 XRenderFreePicture (dpy, dst); 985 XRenderFreePicture (dpy, dst);
1298 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1014 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1299 1015
1300 if (gc) 1016 if (gc)
1301 { 1017 {
1302 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height); 1018 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1303 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1019 ret = true;
1020 unsigned long tr_flags = bg_flags & BG_EFFECTS_FLAGS;
1304 1021
1305 if (!(bg_flags & BG_CLIENT_RENDER)) 1022 if (!(bg_flags & BG_CLIENT_RENDER))
1306 { 1023 {
1307 if (bg_flags & BG_NEEDS_BLUR) 1024 if (bg_flags & BG_NEEDS_BLUR)
1308 { 1025 {
1309 if (blur_pixmap (bg_pixmap, visual, window_width, window_height)) 1026 if (blur_pixmap (bg_pixmap, visual, window_width, window_height, depth))
1310 result &= ~BG_NEEDS_BLUR; 1027 tr_flags &= ~BG_NEEDS_BLUR;
1311 } 1028 }
1312 if (bg_flags & BG_NEEDS_TINT) 1029 if (bg_flags & BG_NEEDS_TINT)
1313 { 1030 {
1314 if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) 1031 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1315 result &= ~BG_NEEDS_TINT; 1032 tr_flags &= ~BG_NEEDS_TINT;
1316 } 1033 }
1317# ifndef HAVE_AFTERIMAGE
1318 if (result & BG_NEEDS_TINT) 1034 if (tr_flags & BG_NEEDS_TINT)
1319 { 1035 {
1320 XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap); 1036 XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1321 if (ximage) 1037 if (ximage)
1322 { 1038 {
1323 /* our own client-side tinting */ 1039 /* our own client-side tinting */
1325 1041
1326 XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height); 1042 XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height);
1327 XDestroyImage (ximage); 1043 XDestroyImage (ximage);
1328 } 1044 }
1329 } 1045 }
1330# endif
1331 } /* server side rendering completed */ 1046 } /* server side rendering completed */
1332 1047
1333 XFreeGC (dpy, gc); 1048 XFreeGC (dpy, gc);
1334 } 1049 }
1335 1050
1336 if (recoded_root_pmap != root_pixmap) 1051 if (recoded_root_pmap != root_pixmap)
1337 XFreePixmap (dpy, recoded_root_pmap); 1052 XFreePixmap (dpy, recoded_root_pmap);
1338 1053
1339 return result; 1054 return ret;
1340} 1055}
1341 1056
1342void 1057void
1343rxvt_term::bg_set_root_pixmap () 1058rxvt_term::bg_set_root_pixmap ()
1344{ 1059{
1351# endif /* ENABLE_TRANSPARENCY */ 1066# endif /* ENABLE_TRANSPARENCY */
1352 1067
1353bool 1068bool
1354rxvt_term::bg_render () 1069rxvt_term::bg_render ()
1355{ 1070{
1356 unsigned long tr_flags = 0; 1071 bool transparent = false;
1357 1072
1358 bg_invalidate (); 1073 bg_invalidate ();
1359# ifdef ENABLE_TRANSPARENCY 1074# ifdef ENABLE_TRANSPARENCY
1360 if (bg_flags & BG_IS_TRANSPARENT) 1075 if (bg_flags & BG_IS_TRANSPARENT)
1361 { 1076 {
1362 /* we need to re-generate transparency pixmap in that case ! */ 1077 /* we need to re-generate transparency pixmap in that case ! */
1363 tr_flags = make_transparency_pixmap (); 1078 transparent = make_transparency_pixmap ();
1364 if (tr_flags == 0) 1079 if (transparent)
1365 return false;
1366 bg_flags |= BG_IS_VALID; 1080 bg_flags |= BG_IS_VALID;
1367 } 1081 }
1368# endif 1082# endif
1369 1083
1370# ifdef BG_IMAGE_FROM_FILE 1084# ifdef BG_IMAGE_FROM_FILE
1371 if ((bg_flags & BG_IS_FROM_FILE) 1085 if (bg_flags & BG_IS_FROM_FILE)
1372 || (tr_flags & BG_EFFECTS_FLAGS))
1373 { 1086 {
1374 if (render_image (tr_flags)) 1087 if (render_image (transparent))
1375 bg_flags |= BG_IS_VALID; 1088 bg_flags |= BG_IS_VALID;
1376 } 1089 }
1377# endif 1090# endif
1378 1091
1379 if (!(bg_flags & BG_IS_VALID)) 1092 if (!(bg_flags & BG_IS_VALID))
1395 1108
1396void 1109void
1397rxvt_term::bg_init () 1110rxvt_term::bg_init ()
1398{ 1111{
1399#ifdef ENABLE_TRANSPARENCY 1112#ifdef ENABLE_TRANSPARENCY
1400 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1401 tint.set (this, c);
1402 shade = 100; 1113 shade = 100;
1403#endif 1114#endif
1404 1115
1405 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV); 1116 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV);
1406#if XRENDER 1117#if XRENDER
1419#endif 1130#endif
1420} 1131}
1421 1132
1422#endif /* HAVE_BG_PIXMAP */ 1133#endif /* HAVE_BG_PIXMAP */
1423 1134
1424#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1135#ifdef ENABLE_TRANSPARENCY
1425/* based on code from aterm-0.4.2 */ 1136/* based on code from aterm-0.4.2 */
1426 1137
1427static inline void 1138static inline void
1428fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high) 1139fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1429{ 1140{
1509 break; 1220 break;
1510 default: 1221 default:
1511 return; /* we do not support this color depth */ 1222 return; /* we do not support this color depth */
1512 } 1223 }
1513 1224
1514 rgba c; 1225 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1515 1226
1227 if (bg_flags & BG_TINT_SET)
1516 tint.get (c); 1228 tint.get (c);
1517 1229
1518 /* prepare limits for color transformation (each channel is handled separately) */ 1230 /* prepare limits for color transformation (each channel is handled separately) */
1519 if (shade > 100) 1231 if (shade > 100)
1520 { 1232 {
1521 c.r = c.r * (200 - shade) / 100; 1233 c.r = c.r * (200 - shade) / 100;
1574 } 1286 }
1575 } 1287 }
1576 1288
1577 free (lookup); 1289 free (lookup);
1578} 1290}
1579#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1291#endif /* ENABLE_TRANSPARENCY */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines