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.207 by sf-exg, Thu May 10 21:48:55 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,
618 unsigned int width, unsigned int height) 348 unsigned int width, unsigned int height)
619{ 349{
620 XImage *ximage; 350 XImage *ximage;
621 char *data, *line; 351 char *data, *line;
622 int bytes_per_pixel; 352 int bytes_per_pixel;
623 int width_r, width_g, width_b; 353 int width_r, width_g, width_b, width_a;
624 int sh_r, sh_g, sh_b; 354 int sh_r, sh_g, sh_b, sh_a;
355 uint32_t alpha_mask;
625 int rowstride; 356 int rowstride;
626 int channels; 357 int channels;
627 unsigned char *row; 358 unsigned char *row;
628 359
629 if (visual->c_class != TrueColor) 360 if (visual->c_class != TrueColor)
630 return false; 361 return false;
362
363#if XRENDER
364 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
365 if (format)
366 alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha;
367 else
368#endif
369 alpha_mask = 0;
631 370
632 if (depth == 24 || depth == 32) 371 if (depth == 24 || depth == 32)
633 bytes_per_pixel = 4; 372 bytes_per_pixel = 4;
634 else if (depth == 15 || depth == 16) 373 else if (depth == 15 || depth == 16)
635 bytes_per_pixel = 2; 374 bytes_per_pixel = 2;
637 return false; 376 return false;
638 377
639 width_r = ecb_popcount32 (visual->red_mask); 378 width_r = ecb_popcount32 (visual->red_mask);
640 width_g = ecb_popcount32 (visual->green_mask); 379 width_g = ecb_popcount32 (visual->green_mask);
641 width_b = ecb_popcount32 (visual->blue_mask); 380 width_b = ecb_popcount32 (visual->blue_mask);
381 width_a = ecb_popcount32 (alpha_mask);
642 382
643 if (width_r > 8 || width_g > 8 || width_b > 8) 383 if (width_r > 8 || width_g > 8 || width_b > 8 || width_a > 8)
644 return false; 384 return false;
645 385
646 sh_r = ecb_ctz32 (visual->red_mask); 386 sh_r = ecb_ctz32 (visual->red_mask);
647 sh_g = ecb_ctz32 (visual->green_mask); 387 sh_g = ecb_ctz32 (visual->green_mask);
648 sh_b = ecb_ctz32 (visual->blue_mask); 388 sh_b = ecb_ctz32 (visual->blue_mask);
389 sh_a = ecb_ctz32 (alpha_mask);
649 390
650 if (width > INT_MAX / height / bytes_per_pixel) 391 if (width > INT_MAX / height / bytes_per_pixel)
651 return false; 392 return false;
652 393
653 data = (char *)malloc (width * height * bytes_per_pixel); 394 data = (char *)malloc (width * height * bytes_per_pixel);
667 rowstride = gdk_pixbuf_get_rowstride (pixbuf); 408 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
668 channels = gdk_pixbuf_get_n_channels (pixbuf); 409 channels = gdk_pixbuf_get_n_channels (pixbuf);
669 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels; 410 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
670 line = data; 411 line = data;
671 412
413 rgba c (0, 0, 0);
414
415 if (channels == 4 && alpha_mask == 0)
416 {
417 pix_colors[Color_bg].get (c);
418 c.r >>= 8;
419 c.g >>= 8;
420 c.b >>= 8;
421 }
422
672 for (int y = 0; y < height; y++) 423 for (int y = 0; y < height; y++)
673 { 424 {
674 for (int x = 0; x < width; x++) 425 for (int x = 0; x < width; x++)
675 { 426 {
676 unsigned char *pixel = row + x * channels; 427 unsigned char *pixel = row + x * channels;
677 uint32_t value; 428 uint32_t value;
429 unsigned char r, g, b, a;
678 430
431 if (channels == 4)
432 {
433 a = pixel[3];
434 r = (pixel[0] * a + c.r * (0xff - a)) / 0xff;
435 g = (pixel[1] * a + c.g * (0xff - a)) / 0xff;
436 b = (pixel[2] * a + c.b * (0xff - a)) / 0xff;
437 }
438 else
439 {
440 a = 0xff;
441 r = pixel[0];
442 g = pixel[1];
443 b = pixel[2];
444 }
445
679 value = ((pixel[0] >> (8 - width_r)) << sh_r) 446 value = ((r >> (8 - width_r)) << sh_r)
680 | ((pixel[1] >> (8 - width_g)) << sh_g) 447 | ((g >> (8 - width_g)) << sh_g)
681 | ((pixel[2] >> (8 - width_b)) << sh_b); 448 | ((b >> (8 - width_b)) << sh_b)
449 | ((a >> (8 - width_a)) << sh_a);
682 450
683 if (bytes_per_pixel == 4) 451 if (bytes_per_pixel == 4)
684 ((uint32_t *)line)[x] = value; 452 ((uint32_t *)line)[x] = value;
685 else 453 else
686 ((uint16_t *)line)[x] = value; 454 ((uint16_t *)line)[x] = value;
694 XDestroyImage (ximage); 462 XDestroyImage (ximage);
695 return true; 463 return true;
696} 464}
697 465
698bool 466bool
699rxvt_term::render_image (unsigned long tr_flags) 467rxvt_term::render_image (bool transparent)
700{ 468{
701 if (!pixbuf) 469 if (!pixbuf)
702 return false; 470 return false;
703 471
704 if (tr_flags 472 if (transparent
705 && !(bg_flags & BG_HAS_RENDER)) 473 && !(bg_flags & BG_HAS_RENDER))
706 return false; 474 return false;
707 475
708 GdkPixbuf *result; 476 GdkPixbuf *result;
709 477
749 Pixmap root_pmap; 517 Pixmap root_pmap;
750 518
751 image_width = gdk_pixbuf_get_width (result); 519 image_width = gdk_pixbuf_get_width (result);
752 image_height = gdk_pixbuf_get_height (result); 520 image_height = gdk_pixbuf_get_height (result);
753 521
754 if (tr_flags) 522 if (transparent)
755 { 523 {
756 root_pmap = bg_pixmap; 524 root_pmap = bg_pixmap;
757 bg_pixmap = None; 525 bg_pixmap = None;
758 } 526 }
759 else 527 else
817 dst_x, dst_y, 585 dst_x, dst_y,
818 dst_width, dst_height); 586 dst_width, dst_height);
819 } 587 }
820 588
821#if XRENDER 589#if XRENDER
822 if (tr_flags) 590 if (transparent)
823 { 591 {
824 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 592 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
825 593
826 Picture src = XRenderCreatePicture (dpy, root_pmap, format, 0, 0); 594 Picture src = XRenderCreatePicture (dpy, root_pmap, format, 0, 0);
827 595
851 } 619 }
852 620
853 if (result != pixbuf) 621 if (result != pixbuf)
854 g_object_unref (result); 622 g_object_unref (result);
855 623
856 if (tr_flags) 624 if (transparent)
857 XFreePixmap (dpy, root_pmap); 625 XFreePixmap (dpy, root_pmap);
858 626
859 return ret; 627 return ret;
860} 628}
861# endif /* HAVE_PIXBUF */ 629# endif /* HAVE_PIXBUF */
876 memcpy (f, file, len); 644 memcpy (f, file, len);
877 f[len] = '\0'; 645 f[len] = '\0';
878 file = f; 646 file = f;
879 } 647 }
880 648
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 649# ifdef HAVE_PIXBUF
896 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 650 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
897 if (image) 651 if (image)
898 { 652 {
899 if (pixbuf) 653 if (pixbuf)
956 { 710 {
957 changed = true; 711 changed = true;
958 v_blurRadius = vr; 712 v_blurRadius = vr;
959 } 713 }
960 714
961 if (v_blurRadius == 0 && h_blurRadius == 0) 715 if (h_blurRadius && v_blurRadius)
716 bg_flags |= BG_NEEDS_BLUR;
717 else
962 bg_flags &= ~BG_NEEDS_BLUR; 718 bg_flags &= ~BG_NEEDS_BLUR;
963 else
964 bg_flags |= BG_NEEDS_BLUR;
965 719
966 return changed; 720 return changed;
967} 721}
968 722
969void 723void
970rxvt_term::set_tint_shade_flags () 724rxvt_term::set_tint_shade_flags ()
971{ 725{
972 rgba c; 726 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; 727 bg_flags |= BG_NEEDS_TINT;
728 else
729 bg_flags &= ~BG_NEEDS_TINT;
990} 730}
991 731
992bool 732bool
993rxvt_term::bg_set_tint (rxvt_color &new_tint) 733rxvt_term::bg_set_tint (rxvt_color &new_tint)
994{ 734{
995 if (tint != new_tint) 735 if (!(bg_flags & BG_TINT_SET) || tint != new_tint)
996 { 736 {
997 tint = new_tint; 737 tint = new_tint;
738 bg_flags |= BG_TINT_SET;
739
740 rgba c;
741 tint.get (c);
742 if ((c.r <= 0x00ff || c.r >= 0xff00)
743 && (c.g <= 0x00ff || c.g >= 0xff00)
744 && (c.b <= 0x00ff || c.b >= 0xff00))
745 bg_flags |= BG_TINT_BITAND;
746 else
747 bg_flags &= ~BG_TINT_BITAND;
748
998 set_tint_shade_flags (); 749 set_tint_shade_flags ();
999 return true; 750 return true;
1000 } 751 }
1001 752
1002 return false; 753 return false;
1043 params[i+2] = XDoubleToFixed (kernel[i] / sum); 794 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1044} 795}
1045#endif 796#endif
1046 797
1047bool 798bool
1048rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 799rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height, int depth)
1049{ 800{
1050 bool ret = false; 801 bool ret = false;
1051#if XRENDER 802#if XRENDER
1052 if (!(bg_flags & BG_HAS_RENDER_CONV)) 803 if (!(bg_flags & BG_HAS_RENDER_CONV))
1053 return false; 804 return false;
1054 805
1055 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 806 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1056 double *kernel = (double *)malloc (size * sizeof (double)); 807 double *kernel = (double *)malloc (size * sizeof (double));
1057 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 808 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1058 809
810 XRenderPictureAttributes pa;
1059 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 811 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1060 812
813 pa.repeat = RepeatPad;
1061 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, 0); 814 Picture src = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
815 Pixmap tmp = XCreatePixmap (dpy, pixmap, width, height, depth);
1062 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, 0); 816 Picture dst = XRenderCreatePicture (dpy, tmp, format, CPRepeat, &pa);
817 XFreePixmap (dpy, tmp);
1063 818
1064 if (kernel && params) 819 if (kernel && params)
1065 { 820 {
1066 if (h_blurRadius)
1067 {
1068 size = h_blurRadius * 2 + 1; 821 size = h_blurRadius * 2 + 1;
1069 get_gaussian_kernel (h_blurRadius, size, kernel, params); 822 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1070 823
1071 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 824 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1072 XRenderComposite (dpy, 825 XRenderComposite (dpy,
1073 PictOpSrc, 826 PictOpSrc,
1074 src, 827 src,
1075 None, 828 None,
1076 dst, 829 dst,
1077 0, 0, 830 0, 0,
1078 0, 0, 831 0, 0,
1079 0, 0, 832 0, 0,
1080 width, height); 833 width, height);
1081 }
1082 834
1083 if (v_blurRadius) 835 ::swap (src, dst);
1084 { 836
1085 size = v_blurRadius * 2 + 1; 837 size = v_blurRadius * 2 + 1;
1086 get_gaussian_kernel (v_blurRadius, size, kernel, params); 838 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1087 ::swap (params[0], params[1]); 839 ::swap (params[0], params[1]);
1088 840
1089 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 841 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1090 XRenderComposite (dpy, 842 XRenderComposite (dpy,
1091 PictOpSrc, 843 PictOpSrc,
1092 src, 844 src,
1093 None, 845 None,
1094 dst, 846 dst,
1095 0, 0, 847 0, 0,
1096 0, 0, 848 0, 0,
1097 0, 0, 849 0, 0,
1098 width, height); 850 width, height);
1099 }
1100 851
1101 ret = true; 852 ret = true;
1102 } 853 }
1103 854
1104 free (kernel); 855 free (kernel);
1112bool 863bool
1113rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 864rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1114{ 865{
1115 bool ret = false; 866 bool ret = false;
1116 867
1117 if (bg_flags & BG_TINT_BITAND) 868 if (shade == 100 && (bg_flags & BG_TINT_BITAND))
1118 { 869 {
1119 XGCValues gcv; 870 XGCValues gcv;
1120 GC gc; 871 GC gc;
1121 872
1122 /* In this case we can tint image server-side getting significant 873 /* In this case we can tint image server-side getting significant
1134 } 885 }
1135 } 886 }
1136# if XRENDER 887# if XRENDER
1137 else if (bg_flags & BG_HAS_RENDER) 888 else if (bg_flags & BG_HAS_RENDER)
1138 { 889 {
1139 rgba c; 890 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1140 891
892 if (bg_flags & BG_TINT_SET)
1141 tint.get (c); 893 tint.get (c);
1142 894
1143 if (shade <= 100) 895 if (shade <= 100)
1144 { 896 {
1145 c.r = c.r * shade / 100; 897 c.r = c.r * shade / 100;
1146 c.g = c.g * shade / 100; 898 c.g = c.g * shade / 100;
1202/* 954/*
1203 * Builds a pixmap of the same size as the terminal window that contains 955 * 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 956 * the tiled portion of the root pixmap that is supposed to be covered by
1205 * our window. 957 * our window.
1206 */ 958 */
1207unsigned long 959bool
1208rxvt_term::make_transparency_pixmap () 960rxvt_term::make_transparency_pixmap ()
1209{ 961{
1210 unsigned long result = 0; 962 bool ret = false;
1211 963
1212 /* root dimensions may change from call to call - but Display structure should 964 /* root dimensions may change from call to call - but Display structure should
1213 * be always up-to-date, so let's use it : 965 * be always up-to-date, so let's use it :
1214 */ 966 */
1215 int screen = display->screen; 967 int screen = display->screen;
1296 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1048 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1297 1049
1298 if (gc) 1050 if (gc)
1299 { 1051 {
1300 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height); 1052 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1301 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1053 ret = true;
1054 unsigned long tr_flags = bg_flags & BG_EFFECTS_FLAGS;
1302 1055
1303 if (!(bg_flags & BG_CLIENT_RENDER)) 1056 if (!(bg_flags & BG_CLIENT_RENDER))
1304 { 1057 {
1305 if (bg_flags & BG_NEEDS_BLUR) 1058 if (bg_flags & BG_NEEDS_BLUR)
1306 { 1059 {
1307 if (blur_pixmap (bg_pixmap, visual, window_width, window_height)) 1060 if (blur_pixmap (bg_pixmap, visual, window_width, window_height, depth))
1308 result &= ~BG_NEEDS_BLUR; 1061 tr_flags &= ~BG_NEEDS_BLUR;
1309 } 1062 }
1310 if (bg_flags & BG_NEEDS_TINT) 1063 if (bg_flags & BG_NEEDS_TINT)
1311 { 1064 {
1312 if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) 1065 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1313 result &= ~BG_NEEDS_TINT; 1066 tr_flags &= ~BG_NEEDS_TINT;
1314 } 1067 }
1315# ifndef HAVE_AFTERIMAGE
1316 if (result & BG_NEEDS_TINT) 1068 if (tr_flags & BG_NEEDS_TINT)
1317 { 1069 {
1318 XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap); 1070 XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1319 if (ximage) 1071 if (ximage)
1320 { 1072 {
1321 /* our own client-side tinting */ 1073 /* our own client-side tinting */
1323 1075
1324 XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height); 1076 XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height);
1325 XDestroyImage (ximage); 1077 XDestroyImage (ximage);
1326 } 1078 }
1327 } 1079 }
1328# endif
1329 } /* server side rendering completed */ 1080 } /* server side rendering completed */
1330 1081
1331 XFreeGC (dpy, gc); 1082 XFreeGC (dpy, gc);
1332 } 1083 }
1333 1084
1334 if (recoded_root_pmap != root_pixmap) 1085 if (recoded_root_pmap != root_pixmap)
1335 XFreePixmap (dpy, recoded_root_pmap); 1086 XFreePixmap (dpy, recoded_root_pmap);
1336 1087
1337 return result; 1088 return ret;
1338} 1089}
1339 1090
1340void 1091void
1341rxvt_term::bg_set_root_pixmap () 1092rxvt_term::bg_set_root_pixmap ()
1342{ 1093{
1349# endif /* ENABLE_TRANSPARENCY */ 1100# endif /* ENABLE_TRANSPARENCY */
1350 1101
1351bool 1102bool
1352rxvt_term::bg_render () 1103rxvt_term::bg_render ()
1353{ 1104{
1354 unsigned long tr_flags = 0; 1105 bool transparent = false;
1355 1106
1356 bg_invalidate (); 1107 bg_invalidate ();
1357# ifdef ENABLE_TRANSPARENCY 1108# ifdef ENABLE_TRANSPARENCY
1358 if (bg_flags & BG_IS_TRANSPARENT) 1109 if (bg_flags & BG_IS_TRANSPARENT)
1359 { 1110 {
1360 /* we need to re-generate transparency pixmap in that case ! */ 1111 /* we need to re-generate transparency pixmap in that case ! */
1361 tr_flags = make_transparency_pixmap (); 1112 transparent = make_transparency_pixmap ();
1362 if (tr_flags == 0) 1113 if (transparent)
1363 return false;
1364 bg_flags |= BG_IS_VALID; 1114 bg_flags |= BG_IS_VALID;
1365 } 1115 }
1366# endif 1116# endif
1367 1117
1368# ifdef BG_IMAGE_FROM_FILE 1118# ifdef BG_IMAGE_FROM_FILE
1369 if ((bg_flags & BG_IS_FROM_FILE) 1119 if (bg_flags & BG_IS_FROM_FILE)
1370 || (tr_flags & BG_EFFECTS_FLAGS))
1371 { 1120 {
1372 if (render_image (tr_flags)) 1121 if (render_image (transparent))
1373 bg_flags |= BG_IS_VALID; 1122 bg_flags |= BG_IS_VALID;
1374 } 1123 }
1375# endif 1124# endif
1376 1125
1377 if (!(bg_flags & BG_IS_VALID)) 1126 if (!(bg_flags & BG_IS_VALID))
1393 1142
1394void 1143void
1395rxvt_term::bg_init () 1144rxvt_term::bg_init ()
1396{ 1145{
1397#ifdef ENABLE_TRANSPARENCY 1146#ifdef ENABLE_TRANSPARENCY
1398 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1399 tint.set (this, c);
1400 shade = 100; 1147 shade = 100;
1401#endif 1148#endif
1402 1149
1403 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV); 1150 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV);
1404#if XRENDER 1151#if XRENDER
1417#endif 1164#endif
1418} 1165}
1419 1166
1420#endif /* HAVE_BG_PIXMAP */ 1167#endif /* HAVE_BG_PIXMAP */
1421 1168
1422#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1169#ifdef ENABLE_TRANSPARENCY
1423/* based on code from aterm-0.4.2 */ 1170/* based on code from aterm-0.4.2 */
1424 1171
1425static inline void 1172static inline void
1426fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high) 1173fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1427{ 1174{
1507 break; 1254 break;
1508 default: 1255 default:
1509 return; /* we do not support this color depth */ 1256 return; /* we do not support this color depth */
1510 } 1257 }
1511 1258
1512 rgba c; 1259 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1513 1260
1261 if (bg_flags & BG_TINT_SET)
1514 tint.get (c); 1262 tint.get (c);
1515 1263
1516 /* prepare limits for color transformation (each channel is handled separately) */ 1264 /* prepare limits for color transformation (each channel is handled separately) */
1517 if (shade > 100) 1265 if (shade > 100)
1518 { 1266 {
1519 c.r = c.r * (200 - shade) / 100; 1267 c.r = c.r * (200 - shade) / 100;
1572 } 1320 }
1573 } 1321 }
1574 1322
1575 free (lookup); 1323 free (lookup);
1576} 1324}
1577#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1325#endif /* ENABLE_TRANSPARENCY */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines