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.192 by sf-exg, Fri Dec 30 12:45:56 2011 UTC vs.
Revision 1.206 by sf-exg, Thu Apr 12 10:22:50 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;
168 int smaller = min (image_size, window_size);
169
170 if (align >= 0 && align <= 100) 128 if (align >= 0 && align <= 100)
171 return diff * align / 100; 129 return lerp (0, window_size - image_size, align);
172 else if (align > 100 && align <= 200) 130 else if (align > 100)
173 return (align - 100) * smaller / 100 + window_size - smaller; 131 return lerp (window_size - image_size, window_size, align - 100);
174 else if (align >= -100 && align < 0) 132 else
175 return (align + 100) * smaller / 100 - image_size; 133 return lerp (-image_size, 0, align + 100);
176 return 0;
177} 134}
178 135
179static inline int 136static inline int
180make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 137make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
181{ 138{
187 src_pos = -pos; 144 src_pos = -pos;
188 dst_pos = 0; 145 dst_pos = 0;
189 dst_size += pos; 146 dst_size += pos;
190 } 147 }
191 148
192 if (dst_pos + dst_size > target_size)
193 dst_size = target_size - dst_pos; 149 min_it (dst_size, target_size - dst_pos);
194 return src_pos; 150 return src_pos;
195} 151}
196 152
197bool 153bool
198rxvt_term::bg_set_geometry (const char *geom, bool update) 154rxvt_term::bg_set_geometry (const char *geom, bool update)
199{ 155{
200 bool changed = false; 156 bool changed = false;
201 int geom_flags = 0; 157 int geom_flags = 0;
202 int x = 0, y = 0; 158 int x = h_align;
159 int y = v_align;
203 unsigned int w = 0, h = 0; 160 unsigned int w = h_scale;
161 unsigned int h = v_scale;
204 unsigned long new_flags = 0; 162 unsigned long new_flags = 0;
205 163
206 if (geom == NULL) 164 if (geom == NULL)
207 return false; 165 return false;
208 166
317 w = h = defaultScale; 275 w = h = defaultScale;
318 else if (!(geom_flags & HeightValue)) 276 else if (!(geom_flags & HeightValue))
319 h = w; 277 h = w;
320 else if (!(geom_flags & WidthValue)) 278 else if (!(geom_flags & WidthValue))
321 w = h; 279 w = h;
322
323 geom_flags |= WidthValue|HeightValue|XValue|YValue;
324 } 280 }
325 281
326 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true; 282 min_it (w, 1000);
327 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true; 283 min_it (h, 1000);
328 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true; 284 clamp_it (x, -100, 200);
329 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true; 285 clamp_it (y, -100, 200);
330 286
331 if (new_flags != bg_flags) 287 if (bg_flags != new_flags
288 || h_scale != w
289 || v_scale != h
290 || h_align != x
291 || v_align != y)
332 { 292 {
333 bg_flags = new_flags; 293 bg_flags = new_flags;
294 h_scale = w;
295 v_scale = h;
296 h_align = x;
297 v_align = y;
334 changed = true; 298 changed = true;
335 } 299 }
336 300
337 return changed; 301 return changed;
338} 302}
366 { 330 {
367 x = make_align_position (h_align, target_width, w); 331 x = make_align_position (h_align, target_width, w);
368 y = make_align_position (v_align, target_height, h); 332 y = make_align_position (v_align, target_height, h);
369 } 333 }
370 334
371 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
372 if (!(bg_flags & BG_TILE) 335 if (!(bg_flags & BG_TILE)
373 || h_scale || v_scale 336 || h_scale || v_scale
374 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align)) 337 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
375 || w > target_width || h > target_height) 338 || image_width > target_width || image_height > target_height)
376 bg_flags |= BG_IS_SIZE_SENSITIVE; 339 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 340 else
460 { 341 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} 342}
612# endif /* HAVE_AFTERIMAGE */
613 343
614# ifdef HAVE_PIXBUF 344# ifdef HAVE_PIXBUF
615bool 345bool
616rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc, 346rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
617 int src_x, int src_y, int dst_x, int dst_y, 347 int src_x, int src_y, int dst_x, int dst_y,
694 XDestroyImage (ximage); 424 XDestroyImage (ximage);
695 return true; 425 return true;
696} 426}
697 427
698bool 428bool
699rxvt_term::render_image (unsigned long tr_flags) 429rxvt_term::render_image (bool transparent)
700{ 430{
701 if (!pixbuf) 431 if (!pixbuf)
702 return false; 432 return false;
703 433
704 if (tr_flags 434 if (transparent
705 && !(bg_flags & BG_HAS_RENDER)) 435 && !(bg_flags & BG_HAS_RENDER))
706 return false; 436 return false;
707 437
708 GdkPixbuf *result; 438 GdkPixbuf *result;
709 439
749 Pixmap root_pmap; 479 Pixmap root_pmap;
750 480
751 image_width = gdk_pixbuf_get_width (result); 481 image_width = gdk_pixbuf_get_width (result);
752 image_height = gdk_pixbuf_get_height (result); 482 image_height = gdk_pixbuf_get_height (result);
753 483
754 if (tr_flags) 484 if (transparent)
755 { 485 {
756 root_pmap = bg_pixmap; 486 root_pmap = bg_pixmap;
757 bg_pixmap = None; 487 bg_pixmap = None;
758 } 488 }
759 else 489 else
817 dst_x, dst_y, 547 dst_x, dst_y,
818 dst_width, dst_height); 548 dst_width, dst_height);
819 } 549 }
820 550
821#if XRENDER 551#if XRENDER
822 if (tr_flags) 552 if (transparent)
823 { 553 {
824 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 554 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
825 555
826 Picture src = XRenderCreatePicture (dpy, root_pmap, format, 0, 0); 556 Picture src = XRenderCreatePicture (dpy, root_pmap, format, 0, 0);
827 557
851 } 581 }
852 582
853 if (result != pixbuf) 583 if (result != pixbuf)
854 g_object_unref (result); 584 g_object_unref (result);
855 585
856 if (tr_flags) 586 if (transparent)
857 XFreePixmap (dpy, root_pmap); 587 XFreePixmap (dpy, root_pmap);
858 588
859 return ret; 589 return ret;
860} 590}
861# endif /* HAVE_PIXBUF */ 591# endif /* HAVE_PIXBUF */
876 memcpy (f, file, len); 606 memcpy (f, file, len);
877 f[len] = '\0'; 607 f[len] = '\0';
878 file = f; 608 file = f;
879 } 609 }
880 610
881# ifdef HAVE_AFTERIMAGE
882 if (!asimman)
883 asimman = create_generic_imageman (rs[Rs_path]);
884 ASImage *image = get_asimage (asimman, file, 0xFFFFFFFF, 100);
885 if (image)
886 {
887 if (original_asim)
888 safe_asimage_destroy (original_asim);
889 original_asim = image;
890 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
891 ret = true;
892 }
893# endif
894
895# ifdef HAVE_PIXBUF 611# ifdef HAVE_PIXBUF
896 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 612 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
897 if (image) 613 if (image)
898 { 614 {
899 if (pixbuf) 615 if (pixbuf)
956 { 672 {
957 changed = true; 673 changed = true;
958 v_blurRadius = vr; 674 v_blurRadius = vr;
959 } 675 }
960 676
961 if (v_blurRadius == 0 && h_blurRadius == 0) 677 if (h_blurRadius && v_blurRadius)
678 bg_flags |= BG_NEEDS_BLUR;
679 else
962 bg_flags &= ~BG_NEEDS_BLUR; 680 bg_flags &= ~BG_NEEDS_BLUR;
963 else
964 bg_flags |= BG_NEEDS_BLUR;
965 681
966 return changed; 682 return changed;
967} 683}
968 684
969void 685void
970rxvt_term::set_tint_shade_flags () 686rxvt_term::set_tint_shade_flags ()
971{ 687{
972 rgba c; 688 if (shade != 100 || (bg_flags & BG_TINT_SET))
973 bool has_shade = shade != 100;
974
975 bg_flags &= ~BG_TINT_FLAGS;
976
977 tint.get (c);
978
979 if (!has_shade
980 && (c.r <= 0x00ff || c.r >= 0xff00)
981 && (c.g <= 0x00ff || c.g >= 0xff00)
982 && (c.b <= 0x00ff || c.b >= 0xff00))
983 bg_flags |= BG_TINT_BITAND;
984
985 if (has_shade
986 || c.r < 0xff00
987 || c.g < 0xff00
988 || c.b < 0xff00)
989 bg_flags |= BG_NEEDS_TINT; 689 bg_flags |= BG_NEEDS_TINT;
690 else
691 bg_flags &= ~BG_NEEDS_TINT;
990} 692}
991 693
992bool 694bool
993rxvt_term::bg_set_tint (rxvt_color &new_tint) 695rxvt_term::bg_set_tint (rxvt_color &new_tint)
994{ 696{
995 if (tint != new_tint) 697 if (!(bg_flags & BG_TINT_SET) || tint != new_tint)
996 { 698 {
997 tint = new_tint; 699 tint = new_tint;
700 bg_flags |= BG_TINT_SET;
701
702 rgba c;
703 tint.get (c);
704 if ((c.r <= 0x00ff || c.r >= 0xff00)
705 && (c.g <= 0x00ff || c.g >= 0xff00)
706 && (c.b <= 0x00ff || c.b >= 0xff00))
707 bg_flags |= BG_TINT_BITAND;
708 else
709 bg_flags &= ~BG_TINT_BITAND;
710
998 set_tint_shade_flags (); 711 set_tint_shade_flags ();
999 return true; 712 return true;
1000 } 713 }
1001 714
1002 return false; 715 return false;
1043 params[i+2] = XDoubleToFixed (kernel[i] / sum); 756 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1044} 757}
1045#endif 758#endif
1046 759
1047bool 760bool
1048rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 761rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height, int depth)
1049{ 762{
1050 bool ret = false; 763 bool ret = false;
1051#if XRENDER 764#if XRENDER
1052 if (!(bg_flags & BG_HAS_RENDER_CONV)) 765 if (!(bg_flags & BG_HAS_RENDER_CONV))
1053 return false; 766 return false;
1054 767
1055 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 768 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1056 double *kernel = (double *)malloc (size * sizeof (double)); 769 double *kernel = (double *)malloc (size * sizeof (double));
1057 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 770 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1058 771
772 XRenderPictureAttributes pa;
1059 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 773 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1060 774
775 pa.repeat = RepeatPad;
1061 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, 0); 776 Picture src = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
777 Pixmap tmp = XCreatePixmap (dpy, pixmap, width, height, depth);
1062 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, 0); 778 Picture dst = XRenderCreatePicture (dpy, tmp, format, CPRepeat, &pa);
779 XFreePixmap (dpy, tmp);
1063 780
1064 if (kernel && params) 781 if (kernel && params)
1065 { 782 {
1066 if (h_blurRadius)
1067 {
1068 size = h_blurRadius * 2 + 1; 783 size = h_blurRadius * 2 + 1;
1069 get_gaussian_kernel (h_blurRadius, size, kernel, params); 784 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1070 785
1071 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 786 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1072 XRenderComposite (dpy, 787 XRenderComposite (dpy,
1073 PictOpSrc, 788 PictOpSrc,
1074 src, 789 src,
1075 None, 790 None,
1076 dst, 791 dst,
1077 0, 0, 792 0, 0,
1078 0, 0, 793 0, 0,
1079 0, 0, 794 0, 0,
1080 width, height); 795 width, height);
1081 }
1082 796
1083 if (v_blurRadius) 797 ::swap (src, dst);
1084 { 798
1085 size = v_blurRadius * 2 + 1; 799 size = v_blurRadius * 2 + 1;
1086 get_gaussian_kernel (v_blurRadius, size, kernel, params); 800 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1087 ::swap (params[0], params[1]); 801 ::swap (params[0], params[1]);
1088 802
1089 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 803 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1090 XRenderComposite (dpy, 804 XRenderComposite (dpy,
1091 PictOpSrc, 805 PictOpSrc,
1092 src, 806 src,
1093 None, 807 None,
1094 dst, 808 dst,
1095 0, 0, 809 0, 0,
1096 0, 0, 810 0, 0,
1097 0, 0, 811 0, 0,
1098 width, height); 812 width, height);
1099 }
1100 813
1101 ret = true; 814 ret = true;
1102 } 815 }
1103 816
1104 free (kernel); 817 free (kernel);
1112bool 825bool
1113rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 826rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1114{ 827{
1115 bool ret = false; 828 bool ret = false;
1116 829
1117 if (bg_flags & BG_TINT_BITAND) 830 if (shade == 100 && (bg_flags & BG_TINT_BITAND))
1118 { 831 {
1119 XGCValues gcv; 832 XGCValues gcv;
1120 GC gc; 833 GC gc;
1121 834
1122 /* In this case we can tint image server-side getting significant 835 /* In this case we can tint image server-side getting significant
1134 } 847 }
1135 } 848 }
1136# if XRENDER 849# if XRENDER
1137 else if (bg_flags & BG_HAS_RENDER) 850 else if (bg_flags & BG_HAS_RENDER)
1138 { 851 {
1139 rgba c; 852 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1140 853
854 if (bg_flags & BG_TINT_SET)
1141 tint.get (c); 855 tint.get (c);
1142 856
1143 if (shade <= 100) 857 if (shade <= 100)
1144 { 858 {
1145 c.r = c.r * shade / 100; 859 c.r = c.r * shade / 100;
1146 c.g = c.g * shade / 100; 860 c.g = c.g * shade / 100;
1202/* 916/*
1203 * Builds a pixmap of the same size as the terminal window that contains 917 * 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 918 * the tiled portion of the root pixmap that is supposed to be covered by
1205 * our window. 919 * our window.
1206 */ 920 */
1207unsigned long 921bool
1208rxvt_term::make_transparency_pixmap () 922rxvt_term::make_transparency_pixmap ()
1209{ 923{
1210 unsigned long result = 0; 924 bool ret = false;
1211 925
1212 /* root dimensions may change from call to call - but Display structure should 926 /* root dimensions may change from call to call - but Display structure should
1213 * be always up-to-date, so let's use it : 927 * be always up-to-date, so let's use it :
1214 */ 928 */
1215 int screen = display->screen; 929 int screen = display->screen;
1296 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1010 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1297 1011
1298 if (gc) 1012 if (gc)
1299 { 1013 {
1300 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height); 1014 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1301 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1015 ret = true;
1016 unsigned long tr_flags = bg_flags & BG_EFFECTS_FLAGS;
1302 1017
1303 if (!(bg_flags & BG_CLIENT_RENDER)) 1018 if (!(bg_flags & BG_CLIENT_RENDER))
1304 { 1019 {
1305 if (bg_flags & BG_NEEDS_BLUR) 1020 if (bg_flags & BG_NEEDS_BLUR)
1306 { 1021 {
1307 if (blur_pixmap (bg_pixmap, visual, window_width, window_height)) 1022 if (blur_pixmap (bg_pixmap, visual, window_width, window_height, depth))
1308 result &= ~BG_NEEDS_BLUR; 1023 tr_flags &= ~BG_NEEDS_BLUR;
1309 } 1024 }
1310 if (bg_flags & BG_NEEDS_TINT) 1025 if (bg_flags & BG_NEEDS_TINT)
1311 { 1026 {
1312 if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) 1027 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1313 result &= ~BG_NEEDS_TINT; 1028 tr_flags &= ~BG_NEEDS_TINT;
1314 } 1029 }
1315# ifndef HAVE_AFTERIMAGE
1316 if (result & BG_NEEDS_TINT) 1030 if (tr_flags & BG_NEEDS_TINT)
1317 { 1031 {
1318 XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap); 1032 XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1319 if (ximage) 1033 if (ximage)
1320 { 1034 {
1321 /* our own client-side tinting */ 1035 /* our own client-side tinting */
1323 1037
1324 XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height); 1038 XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height);
1325 XDestroyImage (ximage); 1039 XDestroyImage (ximage);
1326 } 1040 }
1327 } 1041 }
1328# endif
1329 } /* server side rendering completed */ 1042 } /* server side rendering completed */
1330 1043
1331 XFreeGC (dpy, gc); 1044 XFreeGC (dpy, gc);
1332 } 1045 }
1333 1046
1334 if (recoded_root_pmap != root_pixmap) 1047 if (recoded_root_pmap != root_pixmap)
1335 XFreePixmap (dpy, recoded_root_pmap); 1048 XFreePixmap (dpy, recoded_root_pmap);
1336 1049
1337 return result; 1050 return ret;
1338} 1051}
1339 1052
1340void 1053void
1341rxvt_term::bg_set_root_pixmap () 1054rxvt_term::bg_set_root_pixmap ()
1342{ 1055{
1349# endif /* ENABLE_TRANSPARENCY */ 1062# endif /* ENABLE_TRANSPARENCY */
1350 1063
1351bool 1064bool
1352rxvt_term::bg_render () 1065rxvt_term::bg_render ()
1353{ 1066{
1354 unsigned long tr_flags = 0; 1067 bool transparent = false;
1355 1068
1356 bg_invalidate (); 1069 bg_invalidate ();
1357# ifdef ENABLE_TRANSPARENCY 1070# ifdef ENABLE_TRANSPARENCY
1358 if (bg_flags & BG_IS_TRANSPARENT) 1071 if (bg_flags & BG_IS_TRANSPARENT)
1359 { 1072 {
1360 /* we need to re-generate transparency pixmap in that case ! */ 1073 /* we need to re-generate transparency pixmap in that case ! */
1361 tr_flags = make_transparency_pixmap (); 1074 transparent = make_transparency_pixmap ();
1362 if (tr_flags == 0) 1075 if (transparent)
1363 return false;
1364 bg_flags |= BG_IS_VALID; 1076 bg_flags |= BG_IS_VALID;
1365 } 1077 }
1366# endif 1078# endif
1367 1079
1368# ifdef BG_IMAGE_FROM_FILE 1080# ifdef BG_IMAGE_FROM_FILE
1369 if ((bg_flags & BG_IS_FROM_FILE) 1081 if (bg_flags & BG_IS_FROM_FILE)
1370 || (tr_flags & BG_EFFECTS_FLAGS))
1371 { 1082 {
1372 if (render_image (tr_flags)) 1083 if (render_image (transparent))
1373 bg_flags |= BG_IS_VALID; 1084 bg_flags |= BG_IS_VALID;
1374 } 1085 }
1375# endif 1086# endif
1376 1087
1377 if (!(bg_flags & BG_IS_VALID)) 1088 if (!(bg_flags & BG_IS_VALID))
1393 1104
1394void 1105void
1395rxvt_term::bg_init () 1106rxvt_term::bg_init ()
1396{ 1107{
1397#ifdef ENABLE_TRANSPARENCY 1108#ifdef ENABLE_TRANSPARENCY
1398 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1399 tint.set (this, c);
1400 shade = 100; 1109 shade = 100;
1401#endif 1110#endif
1402 1111
1403 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV); 1112 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV);
1404#if XRENDER 1113#if XRENDER
1417#endif 1126#endif
1418} 1127}
1419 1128
1420#endif /* HAVE_BG_PIXMAP */ 1129#endif /* HAVE_BG_PIXMAP */
1421 1130
1422#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1131#ifdef ENABLE_TRANSPARENCY
1423/* based on code from aterm-0.4.2 */ 1132/* based on code from aterm-0.4.2 */
1424 1133
1425static inline void 1134static inline void
1426fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high) 1135fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1427{ 1136{
1507 break; 1216 break;
1508 default: 1217 default:
1509 return; /* we do not support this color depth */ 1218 return; /* we do not support this color depth */
1510 } 1219 }
1511 1220
1512 rgba c; 1221 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1513 1222
1223 if (bg_flags & BG_TINT_SET)
1514 tint.get (c); 1224 tint.get (c);
1515 1225
1516 /* prepare limits for color transformation (each channel is handled separately) */ 1226 /* prepare limits for color transformation (each channel is handled separately) */
1517 if (shade > 100) 1227 if (shade > 100)
1518 { 1228 {
1519 c.r = c.r * (200 - shade) / 100; 1229 c.r = c.r * (200 - shade) / 100;
1572 } 1282 }
1573 } 1283 }
1574 1284
1575 free (lookup); 1285 free (lookup);
1576} 1286}
1577#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1287#endif /* ENABLE_TRANSPARENCY */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines