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.195 by sf-exg, Mon Jan 2 19:31:00 2012 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>
… …
58# endif 58# endif
59 59
60void 60void
61rxvt_term::bg_destroy () 61rxvt_term::bg_destroy ()
62{ 62{
63#ifdef HAVE_AFTERIMAGE
64 if (original_asim)
65 safe_asimage_destroy (original_asim);
66 if (asv)
67 destroy_asvisual (asv, 0);
68 if (asimman)
69 destroy_image_manager (asimman, 0);
70#endif
71
72#ifdef HAVE_PIXBUF 63#ifdef HAVE_PIXBUF
73 if (pixbuf) 64 if (pixbuf)
74 g_object_unref (pixbuf); 65 g_object_unref (pixbuf);
75#endif 66#endif
76 67
… …
129 120
130 return false; 121 return false;
131} 122}
132 123
133# ifdef BG_IMAGE_FROM_FILE 124# ifdef BG_IMAGE_FROM_FILE
134static inline bool
135check_set_scale_value (int geom_flags, int flag, unsigned int &scale, unsigned int new_value)
136{
137 if (geom_flags & flag)
138 {
139 if (new_value > 1000)
140 new_value = 1000;
141 if (new_value != scale)
142 {
143 scale = new_value;
144 return true;
145 }
146 }
147 return false;
148}
149
150static inline bool
151check_set_align_value (int geom_flags, int flag, int &align, int new_value)
152{
153 if (geom_flags & flag)
154 {
155 if (new_value < -100)
156 new_value = -100;
157 else if (new_value > 200)
158 new_value = 200;
159 if (new_value != align)
160 {
161 align = new_value;
162 return true;
163 }
164 }
165 return false;
166}
167
168static inline int 125static inline int
169make_align_position (int align, int window_size, int image_size) 126make_align_position (int align, int window_size, int image_size)
170{ 127{
171 int diff = window_size - image_size;
172 int smaller = min (image_size, window_size);
173
174 if (align >= 0 && align <= 100) 128 if (align >= 0 && align <= 100)
175 return diff * align / 100; 129 return lerp (0, window_size - image_size, align);
176 else if (align > 100 && align <= 200) 130 else if (align > 100)
177 return (align - 100) * smaller / 100 + window_size - smaller; 131 return lerp (window_size - image_size, window_size, align - 100);
178 else if (align >= -100 && align < 0) 132 else
179 return (align + 100) * smaller / 100 - image_size; 133 return lerp (-image_size, 0, align + 100);
180 return 0;
181} 134}
182 135
183static inline int 136static inline int
184make_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)
185{ 138{
… …
191 src_pos = -pos; 144 src_pos = -pos;
192 dst_pos = 0; 145 dst_pos = 0;
193 dst_size += pos; 146 dst_size += pos;
194 } 147 }
195 148
196 if (dst_pos + dst_size > target_size)
197 dst_size = target_size - dst_pos; 149 min_it (dst_size, target_size - dst_pos);
198 return src_pos; 150 return src_pos;
199} 151}
200 152
201bool 153bool
202rxvt_term::bg_set_geometry (const char *geom, bool update) 154rxvt_term::bg_set_geometry (const char *geom, bool update)
203{ 155{
204 bool changed = false; 156 bool changed = false;
205 int geom_flags = 0; 157 int geom_flags = 0;
206 int x = 0, y = 0; 158 int x = h_align;
159 int y = v_align;
207 unsigned int w = 0, h = 0; 160 unsigned int w = h_scale;
161 unsigned int h = v_scale;
208 unsigned long new_flags = 0; 162 unsigned long new_flags = 0;
209 163
210 if (geom == NULL) 164 if (geom == NULL)
211 return false; 165 return false;
212 166
… …
321 w = h = defaultScale; 275 w = h = defaultScale;
322 else if (!(geom_flags & HeightValue)) 276 else if (!(geom_flags & HeightValue))
323 h = w; 277 h = w;
324 else if (!(geom_flags & WidthValue)) 278 else if (!(geom_flags & WidthValue))
325 w = h; 279 w = h;
326
327 geom_flags |= WidthValue|HeightValue|XValue|YValue;
328 } 280 }
329 281
330 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true; 282 min_it (w, 1000);
331 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true; 283 min_it (h, 1000);
332 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true; 284 clamp_it (x, -100, 200);
333 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true; 285 clamp_it (y, -100, 200);
334 286
335 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)
336 { 292 {
337 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;
338 changed = true; 298 changed = true;
339 } 299 }
340 300
341 return changed; 301 return changed;
342} 302}
… …
370 { 330 {
371 x = make_align_position (h_align, target_width, w); 331 x = make_align_position (h_align, target_width, w);
372 y = make_align_position (v_align, target_height, h); 332 y = make_align_position (v_align, target_height, h);
373 } 333 }
374 334
375 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
376 if (!(bg_flags & BG_TILE) 335 if (!(bg_flags & BG_TILE)
377 || h_scale || v_scale 336 || h_scale || v_scale
378 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align)) 337 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
379 || w > target_width || h > target_height) 338 || image_width > target_width || image_height > target_height)
380 bg_flags |= BG_IS_SIZE_SENSITIVE; 339 bg_flags |= BG_IS_SIZE_SENSITIVE;
381}
382
383# ifdef HAVE_AFTERIMAGE
384bool
385rxvt_term::render_image (unsigned long tr_flags)
386{
387 init_asv ();
388
389 ASImage *background = NULL;
390 ARGB32 background_tint = TINT_LEAVE_SAME;
391
392# ifdef ENABLE_TRANSPARENCY
393 if (tr_flags)
394 background = pixmap2ximage (asv, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, 100);
395
396 if (tr_flags & BG_NEEDS_TINT)
397 {
398 ShadingInfo as_shade;
399 as_shade.shading = shade;
400
401 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
402 if (bg_flags & BG_TINT_SET)
403 tint.get (c);
404 as_shade.tintColor.red = c.r;
405 as_shade.tintColor.green = c.g;
406 as_shade.tintColor.blue = c.b;
407
408 background_tint = shading2tint32 (&as_shade);
409 }
410
411 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
412 {
413 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
414 ASA_XImage,
415 100, ASIMAGE_QUALITY_DEFAULT);
416 if (tmp)
417 {
418 destroy_asimage (&background);
419 background = tmp;
420 }
421 }
422# endif
423
424 ASImage *result = 0;
425
426 int target_width = szHint.width;
427 int target_height = szHint.height;
428 int new_pmap_width = target_width;
429 int new_pmap_height = target_height;
430
431 int x = 0;
432 int y = 0;
433 int w = 0;
434 int h = 0;
435
436 if (original_asim)
437 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
438
439 if (!original_asim
440 || (!(bg_flags & BG_ROOT_ALIGN)
441 && (x >= target_width
442 || y >= target_height
443 || x + w <= 0
444 || y + h <= 0)))
445 {
446 if (background)
447 {
448 new_pmap_width = background->width;
449 new_pmap_height = background->height;
450 result = background;
451
452 if (background_tint != TINT_LEAVE_SAME)
453 {
454 ASImage *tmp = tile_asimage (asv, background, 0, 0,
455 target_width, target_height, background_tint,
456 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
457 if (tmp)
458 result = tmp;
459 }
460 }
461 else
462 new_pmap_width = new_pmap_height = 0;
463 }
464 else 340 else
465 { 341 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
466 result = original_asim;
467
468 if (w != original_asim->width
469 || h != original_asim->height)
470 {
471 result = scale_asimage (asv, original_asim,
472 w, h,
473 ASA_XImage,
474 100, ASIMAGE_QUALITY_DEFAULT);
475 }
476
477 if (background == NULL)
478 {
479 if (bg_flags & BG_TILE)
480 {
481 /* if tiling - pixmap has to be sized exactly as the image,
482 but there is no need to make it bigger than the window! */
483 new_pmap_width = min (result->width, target_width);
484 new_pmap_height = min (result->height, target_height);
485
486 /* we also need to tile our image in both directions */
487 ASImage *tmp = tile_asimage (asv, result,
488 (int)result->width - x,
489 (int)result->height - y,
490 new_pmap_width,
491 new_pmap_height,
492 TINT_LEAVE_SAME, ASA_XImage,
493 100, ASIMAGE_QUALITY_DEFAULT);
494 if (tmp)
495 {
496 if (result != original_asim)
497 destroy_asimage (&result);
498
499 result = tmp;
500 }
501 }
502 }
503 else
504 {
505 /* if blending background and image - pixmap has to be sized same as target window */
506 ASImageLayer *layers = create_image_layers (2);
507
508 layers[0].im = background;
509 layers[0].clip_width = target_width;
510 layers[0].clip_height = target_height;
511 layers[0].tint = background_tint;
512 layers[1].im = result;
513
514 if (bg_flags & BG_TILE)
515 {
516 /* tile horizontally */
517 while (x > 0) x -= (int)result->width;
518 layers[1].dst_x = x;
519 layers[1].clip_width = result->width+target_width;
520 }
521 else
522 {
523 /* clip horizontally */
524 layers[1].dst_x = x;
525 layers[1].clip_width = result->width;
526 }
527
528 if (bg_flags & BG_TILE)
529 {
530 while (y > 0) y -= (int)result->height;
531 layers[1].dst_y = y;
532 layers[1].clip_height = result->height + target_height;
533 }
534 else
535 {
536 layers[1].dst_y = y;
537 layers[1].clip_height = result->height;
538 }
539
540 if (rs[Rs_blendtype])
541 {
542 layers[1].merge_scanlines = blend_scanlines_name2func (rs[Rs_blendtype]);
543 if (layers[1].merge_scanlines == NULL)
544 layers[1].merge_scanlines = alphablend_scanlines;
545 }
546
547 ASImage *tmp = merge_layers (asv, layers, 2, target_width, target_height,
548 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
549
550 if (tmp)
551 {
552 if (result != original_asim)
553 destroy_asimage (&result);
554
555 result = tmp;
556 }
557
558 free (layers);
559 }
560 }
561
562 bool ret = false;
563
564 if (result)
565 {
566 XGCValues gcv;
567 GC gc;
568
569 /* create Pixmap */
570 if (bg_pixmap == None
571 || bg_pmap_width != new_pmap_width
572 || bg_pmap_height != new_pmap_height)
573 {
574 if (bg_pixmap)
575 XFreePixmap (dpy, bg_pixmap);
576 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
577 bg_pmap_width = new_pmap_width;
578 bg_pmap_height = new_pmap_height;
579 }
580 /* fill with background color (if result's not completely overlapping it) */
581 gcv.foreground = pix_colors[Color_bg];
582 gc = XCreateGC (dpy, vt, GCForeground, &gcv);
583
584 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
585 int dst_width = result->width, dst_height = result->height;
586 if (background == NULL)
587 {
588 if (!(bg_flags & BG_TILE))
589 {
590 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
591 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
592 }
593
594 if (dst_x > 0 || dst_y > 0
595 || dst_x + dst_width < new_pmap_width
596 || dst_y + dst_height < new_pmap_height)
597 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
598 }
599
600 /* put result on pixmap */
601 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
602 asimage2drawable (asv, bg_pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
603
604 if (result != background && result != original_asim)
605 destroy_asimage (&result);
606
607 XFreeGC (dpy, gc);
608
609 ret = true;
610 }
611
612 if (background)
613 destroy_asimage (&background);
614
615 return ret;
616} 342}
617# endif /* HAVE_AFTERIMAGE */
618 343
619# ifdef HAVE_PIXBUF 344# ifdef HAVE_PIXBUF
620bool 345bool
621rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc, 346rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
622 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,
… …
699 XDestroyImage (ximage); 424 XDestroyImage (ximage);
700 return true; 425 return true;
701} 426}
702 427
703bool 428bool
704rxvt_term::render_image (unsigned long tr_flags) 429rxvt_term::render_image (bool transparent)
705{ 430{
706 if (!pixbuf) 431 if (!pixbuf)
707 return false; 432 return false;
708 433
709 if (tr_flags 434 if (transparent
710 && !(bg_flags & BG_HAS_RENDER)) 435 && !(bg_flags & BG_HAS_RENDER))
711 return false; 436 return false;
712 437
713 GdkPixbuf *result; 438 GdkPixbuf *result;
714 439
… …
754 Pixmap root_pmap; 479 Pixmap root_pmap;
755 480
756 image_width = gdk_pixbuf_get_width (result); 481 image_width = gdk_pixbuf_get_width (result);
757 image_height = gdk_pixbuf_get_height (result); 482 image_height = gdk_pixbuf_get_height (result);
758 483
759 if (tr_flags) 484 if (transparent)
760 { 485 {
761 root_pmap = bg_pixmap; 486 root_pmap = bg_pixmap;
762 bg_pixmap = None; 487 bg_pixmap = None;
763 } 488 }
764 else 489 else
… …
822 dst_x, dst_y, 547 dst_x, dst_y,
823 dst_width, dst_height); 548 dst_width, dst_height);
824 } 549 }
825 550
826#if XRENDER 551#if XRENDER
827 if (tr_flags) 552 if (transparent)
828 { 553 {
829 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 554 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
830 555
831 Picture src = XRenderCreatePicture (dpy, root_pmap, format, 0, 0); 556 Picture src = XRenderCreatePicture (dpy, root_pmap, format, 0, 0);
832 557
… …
856 } 581 }
857 582
858 if (result != pixbuf) 583 if (result != pixbuf)
859 g_object_unref (result); 584 g_object_unref (result);
860 585
861 if (tr_flags) 586 if (transparent)
862 XFreePixmap (dpy, root_pmap); 587 XFreePixmap (dpy, root_pmap);
863 588
864 return ret; 589 return ret;
865} 590}
866# endif /* HAVE_PIXBUF */ 591# endif /* HAVE_PIXBUF */
… …
881 memcpy (f, file, len); 606 memcpy (f, file, len);
882 f[len] = '\0'; 607 f[len] = '\0';
883 file = f; 608 file = f;
884 } 609 }
885 610
886# ifdef HAVE_AFTERIMAGE
887 if (!asimman)
888 asimman = create_generic_imageman (rs[Rs_path]);
889 ASImage *image = get_asimage (asimman, file, 0xFFFFFFFF, 100);
890 if (image)
891 {
892 if (original_asim)
893 safe_asimage_destroy (original_asim);
894 original_asim = image;
895 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
896 ret = true;
897 }
898# endif
899
900# ifdef HAVE_PIXBUF 611# ifdef HAVE_PIXBUF
901 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 612 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
902 if (image) 613 if (image)
903 { 614 {
904 if (pixbuf) 615 if (pixbuf)
… …
961 { 672 {
962 changed = true; 673 changed = true;
963 v_blurRadius = vr; 674 v_blurRadius = vr;
964 } 675 }
965 676
966 if (h_blurRadius == 0 || v_blurRadius == 0) 677 if (h_blurRadius && v_blurRadius)
678 bg_flags |= BG_NEEDS_BLUR;
679 else
967 bg_flags &= ~BG_NEEDS_BLUR; 680 bg_flags &= ~BG_NEEDS_BLUR;
968 else
969 bg_flags |= BG_NEEDS_BLUR;
970 681
971 return changed; 682 return changed;
972} 683}
973 684
974void 685void
975rxvt_term::set_tint_shade_flags () 686rxvt_term::set_tint_shade_flags ()
976{ 687{
688 if (shade != 100 || (bg_flags & BG_TINT_SET))
689 bg_flags |= BG_NEEDS_TINT;
690 else
691 bg_flags &= ~BG_NEEDS_TINT;
692}
693
694bool
695rxvt_term::bg_set_tint (rxvt_color &new_tint)
696{
697 if (!(bg_flags & BG_TINT_SET) || tint != new_tint)
698 {
699 tint = new_tint;
700 bg_flags |= BG_TINT_SET;
701
977 rgba c; 702 rgba c;
978 bool has_shade = shade != 100;
979
980 bg_flags &= ~BG_TINT_FLAGS;
981
982 if (bg_flags & BG_TINT_SET)
983 {
984 tint.get (c); 703 tint.get (c);
985 if (!has_shade
986 && (c.r <= 0x00ff || c.r >= 0xff00) 704 if ((c.r <= 0x00ff || c.r >= 0xff00)
987 && (c.g <= 0x00ff || c.g >= 0xff00) 705 && (c.g <= 0x00ff || c.g >= 0xff00)
988 && (c.b <= 0x00ff || c.b >= 0xff00)) 706 && (c.b <= 0x00ff || c.b >= 0xff00))
989 bg_flags |= BG_TINT_BITAND; 707 bg_flags |= BG_TINT_BITAND;
990 } 708 else
991
992 if (has_shade || (bg_flags & BG_TINT_SET))
993 bg_flags |= BG_NEEDS_TINT;
994}
995
996bool
997rxvt_term::bg_set_tint (rxvt_color &new_tint)
998{
999 if (!(bg_flags & BG_TINT_SET) || tint != new_tint)
1000 {
1001 tint = new_tint;
1002 bg_flags |= BG_TINT_SET; 709 bg_flags &= ~BG_TINT_BITAND;
710
1003 set_tint_shade_flags (); 711 set_tint_shade_flags ();
1004 return true; 712 return true;
1005 } 713 }
1006 714
1007 return false; 715 return false;
… …
1048 params[i+2] = XDoubleToFixed (kernel[i] / sum); 756 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1049} 757}
1050#endif 758#endif
1051 759
1052bool 760bool
1053rxvt_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)
1054{ 762{
1055 bool ret = false; 763 bool ret = false;
1056#if XRENDER 764#if XRENDER
1057 if (!(bg_flags & BG_HAS_RENDER_CONV)) 765 if (!(bg_flags & BG_HAS_RENDER_CONV))
1058 return false; 766 return false;
… …
1064 XRenderPictureAttributes pa; 772 XRenderPictureAttributes pa;
1065 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 773 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1066 774
1067 pa.repeat = RepeatPad; 775 pa.repeat = RepeatPad;
1068 Picture src = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa); 776 Picture src = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
777 Pixmap tmp = XCreatePixmap (dpy, pixmap, width, height, depth);
1069 Picture dst = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa); 778 Picture dst = XRenderCreatePicture (dpy, tmp, format, CPRepeat, &pa);
779 XFreePixmap (dpy, tmp);
1070 780
1071 if (kernel && params) 781 if (kernel && params)
1072 { 782 {
1073 size = h_blurRadius * 2 + 1; 783 size = h_blurRadius * 2 + 1;
1074 get_gaussian_kernel (h_blurRadius, size, kernel, params); 784 get_gaussian_kernel (h_blurRadius, size, kernel, params);
… …
1082 0, 0, 792 0, 0,
1083 0, 0, 793 0, 0,
1084 0, 0, 794 0, 0,
1085 width, height); 795 width, height);
1086 796
797 ::swap (src, dst);
798
1087 size = v_blurRadius * 2 + 1; 799 size = v_blurRadius * 2 + 1;
1088 get_gaussian_kernel (v_blurRadius, size, kernel, params); 800 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1089 ::swap (params[0], params[1]); 801 ::swap (params[0], params[1]);
1090 802
1091 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 803 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
… …
1113bool 825bool
1114rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 826rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1115{ 827{
1116 bool ret = false; 828 bool ret = false;
1117 829
1118 if (bg_flags & BG_TINT_BITAND) 830 if (shade == 100 && (bg_flags & BG_TINT_BITAND))
1119 { 831 {
1120 XGCValues gcv; 832 XGCValues gcv;
1121 GC gc; 833 GC gc;
1122 834
1123 /* In this case we can tint image server-side getting significant 835 /* In this case we can tint image server-side getting significant
… …
1204/* 916/*
1205 * 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
1206 * 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
1207 * our window. 919 * our window.
1208 */ 920 */
1209unsigned long 921bool
1210rxvt_term::make_transparency_pixmap () 922rxvt_term::make_transparency_pixmap ()
1211{ 923{
1212 unsigned long result = 0; 924 bool ret = false;
1213 925
1214 /* 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
1215 * be always up-to-date, so let's use it : 927 * be always up-to-date, so let's use it :
1216 */ 928 */
1217 int screen = display->screen; 929 int screen = display->screen;
… …
1298 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1010 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1299 1011
1300 if (gc) 1012 if (gc)
1301 { 1013 {
1302 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height); 1014 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1303 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1015 ret = true;
1016 unsigned long tr_flags = bg_flags & BG_EFFECTS_FLAGS;
1304 1017
1305 if (!(bg_flags & BG_CLIENT_RENDER)) 1018 if (!(bg_flags & BG_CLIENT_RENDER))
1306 { 1019 {
1307 if (bg_flags & BG_NEEDS_BLUR) 1020 if (bg_flags & BG_NEEDS_BLUR)
1308 { 1021 {
1309 if (blur_pixmap (bg_pixmap, visual, window_width, window_height)) 1022 if (blur_pixmap (bg_pixmap, visual, window_width, window_height, depth))
1310 result &= ~BG_NEEDS_BLUR; 1023 tr_flags &= ~BG_NEEDS_BLUR;
1311 } 1024 }
1312 if (bg_flags & BG_NEEDS_TINT) 1025 if (bg_flags & BG_NEEDS_TINT)
1313 { 1026 {
1314 if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) 1027 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1315 result &= ~BG_NEEDS_TINT; 1028 tr_flags &= ~BG_NEEDS_TINT;
1316 } 1029 }
1317# ifndef HAVE_AFTERIMAGE
1318 if (result & BG_NEEDS_TINT) 1030 if (tr_flags & BG_NEEDS_TINT)
1319 { 1031 {
1320 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);
1321 if (ximage) 1033 if (ximage)
1322 { 1034 {
1323 /* our own client-side tinting */ 1035 /* our own client-side tinting */
… …
1325 1037
1326 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);
1327 XDestroyImage (ximage); 1039 XDestroyImage (ximage);
1328 } 1040 }
1329 } 1041 }
1330# endif
1331 } /* server side rendering completed */ 1042 } /* server side rendering completed */
1332 1043
1333 XFreeGC (dpy, gc); 1044 XFreeGC (dpy, gc);
1334 } 1045 }
1335 1046
1336 if (recoded_root_pmap != root_pixmap) 1047 if (recoded_root_pmap != root_pixmap)
1337 XFreePixmap (dpy, recoded_root_pmap); 1048 XFreePixmap (dpy, recoded_root_pmap);
1338 1049
1339 return result; 1050 return ret;
1340} 1051}
1341 1052
1342void 1053void
1343rxvt_term::bg_set_root_pixmap () 1054rxvt_term::bg_set_root_pixmap ()
1344{ 1055{
… …
1351# endif /* ENABLE_TRANSPARENCY */ 1062# endif /* ENABLE_TRANSPARENCY */
1352 1063
1353bool 1064bool
1354rxvt_term::bg_render () 1065rxvt_term::bg_render ()
1355{ 1066{
1356 unsigned long tr_flags = 0; 1067 bool transparent = false;
1357 1068
1358 bg_invalidate (); 1069 bg_invalidate ();
1359# ifdef ENABLE_TRANSPARENCY 1070# ifdef ENABLE_TRANSPARENCY
1360 if (bg_flags & BG_IS_TRANSPARENT) 1071 if (bg_flags & BG_IS_TRANSPARENT)
1361 { 1072 {
1362 /* we need to re-generate transparency pixmap in that case ! */ 1073 /* we need to re-generate transparency pixmap in that case ! */
1363 tr_flags = make_transparency_pixmap (); 1074 transparent = make_transparency_pixmap ();
1364 if (tr_flags == 0) 1075 if (transparent)
1365 return false;
1366 bg_flags |= BG_IS_VALID; 1076 bg_flags |= BG_IS_VALID;
1367 } 1077 }
1368# endif 1078# endif
1369 1079
1370# ifdef BG_IMAGE_FROM_FILE 1080# ifdef BG_IMAGE_FROM_FILE
1371 if ((bg_flags & BG_IS_FROM_FILE) 1081 if (bg_flags & BG_IS_FROM_FILE)
1372 || (tr_flags & BG_EFFECTS_FLAGS))
1373 { 1082 {
1374 if (render_image (tr_flags)) 1083 if (render_image (transparent))
1375 bg_flags |= BG_IS_VALID; 1084 bg_flags |= BG_IS_VALID;
1376 } 1085 }
1377# endif 1086# endif
1378 1087
1379 if (!(bg_flags & BG_IS_VALID)) 1088 if (!(bg_flags & BG_IS_VALID))
… …
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{
… …
1573 } 1282 }
1574 } 1283 }
1575 1284
1576 free (lookup); 1285 free (lookup);
1577} 1286}
1578#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1287#endif /* ENABLE_TRANSPARENCY */

Diff Legend

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