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.56 by sf-exg, Thu Sep 2 23:40:56 2010 UTC vs.
Revision 1.96 by sf-exg, Fri Oct 22 16:49:26 2010 UTC

… …
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com>
7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net> 7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net>
8 * Copyright (c) 2010 Emanuele Giaquinta <e.giaquinta@glauco.it>
8 * 9 *
9 * This program is free software; you can redistribute it and/or modify 10 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by 11 * it under the terms of the GNU General Public License as published by
11 * the Free Software Foundation; either version 2 of the License, or 12 * the Free Software Foundation; either version 2 of the License, or
12 * (at your option) any later version. 13 * (at your option) any later version.
… …
19 * 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
20 * along with this program; if not, write to the Free Software 21 * along with this program; if not, write to the Free Software
21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 22 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22 *---------------------------------------------------------------------*/ 23 *---------------------------------------------------------------------*/
23 24
25#include <cmath>
24#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
25#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
26 28
27#define DO_TIMING_TEST 0 29#define DO_TIMING_TEST 0
28 30
… …
104#ifdef BG_IMAGE_FROM_FILE 106#ifdef BG_IMAGE_FROM_FILE
105 have_image = false; 107 have_image = false;
106 h_scale = v_scale = 0; 108 h_scale = v_scale = 0;
107 h_align = v_align = 0; 109 h_align = v_align = 0;
108#endif 110#endif
111#ifdef ENABLE_TRANSPARENCY
112 shade = 100;
113#endif
109 flags = 0; 114 flags = 0;
110 pixmap = None; 115 pixmap = None;
111 valid_since = invalid_since = 0; 116 valid_since = invalid_since = 0;
112 target = 0; 117 target = 0;
113} 118}
… …
138# endif 143# endif
139 144
140# ifdef BG_IMAGE_FROM_FILE 145# ifdef BG_IMAGE_FROM_FILE
141 if (have_image) 146 if (have_image)
142 { 147 {
143 if (h_scale != 0 || v_scale != 0 148 if (flags & sizeSensitive)
144 || h_align != 0 || v_align != 0)
145 return true; 149 return true;
146 } 150 }
147# endif 151# endif
148 152
149 return false; 153 return false;
… …
158# endif 162# endif
159 163
160# ifdef BG_IMAGE_FROM_FILE 164# ifdef BG_IMAGE_FROM_FILE
161 if (have_image) 165 if (have_image)
162 { 166 {
163 if (h_align == rootAlign || v_align == rootAlign) 167 if (flags & rootAlign)
164 return true; 168 return true;
165 } 169 }
166# endif 170# endif
167 171
168 return false; 172 return false;
… …
172{ 176{
173# ifdef HAVE_AFTERIMAGE 177# ifdef HAVE_AFTERIMAGE
174 if (original_asim) 178 if (original_asim)
175 return true; 179 return true;
176# endif 180# endif
177# ifdef ENABLE_TRANSPARENCY
178 if (flags & isTransparent)
179 {
180# ifdef HAVE_AFTERIMAGE // can't blur without libAI anyways
181 if ((flags & blurNeeded) && !(flags & blurServerSide))
182 return true;
183# endif
184 if ((flags & tintNeeded) && !(flags & tintServerSide))
185 return true;
186 }
187# endif
188 return false; 181 return false;
189} 182}
190 183
191# ifdef BG_IMAGE_FROM_FILE 184# ifdef BG_IMAGE_FROM_FILE
192static inline bool 185static inline bool
… …
208static inline bool 201static inline bool
209check_set_align_value (int geom_flags, int flag, int &align, int new_value) 202check_set_align_value (int geom_flags, int flag, int &align, int new_value)
210{ 203{
211 if (geom_flags & flag) 204 if (geom_flags & flag)
212 { 205 {
213 if (new_value != bgPixmap_t::rootAlign)
214 {
215 if (new_value < -100) 206 if (new_value < -100)
216 new_value = -100; 207 new_value = -100;
217 else if (new_value > 200) 208 else if (new_value > 200)
218 new_value = 200; 209 new_value = 200;
219 }
220 if (new_value != align) 210 if (new_value != align)
221 { 211 {
222 align = new_value; 212 align = new_value;
223 return true; 213 return true;
224 } 214 }
… …
230make_align_position (int align, int window_size, int image_size) 220make_align_position (int align, int window_size, int image_size)
231{ 221{
232 int diff = window_size - image_size; 222 int diff = window_size - image_size;
233 int smaller = min (image_size, window_size); 223 int smaller = min (image_size, window_size);
234 224
235 if (align >= 0 && align <= 50) 225 if (align >= 0 && align <= 100)
236 return diff * align / 100; 226 return diff * align / 100;
237 else if (align > 50 && align <= 100)
238 return window_size - image_size - diff * (100 - align) / 100;
239 else if (align > 100 && align <= 200 ) 227 else if (align > 100 && align <= 200)
240 return ((align - 100) * smaller / 100) + window_size - smaller; 228 return ((align - 100) * smaller / 100) + window_size - smaller;
241 else if (align > -100 && align < 0) 229 else if (align >= -100 && align < 0)
242 return ((align + 100) * smaller / 100) - image_size; 230 return ((align + 100) * smaller / 100) - image_size;
243 return 0; 231 return 0;
244} 232}
245 233
246static inline int 234static inline int
247make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 235make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
248{ 236{
249 int src_pos = 0; 237 int src_pos = 0;
250 dst_pos = 0; 238 dst_pos = pos;
251 dst_size = size; 239 dst_size = size;
252 if (pos < 0 && size > target_size) 240 if (pos < 0)
253 { 241 {
254 src_pos = -pos; 242 src_pos = -pos;
243 dst_pos = 0;
255 dst_size += pos; 244 dst_size += pos;
256 } 245 }
257 else if (pos > 0)
258 dst_pos = pos;
259 246
260 if (dst_pos + dst_size > target_size) 247 if (dst_pos + dst_size > target_size)
261 dst_size = target_size - dst_pos; 248 dst_size = target_size - dst_pos;
262 return src_pos; 249 return src_pos;
263} 250}
… …
388 w = h = noScale; 375 w = h = noScale;
389 geom_flags |= WidthValue|HeightValue; 376 geom_flags |= WidthValue|HeightValue;
390 } 377 }
391 else if (CHECK_GEOM_OPS ("propscale")) 378 else if (CHECK_GEOM_OPS ("propscale"))
392 { 379 {
393 if (w == 0 && h == 0)
394 {
395 w = windowScale;
396 geom_flags |= WidthValue;
397 }
398 new_flags |= propScale; 380 new_flags |= propScale;
399 } 381 }
400 else if (CHECK_GEOM_OPS ("hscale")) 382 else if (CHECK_GEOM_OPS ("hscale"))
401 { 383 {
402 if (w == 0) w = windowScale; 384 if (w == 0) w = windowScale;
… …
424 x = y = centerAlign; 406 x = y = centerAlign;
425 geom_flags |= WidthValue|HeightValue|XValue|YValue; 407 geom_flags |= WidthValue|HeightValue|XValue|YValue;
426 } 408 }
427 else if (CHECK_GEOM_OPS ("root")) 409 else if (CHECK_GEOM_OPS ("root"))
428 { 410 {
411 new_flags |= rootAlign;
429 w = h = noScale; 412 w = h = noScale;
430 x = y = rootAlign;
431 geom_flags |= WidthValue|HeightValue|XValue|YValue; 413 geom_flags |= WidthValue|HeightValue;
432 } 414 }
433# undef CHECK_GEOM_OPS 415# undef CHECK_GEOM_OPS
434 416
435 while (*ops != ':' && *ops != '\0') ++ops; 417 while (*ops != ':' && *ops != '\0') ++ops;
436 } /* done parsing ops */ 418 } /* done parsing ops */
… …
446 { 428 {
447 flags = new_flags; 429 flags = new_flags;
448 changed++; 430 changed++;
449 } 431 }
450 432
451 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
452 // flags, h_scale, v_scale, h_align, v_align);
453 return (changed > 0); 433 return (changed > 0);
434}
435
436void
437bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
438{
439 int target_width = target->szHint.width;
440 int target_height = target->szHint.height;
441
442 if (flags & propScale)
443 {
444 float scale = (float)target_width / image_width;
445 min_it (scale, (float)target_height / image_height);
446 w = image_width * scale + 0.5;
447 h = image_height * scale + 0.5;
448 }
449 else
450 {
451 w = h_scale * target_width / 100;
452 h = v_scale * target_height / 100;
453 }
454
455 if (!w) w = image_width;
456 if (!h) h = image_height;
457
458 if (flags & rootAlign)
459 {
460 target->get_window_origin (x, y);
461 x = -x;
462 y = -y;
463 }
464 else
465 {
466 x = make_align_position (h_align, target_width, w);
467 y = make_align_position (v_align, target_height, h);
468 }
469
470 flags &= ~sizeSensitive;
471 if ((flags & propScale) || h_scale || v_scale
472 || (!(flags & rootAlign) && (h_align || v_align))
473 || w > target_width || h > target_height)
474 flags |= sizeSensitive;
454} 475}
455 476
456# ifdef HAVE_AFTERIMAGE 477# ifdef HAVE_AFTERIMAGE
457bool 478bool
458bgPixmap_t::render_image (unsigned long background_flags) 479bgPixmap_t::render_image (unsigned long background_flags)
… …
470 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); 491 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
471 492
472 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 493 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
473 { 494 {
474 ShadingInfo as_shade; 495 ShadingInfo as_shade;
475 as_shade.shading = (shade == 0) ? 100 : shade; 496 as_shade.shading = shade;
476 497
477 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 498 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
478 if (flags & tintSet) 499 if (flags & tintSet)
479 tint.get (c); 500 tint.get (c);
480 as_shade.tintColor.red = c.r; 501 as_shade.tintColor.red = c.r;
… …
482 as_shade.tintColor.blue = c.b; 503 as_shade.tintColor.blue = c.b;
483 504
484 background_tint = shading2tint32 (&as_shade); 505 background_tint = shading2tint32 (&as_shade);
485 } 506 }
486 507
487 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL) 508 if (!(background_flags & transpPmapBlurred) && (flags & blurNeeded) && background != NULL)
488 { 509 {
489 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 510 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
490 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 511 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
491 100, ASIMAGE_QUALITY_DEFAULT); 512 100, ASIMAGE_QUALITY_DEFAULT);
492 if (tmp) 513 if (tmp)
… …
504 int new_pmap_width = target_width; 525 int new_pmap_width = target_width;
505 int new_pmap_height = target_height; 526 int new_pmap_height = target_height;
506 527
507 int x = 0; 528 int x = 0;
508 int y = 0; 529 int y = 0;
509 int w = h_scale * target_width / 100; 530 int w = 0;
510 int h = v_scale * target_height / 100; 531 int h = 0;
511
512 TIMING_TEST_START (asim);
513 532
514 if (original_asim) 533 if (original_asim)
515 { 534 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
516 if (h_align == rootAlign || v_align == rootAlign)
517 {
518 target->get_window_origin (x, y);
519 x = -x;
520 y = -y;
521 }
522
523 if (h_align != rootAlign)
524 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
525
526 if (v_align != rootAlign)
527 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
528 }
529 535
530 if (!original_asim 536 if (!original_asim
537 || (!(flags & rootAlign)
531 || x >= target_width 538 && (x >= target_width
532 || y >= target_height 539 || y >= target_height
533 || (w > 0 && x + w <= 0) 540 || (x + w <= 0)
534 || (h > 0 && y + h <= 0)) 541 || (y + h <= 0))))
535 { 542 {
536 if (background) 543 if (background)
537 { 544 {
538 new_pmap_width = background->width; 545 new_pmap_width = background->width;
539 new_pmap_height = background->height; 546 new_pmap_height = background->height;
… …
553 } 560 }
554 else 561 else
555 { 562 {
556 result = original_asim; 563 result = original_asim;
557 564
558 if ((w > 0 && w != original_asim->width) 565 if ((w != original_asim->width)
559 || (h > 0 && h != original_asim->height)) 566 || (h != original_asim->height))
560 { 567 {
561 result = scale_asimage (target->asv, original_asim, 568 result = scale_asimage (target->asv, original_asim,
562 w > 0 ? w : original_asim->width, 569 w, h,
563 h > 0 ? h : original_asim->height,
564 background ? ASA_ASImage : ASA_XImage, 570 background ? ASA_ASImage : ASA_XImage,
565 100, ASIMAGE_QUALITY_DEFAULT); 571 100, ASIMAGE_QUALITY_DEFAULT);
566 } 572 }
567 573
568 if (background == NULL) 574 if (background == NULL)
569 { 575 {
570 /* if tiling - pixmap has to be sized exactly as the image,
571 but there is no need to make it bigger than the window! */
572 if (h_scale == 0)
573 new_pmap_width = min (result->width, target_width);
574 if (v_scale == 0)
575 new_pmap_height = min (result->height, target_height);
576 /* we also need to tile our image in one or both directions */
577 if (h_scale == 0 || v_scale == 0) 576 if (h_scale == 0 || v_scale == 0)
578 { 577 {
578 /* if tiling - pixmap has to be sized exactly as the image,
579 but there is no need to make it bigger than the window! */
580 new_pmap_width = min (result->width, target_width);
581 new_pmap_height = min (result->height, target_height);
582
583 /* we also need to tile our image in both directions */
579 ASImage *tmp = tile_asimage (target->asv, result, 584 ASImage *tmp = tile_asimage (target->asv, result,
580 (h_scale > 0) ? 0 : (int)result->width - x, 585 (int)result->width - x,
581 (v_scale > 0) ? 0 : (int)result->height - y, 586 (int)result->height - y,
582 new_pmap_width, 587 new_pmap_width,
583 new_pmap_height, 588 new_pmap_height,
584 TINT_LEAVE_SAME, ASA_XImage, 589 TINT_LEAVE_SAME, ASA_XImage,
585 100, ASIMAGE_QUALITY_DEFAULT); 590 100, ASIMAGE_QUALITY_DEFAULT);
586 if (tmp) 591 if (tmp)
… …
601 layers[0].clip_width = target_width; 606 layers[0].clip_width = target_width;
602 layers[0].clip_height = target_height; 607 layers[0].clip_height = target_height;
603 layers[0].tint = background_tint; 608 layers[0].tint = background_tint;
604 layers[1].im = result; 609 layers[1].im = result;
605 610
606 if (w <= 0) 611 if (h_scale == 0 || v_scale == 0)
607 { 612 {
608 /* tile horizontally */ 613 /* tile horizontally */
609 while (x > 0) x -= (int)result->width; 614 while (x > 0) x -= (int)result->width;
610 layers[1].dst_x = x; 615 layers[1].dst_x = x;
611 layers[1].clip_width = result->width+target_width; 616 layers[1].clip_width = result->width+target_width;
… …
615 /* clip horizontally */ 620 /* clip horizontally */
616 layers[1].dst_x = x; 621 layers[1].dst_x = x;
617 layers[1].clip_width = result->width; 622 layers[1].clip_width = result->width;
618 } 623 }
619 624
620 if (h <= 0) 625 if (h_scale == 0 || v_scale == 0)
621 { 626 {
622 while (y > 0) y -= (int)result->height; 627 while (y > 0) y -= (int)result->height;
623 layers[1].dst_y = y; 628 layers[1].dst_y = y;
624 layers[1].clip_height = result->height + target_height; 629 layers[1].clip_height = result->height + target_height;
625 } 630 }
… …
648 } 653 }
649 654
650 free (layers); 655 free (layers);
651 } 656 }
652 } 657 }
653 TIMING_TEST_PRINT_RESULT (asim);
654 658
655 bool ret = false; 659 bool ret = false;
656 660
657 if (result) 661 if (result)
658 { 662 {
… …
684 688
685 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 689 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
686 int dst_width = result->width, dst_height = result->height; 690 int dst_width = result->width, dst_height = result->height;
687 if (background == NULL) 691 if (background == NULL)
688 { 692 {
693 if (!(h_scale == 0 || v_scale == 0))
694 {
689 if (h_scale > 0) src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width ); 695 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
690 if (v_scale > 0) src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height); 696 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
697 }
691 698
692 if (dst_x > 0 || dst_y > 0 699 if (dst_x > 0 || dst_y > 0
693 || dst_x + dst_width < new_pmap_width 700 || dst_x + dst_width < new_pmap_width
694 || dst_y + dst_height < new_pmap_height) 701 || dst_y + dst_height < new_pmap_height)
695 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 702 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
… …
701 708
702 if (result != background && result != original_asim) 709 if (result != background && result != original_asim)
703 destroy_asimage (&result); 710 destroy_asimage (&result);
704 711
705 XFreeGC (target->dpy, gc); 712 XFreeGC (target->dpy, gc);
706 TIMING_TEST_PRINT_RESULT (asim);
707 713
708 ret = true; 714 ret = true;
709 } 715 }
710 716
711 if (background) 717 if (background)
… …
723 return false; 729 return false;
724 730
725 if (!pixbuf) 731 if (!pixbuf)
726 return false; 732 return false;
727 733
728 // TODO: add alpha blending 734#if !XFT
729 if (background_flags) 735 if (background_flags)
730 return false; 736 return false;
737#endif
731 738
732 GdkPixbuf *result; 739 GdkPixbuf *result;
733 740
734 int image_width = gdk_pixbuf_get_width (pixbuf); 741 int image_width = gdk_pixbuf_get_width (pixbuf);
735 int image_height = gdk_pixbuf_get_height (pixbuf); 742 int image_height = gdk_pixbuf_get_height (pixbuf);
… …
739 int new_pmap_width = target_width; 746 int new_pmap_width = target_width;
740 int new_pmap_height = target_height; 747 int new_pmap_height = target_height;
741 748
742 int x = 0; 749 int x = 0;
743 int y = 0; 750 int y = 0;
744 int w = h_scale * target_width / 100; 751 int w = 0;
745 int h = v_scale * target_height / 100; 752 int h = 0;
746 753
747 if (h_align == rootAlign || v_align == rootAlign) 754 get_image_geometry (image_width, image_height, w, h, x, y);
748 {
749 target->get_window_origin (x, y);
750 x = -x;
751 y = -y;
752 }
753 755
754 if (h_align != rootAlign) 756 if (!(flags & rootAlign)
755 x = make_align_position (h_align, target_width, w > 0 ? w : image_width);
756
757 if (v_align != rootAlign)
758 y = make_align_position (v_align, target_height, h > 0 ? h : image_height);
759
760 if (x >= target_width 757 && (x >= target_width
761 || y >= target_height 758 || y >= target_height
762 || (w > 0 && x + w <= 0) 759 || (x + w <= 0)
763 || (h > 0 && y + h <= 0)) 760 || (y + h <= 0)))
764 return false; 761 return false;
765 762
766 result = pixbuf; 763 result = pixbuf;
767 764
768 if ((w > 0 && w != image_width) 765 if ((w != image_width)
769 || (h > 0 && h != image_height)) 766 || (h != image_height))
770 { 767 {
771 result = gdk_pixbuf_scale_simple (pixbuf, 768 result = gdk_pixbuf_scale_simple (pixbuf,
772 w > 0 ? w : image_width, 769 w, h,
773 h > 0 ? h : image_height,
774 GDK_INTERP_BILINEAR); 770 GDK_INTERP_BILINEAR);
775 } 771 }
776 772
777 bool ret = false; 773 bool ret = false;
778 774
779 if (result) 775 if (result)
780 { 776 {
781 XGCValues gcv; 777 XGCValues gcv;
782 GC gc; 778 GC gc;
779 Pixmap root_pmap;
783 780
784 image_width = gdk_pixbuf_get_width (result); 781 image_width = gdk_pixbuf_get_width (result);
785 image_height = gdk_pixbuf_get_height (result); 782 image_height = gdk_pixbuf_get_height (result);
786 783
787 if (h_scale == 0) 784 if (background_flags)
785 {
786 root_pmap = pixmap;
787 pixmap = None;
788 }
789 else
790 {
791 if (h_scale == 0 || v_scale == 0)
792 {
788 new_pmap_width = min (image_width, target_width); 793 new_pmap_width = min (image_width, target_width);
789 if (v_scale == 0)
790 new_pmap_height = min (image_height, target_height); 794 new_pmap_height = min (image_height, target_height);
795 }
796 }
791 797
792 if (pixmap) 798 if (pixmap)
793 { 799 {
794 if (pmap_width != new_pmap_width 800 if (pmap_width != new_pmap_width
795 || pmap_height != new_pmap_height 801 || pmap_height != new_pmap_height
… …
850 dst_width, dst_height, 856 dst_width, dst_height,
851 XLIB_RGB_DITHER_NONE, 857 XLIB_RGB_DITHER_NONE,
852 0, 0); 858 0, 0);
853 } 859 }
854 860
861#if XFT
862 if (background_flags)
863 {
864 Display *dpy = target->dpy;
865 XRenderPictureAttributes pa;
866
867 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen));
868 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
869
870 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
871 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
872
873 pa.repeat = True;
874 Pixmap mask_pmap = XCreatePixmap (dpy, target->vt, 1, 1, 8);
875 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
876 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
877 XFreePixmap (dpy, mask_pmap);
878
879 if (src && dst && mask)
880 {
881 XRenderColor mask_c;
882
883 mask_c.alpha = 0x8000;
884 mask_c.red = 0;
885 mask_c.green = 0;
886 mask_c.blue = 0;
887 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
888 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
889 }
890
891 XRenderFreePicture (dpy, src);
892 XRenderFreePicture (dpy, dst);
893 XRenderFreePicture (dpy, mask);
894
895 XFreePixmap (dpy, root_pmap);
896 }
897#endif
898
855 if (result != pixbuf) 899 if (result != pixbuf)
856 g_object_unref (result); 900 g_object_unref (result);
857 901
858 XFreeGC (target->dpy, gc); 902 XFreeGC (target->dpy, gc);
859 903
… …
881 } 925 }
882 926
883# ifdef HAVE_AFTERIMAGE 927# ifdef HAVE_AFTERIMAGE
884 if (!target->asimman) 928 if (!target->asimman)
885 target->asimman = create_generic_imageman (target->rs[Rs_path]); 929 target->asimman = create_generic_imageman (target->rs[Rs_path]);
886 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 930 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
931 if (image)
932 {
887 if (original_asim) 933 if (original_asim)
934 safe_asimage_destroy (original_asim);
935 original_asim = image;
888 have_image = true; 936 have_image = true;
889 return have_image; 937 return true;
938 }
890# endif 939# endif
891 940
892# ifdef HAVE_PIXBUF 941# ifdef HAVE_PIXBUF
893 pixbuf = gdk_pixbuf_new_from_file (file, NULL); 942 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
943 if (image)
944 {
894 if (pixbuf) 945 if (pixbuf)
946 g_object_unref (pixbuf);
947 pixbuf = image;
895 have_image = true; 948 have_image = true;
896 return have_image; 949 return true;
950 }
897# endif 951# endif
898 } 952 }
899 953
900 return false; 954 return false;
901} 955}
… …
926 if (!(geom_flags & WidthValue)) 980 if (!(geom_flags & WidthValue))
927 hr = 1; 981 hr = 1;
928 if (!(geom_flags & HeightValue)) 982 if (!(geom_flags & HeightValue))
929 vr = hr; 983 vr = hr;
930 984
985 min_it (hr, 128);
986 min_it (vr, 128);
987
931 if (h_blurRadius != hr) 988 if (h_blurRadius != hr)
932 { 989 {
933 ++changed; 990 ++changed;
934 h_blurRadius = hr; 991 h_blurRadius = hr;
935 } 992 }
… …
943 if (v_blurRadius == 0 && h_blurRadius == 0) 1000 if (v_blurRadius == 0 && h_blurRadius == 0)
944 flags &= ~blurNeeded; 1001 flags &= ~blurNeeded;
945 else 1002 else
946 flags |= blurNeeded; 1003 flags |= blurNeeded;
947 1004
1005#if XFT
1006 XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root);
1007 if (filters)
1008 {
1009 for (int i = 0; i < filters->nfilter; i++)
1010 if (!strcmp (filters->filter[i], FilterConvolution))
1011 flags |= bgPixmap_t::blurServerSide;
1012
1013 XFree (filters);
1014 }
1015#endif
1016
948 return (changed > 0); 1017 return (changed > 0);
949} 1018}
950 1019
951static inline unsigned long 1020static inline unsigned long
952compute_tint_shade_flags (rxvt_color *tint, int shade) 1021compute_tint_shade_flags (rxvt_color *tint, int shade)
953{ 1022{
954 unsigned long flags = 0; 1023 unsigned long flags = 0;
955 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1024 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
956 bool has_shade = (shade > 0 && shade < 100) || (shade > 100 && shade < 200); 1025 bool has_shade = shade != 100;
957 1026
958 if (tint) 1027 if (tint)
959 { 1028 {
960 tint->get (c); 1029 tint->get (c);
961# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 1030# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
… …
993} 1062}
994 1063
995bool 1064bool
996bgPixmap_t::set_tint (rxvt_color &new_tint) 1065bgPixmap_t::set_tint (rxvt_color &new_tint)
997{ 1066{
998 if (tint != new_tint) 1067 if (!(flags & tintSet) || tint != new_tint)
999 { 1068 {
1000 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1069 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
1001 tint = new_tint; 1070 tint = new_tint;
1002 flags = (flags & ~tintFlags) | new_flags | tintSet; 1071 flags = (flags & ~tintFlags) | new_flags | tintSet;
1003 return true; 1072 return true;
… …
1021} 1090}
1022 1091
1023bool 1092bool
1024bgPixmap_t::set_shade (const char *shade_str) 1093bgPixmap_t::set_shade (const char *shade_str)
1025{ 1094{
1026 int new_shade = (shade_str) ? atoi (shade_str) : 0; 1095 int new_shade = (shade_str) ? atoi (shade_str) : 100;
1027 1096
1028 if (new_shade < 0 && new_shade > -100) 1097 clamp_it (new_shade, -100, 200);
1098 if (new_shade < 0)
1029 new_shade = 200 - (100 + new_shade); 1099 new_shade = 200 - (100 + new_shade);
1030 else if (new_shade == 100)
1031 new_shade = 0;
1032 1100
1033 if (new_shade != shade) 1101 if (new_shade != shade)
1034 { 1102 {
1035 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 1103 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
1036 shade = new_shade; 1104 shade = new_shade;
1037 flags = (flags & (~tintFlags | tintSet)) | new_flags; 1105 flags = (flags & (~tintFlags | tintSet)) | new_flags;
1038 return true; 1106 return true;
1039 } 1107 }
1040 1108
1041 return false; 1109 return false;
1110}
1111
1112#if XFT
1113static void
1114get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1115{
1116 double sigma = radius / 2.0;
1117 double scale = sqrt (2.0 * M_PI) * sigma;
1118 double sum = 0.0;
1119
1120 for (int i = 0; i < width; i++)
1121 {
1122 double x = i - width / 2;
1123 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1124 sum += kernel[i];
1125 }
1126
1127 params[0] = XDoubleToFixed (width);
1128 params[1] = XDoubleToFixed (1);
1129
1130 for (int i = 0; i < width; i++)
1131 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1132}
1133#endif
1134
1135bool
1136bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1137{
1138 bool ret = false;
1139#if XFT
1140 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1141 double *kernel = (double *)malloc (size * sizeof (double));
1142 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1143
1144 Display *dpy = target->dpy;
1145 XRenderPictureAttributes pa;
1146 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1147
1148 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1149 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1150
1151 if (kernel && params && src && dst)
1152 {
1153 if (h_blurRadius)
1154 {
1155 size = h_blurRadius * 2 + 1;
1156 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1157
1158 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1159 XRenderComposite (dpy,
1160 PictOpSrc,
1161 src,
1162 None,
1163 dst,
1164 0, 0,
1165 0, 0,
1166 0, 0,
1167 width, height);
1168 }
1169
1170 if (v_blurRadius)
1171 {
1172 size = v_blurRadius * 2 + 1;
1173 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1174 swap (params[0], params[1]);
1175
1176 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1177 XRenderComposite (dpy,
1178 PictOpSrc,
1179 src,
1180 None,
1181 dst,
1182 0, 0,
1183 0, 0,
1184 0, 0,
1185 width, height);
1186 }
1187
1188 ret = true;
1189 }
1190
1191 free (kernel);
1192 free (params);
1193 XRenderFreePicture (dpy, src);
1194 XRenderFreePicture (dpy, dst);
1195#endif
1196 return ret;
1197}
1198
1199bool
1200bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1201{
1202 Display *dpy = target->dpy;
1203 bool ret = false;
1204
1205 if (flags & tintWholesome)
1206 {
1207 XGCValues gcv;
1208 GC gc;
1209
1210 /* In this case we can tint image server-side getting significant
1211 * performance improvements, as we eliminate XImage transfer
1212 */
1213 gcv.foreground = Pixel (tint);
1214 gcv.function = GXand;
1215 gcv.fill_style = FillSolid;
1216 gc = XCreateGC (dpy, pixmap, GCFillStyle | GCForeground | GCFunction, &gcv);
1217 if (gc)
1218 {
1219 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1220 ret = true;
1221 XFreeGC (dpy, gc);
1222 }
1223 }
1224 else
1225 {
1226# if XFT
1227 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1228
1229 if (flags & tintSet)
1230 tint.get (c);
1231
1232 if (shade <= 100)
1233 {
1234 c.r = (c.r * shade) / 100;
1235 c.g = (c.g * shade) / 100;
1236 c.b = (c.b * shade) / 100;
1237 }
1238 else
1239 {
1240 c.r = ((0xffff - c.r) * (200 - shade)) / 100;
1241 c.g = ((0xffff - c.g) * (200 - shade)) / 100;
1242 c.b = ((0xffff - c.b) * (200 - shade)) / 100;
1243 }
1244
1245 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1246 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1247 XRenderPictureAttributes pa;
1248
1249 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1250
1251 pa.repeat = True;
1252
1253 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1254 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1255 XFreePixmap (dpy, overlay_pmap);
1256
1257 pa.component_alpha = True;
1258 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1259 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1260 XFreePixmap (dpy, mask_pmap);
1261
1262 if (mask_pic && overlay_pic && back_pic)
1263 {
1264 XRenderColor mask_c;
1265
1266 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1267 mask_c.alpha = 0xffff;
1268 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1269
1270 mask_c.alpha = 0;
1271 mask_c.red = 0xffff - c.r;
1272 mask_c.green = 0xffff - c.g;
1273 mask_c.blue = 0xffff - c.b;
1274 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1275 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1276 ret = true;
1277 }
1278
1279 XRenderFreePicture (dpy, mask_pic);
1280 XRenderFreePicture (dpy, overlay_pic);
1281 XRenderFreePicture (dpy, back_pic);
1282# endif
1283 }
1284
1285 return ret;
1042} 1286}
1043 1287
1044/* make_transparency_pixmap() 1288/* make_transparency_pixmap()
1045 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1289 * Builds a pixmap sized the same as terminal window, with depth same as the root window
1046 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 1290 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by
… …
1065 unsigned int root_pmap_width, root_pmap_height; 1309 unsigned int root_pmap_width, root_pmap_height;
1066 int window_width = target->szHint.width; 1310 int window_width = target->szHint.width;
1067 int window_height = target->szHint.height; 1311 int window_height = target->szHint.height;
1068 int sx, sy; 1312 int sx, sy;
1069 XGCValues gcv; 1313 XGCValues gcv;
1314 GC gc;
1070 1315
1071 TIMING_TEST_START (tp);
1072 target->get_window_origin (sx, sy); 1316 target->get_window_origin (sx, sy);
1073 1317
1074 /* check if we are outside of the visible part of the virtual screen : */ 1318 /* check if we are outside of the visible part of the virtual screen : */
1075 if (sx + window_width <= 0 || sy + window_height <= 0 1319 if (sx + window_width <= 0 || sy + window_height <= 0
1076 || sx >= root_width || sy >= root_height) 1320 || sx >= root_width || sy >= root_height)
1077 return 0; 1321 return 0;
1078 1322
1079 if (root_pixmap != None) 1323 if (root_pixmap != None)
1080 { 1324 {
1081 /* we want to validate the pixmap and get it's size at the same time : */ 1325 /* we want to validate the pixmap and get its size at the same time : */
1082 int junk; 1326 int junk;
1083 unsigned int ujunk; 1327 unsigned int ujunk;
1084 /* root pixmap may be bad - allow a error */ 1328 /* root pixmap may be bad - allow a error */
1085 target->allowedxerror = -1; 1329 target->allowedxerror = -1;
1086 1330
… …
1088 root_pixmap = None; 1332 root_pixmap = None;
1089 1333
1090 target->allowedxerror = 0; 1334 target->allowedxerror = 0;
1091 } 1335 }
1092 1336
1337 if (root_pixmap == None)
1338 return 0;
1339
1093 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1340 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth);
1094 GC gc = NULL;
1095 1341
1096 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1342 if (tiled_root_pmap == None) /* something really bad happened - abort */
1097 return 0; 1343 return 0;
1098 1344
1099 if (root_pixmap == None)
1100 {
1101 /* use tricks to obtain the root background image :*/
1102 /* we want to create Overrideredirect window overlapping out window
1103 with background type of Parent Relative and then grab it */
1104 XSetWindowAttributes attr;
1105 Window src;
1106 bool success = false;
1107
1108 attr.background_pixmap = ParentRelative;
1109 attr.backing_store = Always;
1110 attr.event_mask = ExposureMask;
1111 attr.override_redirect = True;
1112 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
1113 CopyFromParent, CopyFromParent, CopyFromParent,
1114 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
1115 &attr);
1116
1117 if (src != None)
1118 {
1119 XEvent event;
1120 int ev_count = 0;
1121 XGrabServer (dpy);
1122 XMapRaised (dpy, src);
1123 XSync (dpy, False);
1124
1125 /* XSync should get window where it's properly exposed,
1126 * but to be on the safe side - let's check for the actual event to arrive : */
1127 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
1128 ++ev_count;
1129
1130 if (ev_count > 0);
1131 {
1132 /* hooray! - we can grab the image! */
1133 gc = XCreateGC (dpy, root, 0, NULL);
1134 if (gc)
1135 {
1136 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
1137 success = true;
1138 }
1139 }
1140
1141 XDestroyWindow (dpy, src);
1142 XUngrabServer (dpy);
1143 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
1144 }
1145
1146 if (!success)
1147 {
1148 XFreePixmap (dpy, tiled_root_pmap);
1149 tiled_root_pmap = None;
1150 }
1151 else
1152 result |= transpPmapTiled;
1153 }
1154 else
1155 {
1156 /* straightforward pixmap copy */ 1345 /* straightforward pixmap copy */
1157 gcv.tile = root_pixmap; 1346 gcv.tile = root_pixmap;
1158 gcv.fill_style = FillTiled; 1347 gcv.fill_style = FillTiled;
1159 1348
1160 while (sx < 0) sx += (int)root_width; 1349 while (sx < 0) sx += (int)root_width;
1161 while (sy < 0) sy += (int)root_height; 1350 while (sy < 0) sy += (int)root_height;
1162 1351
1163 gcv.ts_x_origin = -sx; 1352 gcv.ts_x_origin = -sx;
1164 gcv.ts_y_origin = -sy; 1353 gcv.ts_y_origin = -sy;
1165 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1354 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1166 1355
1167 if (gc) 1356 if (gc)
1168 { 1357 {
1169 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1358 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1170 result |= transpPmapTiled; 1359 result |= transpPmapTiled;
1171 } 1360 XFreeGC (dpy, gc);
1172 } 1361 }
1173 TIMING_TEST_PRINT_RESULT (tp);
1174 1362
1175 if (tiled_root_pmap != None) 1363 if (tiled_root_pmap != None)
1176 { 1364 {
1177 if (!need_client_side_rendering ()) 1365 if (!need_client_side_rendering ())
1178 { 1366 {
1179 if ((flags & tintNeeded)) 1367 if (flags & (blurNeeded | blurServerSide))
1368 {
1369 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height))
1370 result |= transpPmapBlurred;
1180 { 1371 }
1181 if (flags & tintWholesome) 1372 if (flags & (tintNeeded | tintServerSide))
1182 { 1373 {
1183 /* In this case we can tint image server-side getting significant 1374 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height))
1184 * performance improvements, as we eliminate XImage transfer
1185 */
1186 gcv.foreground = Pixel (tint);
1187 gcv.function = GXand;
1188 gcv.fill_style = FillSolid;
1189 if (gc)
1190 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcv);
1191 else
1192 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv);
1193 if (gc)
1194 {
1195 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1196 result |= transpPmapTinted; 1375 result |= transpPmapTinted;
1197 }
1198 }
1199 else
1200 {
1201# if XFT
1202 Picture back_pic = 0;
1203 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1204
1205 if (flags & tintSet)
1206 tint.get (c);
1207
1208 if (shade > 0 && shade < 100)
1209 {
1210 c.r = (c.r * shade) / 100;
1211 c.g = (c.g * shade) / 100;
1212 c.b = (c.b * shade) / 100;
1213 }
1214 else if (shade > 100 && shade < 200)
1215 {
1216 c.r = (c.r * (200 - shade)) / 100;
1217 c.g = (c.g * (200 - shade)) / 100;
1218 c.b = (c.b * (200 - shade)) / 100;
1219 }
1220
1221 XRenderPictFormat pf;
1222 pf.type = PictTypeDirect;
1223 pf.depth = 32;
1224 pf.direct.redMask = 0xff;
1225 pf.direct.greenMask = 0xff;
1226 pf.direct.blueMask = 0xff;
1227 pf.direct.alphaMask = 0xff;
1228
1229 XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
1230 (PictFormatType|
1231 PictFormatDepth|
1232 PictFormatRedMask|
1233 PictFormatGreenMask|
1234 PictFormatBlueMask|
1235 PictFormatAlphaMask),
1236 &pf,
1237 0);
1238 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
1239 XRenderPictureAttributes pa ;
1240
1241 back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa);
1242
1243 pa.repeat = True;
1244
1245 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1246 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1247 XFreePixmap (dpy, overlay_pmap);
1248
1249 pa.component_alpha = True;
1250 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1251 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1252 XFreePixmap (dpy, mask_pmap);
1253
1254 if (mask_pic && overlay_pic && back_pic)
1255 {
1256 XRenderColor mask_c;
1257
1258 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1259 mask_c.alpha = 0xffff;
1260 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1261
1262 mask_c.alpha = 0;
1263 mask_c.red = 0xffff - c.r;
1264 mask_c.green = 0xffff - c.g;
1265 mask_c.blue = 0xffff - c.b;
1266 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1267 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
1268 result |= transpPmapTinted;
1269 }
1270
1271 XRenderFreePicture (dpy, mask_pic);
1272 XRenderFreePicture (dpy, overlay_pic);
1273 XRenderFreePicture (dpy, back_pic);
1274# if DO_TIMING_TEST
1275 XSync (dpy, False);
1276# endif
1277# endif
1278 }
1279 } 1376 }
1280 } /* server side rendering completed */ 1377 } /* server side rendering completed */
1281 1378
1282 if (pixmap) 1379 if (pixmap)
1283 XFreePixmap (dpy, pixmap); 1380 XFreePixmap (dpy, pixmap);
… …
1286 pmap_width = window_width; 1383 pmap_width = window_width;
1287 pmap_height = window_height; 1384 pmap_height = window_height;
1288 pmap_depth = root_depth; 1385 pmap_depth = root_depth;
1289 } 1386 }
1290 1387
1291 if (gc)
1292 XFreeGC (dpy, gc);
1293
1294 TIMING_TEST_PRINT_RESULT (tp);
1295
1296 return result; 1388 return result;
1297} 1389}
1298 1390
1299bool 1391bool
1300bgPixmap_t::set_root_pixmap () 1392bgPixmap_t::set_root_pixmap ()
… …
1312 return false; 1404 return false;
1313} 1405}
1314# endif /* ENABLE_TRANSPARENCY */ 1406# endif /* ENABLE_TRANSPARENCY */
1315 1407
1316# ifndef HAVE_AFTERIMAGE 1408# ifndef HAVE_AFTERIMAGE
1317static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm); 1409static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm);
1318# endif 1410# endif
1319 1411
1320bool 1412bool
1321bgPixmap_t::render () 1413bgPixmap_t::render ()
1322{ 1414{
1323 unsigned long background_flags = 0; 1415 unsigned long background_flags = 0;
1324 1416
1325 if (target == NULL) 1417 if (target == NULL)
1326 return false; 1418 return false;
1327
1328 TIMING_TEST_START (tp);
1329 1419
1330 invalidate (); 1420 invalidate ();
1331# ifdef ENABLE_TRANSPARENCY 1421# ifdef ENABLE_TRANSPARENCY
1332 if (flags & isTransparent) 1422 if (flags & isTransparent)
1333 { 1423 {
… …
1366 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1456 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1367 { 1457 {
1368 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1458 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1369 if (flags & tintSet) 1459 if (flags & tintSet)
1370 tint.get (c); 1460 tint.get (c);
1371 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1461 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b);
1372 } 1462 }
1373# endif 1463# endif
1374 1464
1375 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1465 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1376 1466
… …
1422 } 1512 }
1423 } 1513 }
1424 1514
1425 apply (); 1515 apply ();
1426 1516
1427 XSync (target->dpy, False);
1428 valid_since = ev::now (); 1517 valid_since = ev::now ();
1429
1430 TIMING_TEST_PRINT_RESULT (tp);
1431 1518
1432 return true; 1519 return true;
1433} 1520}
1434 1521
1435bool 1522bool
… …
1508#endif /* HAVE_BG_PIXMAP */ 1595#endif /* HAVE_BG_PIXMAP */
1509 1596
1510#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1597#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT
1511/* taken from aterm-0.4.2 */ 1598/* taken from aterm-0.4.2 */
1512 1599
1513typedef uint32_t RUINT32T;
1514
1515static void 1600static void
1516ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm) 1601ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm)
1517{ 1602{
1518 int sh_r, sh_g, sh_b; 1603 int sh_r, sh_g, sh_b;
1519 RUINT32T mask_r, mask_g, mask_b; 1604 uint32_t mask_r, mask_g, mask_b;
1520 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1605 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1521 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1606 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1522 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1607 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1523 int i; 1608 int i;
1609 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1524 1610
1525 Visual *visual = term->visual;
1526
1527 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1611 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1528
1529 if (shade == 0)
1530 shade = 100;
1531 1612
1532 /* for convenience */ 1613 /* for convenience */
1533 mask_r = visual->red_mask; 1614 mask_r = visual->red_mask;
1534 mask_g = visual->green_mask; 1615 mask_g = visual->green_mask;
1535 mask_b = visual->blue_mask; 1616 mask_b = visual->blue_mask;
1536 1617
1537 /* boring lookup table pre-initialization */ 1618 /* boring lookup table pre-initialization */
1538 switch (srcImage->bits_per_pixel) { 1619 switch (srcImage->depth)
1620 {
1539 case 15: 1621 case 15:
1540 if ((mask_r != 0x7c00) || 1622 if ((mask_r != 0x7c00) ||
1541 (mask_g != 0x03e0) || 1623 (mask_g != 0x03e0) ||
1542 (mask_b != 0x001f)) 1624 (mask_b != 0x001f))
1543 return; 1625 return;
1544 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1626 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32));
1545 lookup_r = lookup; 1627 lookup_r = lookup;
1546 lookup_g = lookup+32; 1628 lookup_g = lookup+32;
1547 lookup_b = lookup+32+32; 1629 lookup_b = lookup+32+32;
1548 sh_r = 10; 1630 sh_r = 10;
1549 sh_g = 5; 1631 sh_g = 5;
1550 sh_b = 0; 1632 sh_b = 0;
1551 break; 1633 break;
1552 case 16: 1634 case 16:
1553 if ((mask_r != 0xf800) || 1635 if ((mask_r != 0xf800) ||
1554 (mask_g != 0x07e0) || 1636 (mask_g != 0x07e0) ||
1555 (mask_b != 0x001f)) 1637 (mask_b != 0x001f))
1556 return; 1638 return;
1557 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1639 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1558 lookup_r = lookup; 1640 lookup_r = lookup;
1559 lookup_g = lookup+32; 1641 lookup_g = lookup+32;
1560 lookup_b = lookup+32+64; 1642 lookup_b = lookup+32+64;
1561 sh_r = 11; 1643 sh_r = 11;
1562 sh_g = 5; 1644 sh_g = 5;
1563 sh_b = 0; 1645 sh_b = 0;
1564 break; 1646 break;
1565 case 24: 1647 case 24:
1566 if ((mask_r != 0xff0000) || 1648 if ((mask_r != 0xff0000) ||
1567 (mask_g != 0x00ff00) || 1649 (mask_g != 0x00ff00) ||
1568 (mask_b != 0x0000ff)) 1650 (mask_b != 0x0000ff))
1569 return; 1651 return;
1570 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1652 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1571 lookup_r = lookup; 1653 lookup_r = lookup;
1572 lookup_g = lookup+256; 1654 lookup_g = lookup+256;
1573 lookup_b = lookup+256+256; 1655 lookup_b = lookup+256+256;
1574 sh_r = 16; 1656 sh_r = 16;
1575 sh_g = 8; 1657 sh_g = 8;
1576 sh_b = 0; 1658 sh_b = 0;
1577 break; 1659 break;
1578 case 32: 1660 case 32:
1579 if ((mask_r != 0xff0000) || 1661 if ((mask_r != 0xff0000) ||
1580 (mask_g != 0x00ff00) || 1662 (mask_g != 0x00ff00) ||
1581 (mask_b != 0x0000ff)) 1663 (mask_b != 0x0000ff))
1582 return; 1664 return;
1583 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1665 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1584 lookup_r = lookup; 1666 lookup_r = lookup;
1585 lookup_g = lookup+256; 1667 lookup_g = lookup+256;
1586 lookup_b = lookup+256+256; 1668 lookup_b = lookup+256+256;
1587 sh_r = 16; 1669 sh_r = 16;
1588 sh_g = 8; 1670 sh_g = 8;
1589 sh_b = 0; 1671 sh_b = 0;
1590 break; 1672 break;
1591 default: 1673 default:
1592 return; /* we do not support this color depth */ 1674 return; /* we do not support this color depth */
1593 } 1675 }
1594 1676
1595 /* prepare limits for color transformation (each channel is handled separately) */ 1677 /* prepare limits for color transformation (each channel is handled separately) */
1596 if (shade < 0) { 1678 if (shade > 100)
1679 {
1597 shade = -shade; 1680 shade = 200 - shade;
1598 if (shade < 0) shade = 0;
1599 if (shade > 100) shade = 100;
1600 1681
1601 lower_lim_r = 65535-rm; 1682 lower_lim_r = 65535-rm;
1602 lower_lim_g = 65535-gm; 1683 lower_lim_g = 65535-gm;
1603 lower_lim_b = 65535-bm; 1684 lower_lim_b = 65535-bm;
1604 1685
1605 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1686 lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100);
1606 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1687 lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100);
1607 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1688 lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100);
1608 1689
1609 upper_lim_r = upper_lim_g = upper_lim_b = 65535; 1690 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1691 }
1610 } else { 1692 else
1611 if (shade < 0) shade = 0; 1693 {
1612 if (shade > 100) shade = 100;
1613 1694
1614 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1695 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1615 1696
1616 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100); 1697 upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1617 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100); 1698 upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1618 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100); 1699 upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1619 } 1700 }
1620
1621 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1622 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1623 {
1624 unsigned int tmp;
1625
1626 tmp = lower_lim_r;
1627 lower_lim_r = lower_lim_b;
1628 lower_lim_b = tmp;
1629
1630 tmp = upper_lim_r;
1631 upper_lim_r = upper_lim_b;
1632 upper_lim_b = tmp;
1633 }
1634 1701
1635 /* fill our lookup tables */ 1702 /* fill our lookup tables */
1636 for (i = 0; i <= mask_r>>sh_r; i++) 1703 for (i = 0; i <= mask_r>>sh_r; i++)
1637 { 1704 {
1638 RUINT32T tmp; 1705 uint32_t tmp;
1639 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1706 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r));
1640 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1707 tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r);
1641 lookup_r[i] = (tmp/65535)<<sh_r; 1708 lookup_r[i] = (tmp/65535)<<sh_r;
1642 } 1709 }
1643 for (i = 0; i <= mask_g>>sh_g; i++) 1710 for (i = 0; i <= mask_g>>sh_g; i++)
1644 { 1711 {
1645 RUINT32T tmp; 1712 uint32_t tmp;
1646 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1713 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g));
1647 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1714 tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g);
1648 lookup_g[i] = (tmp/65535)<<sh_g; 1715 lookup_g[i] = (tmp/65535)<<sh_g;
1649 } 1716 }
1650 for (i = 0; i <= mask_b>>sh_b; i++) 1717 for (i = 0; i <= mask_b>>sh_b; i++)
1651 { 1718 {
1652 RUINT32T tmp; 1719 uint32_t tmp;
1653 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1720 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b));
1654 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1721 tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b);
1655 lookup_b[i] = (tmp/65535)<<sh_b; 1722 lookup_b[i] = (tmp/65535)<<sh_b;
1656 } 1723 }
1657 1724
1658 /* apply table to input image (replacing colors by newly calculated ones) */ 1725 /* apply table to input image (replacing colors by newly calculated ones) */
1659 switch (srcImage->bits_per_pixel) 1726 if (srcImage->bits_per_pixel == 32
1727 && (srcImage->depth == 24 || srcImage->depth == 32)
1728 && srcImage->byte_order == host_byte_order)
1660 { 1729 {
1661 case 15:
1662 {
1663 unsigned short *p1, *pf, *p, *pl; 1730 uint32_t *p1, *pf, *p, *pl;
1664 p1 = (unsigned short *) srcImage->data; 1731 p1 = (uint32_t *) srcImage->data;
1665 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1732 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1733
1666 while (p1 < pf) 1734 while (p1 < pf)
1667 { 1735 {
1668 p = p1; 1736 p = p1;
1669 pl = p1 + srcImage->width; 1737 pl = p1 + srcImage->width;
1670 for (; p < pl; p++) 1738 for (; p < pl; p++)
1671 { 1739 {
1672 *p = lookup_r[(*p & 0x7c00)>>10] |
1673 lookup_g[(*p & 0x03e0)>> 5] |
1674 lookup_b[(*p & 0x001f)];
1675 }
1676 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1677 }
1678 break;
1679 }
1680 case 16:
1681 {
1682 unsigned short *p1, *pf, *p, *pl;
1683 p1 = (unsigned short *) srcImage->data;
1684 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1685 while (p1 < pf)
1686 {
1687 p = p1;
1688 pl = p1 + srcImage->width;
1689 for (; p < pl; p++)
1690 {
1691 *p = lookup_r[(*p & 0xf800)>>11] |
1692 lookup_g[(*p & 0x07e0)>> 5] |
1693 lookup_b[(*p & 0x001f)];
1694 }
1695 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1696 }
1697 break;
1698 }
1699 case 24:
1700 {
1701 unsigned char *p1, *pf, *p, *pl;
1702 p1 = (unsigned char *) srcImage->data;
1703 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1704 while (p1 < pf)
1705 {
1706 p = p1;
1707 pl = p1 + srcImage->width * 3;
1708 for (; p < pl; p += 3)
1709 {
1710 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1711 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1712 p[2] = lookup_r[(p[2] & 0x0000ff)];
1713 }
1714 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1715 }
1716 break;
1717 }
1718 case 32:
1719 {
1720 RUINT32T *p1, *pf, *p, *pl;
1721 p1 = (RUINT32T *) srcImage->data;
1722 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1723
1724 while (p1 < pf)
1725 {
1726 p = p1;
1727 pl = p1 + srcImage->width;
1728 for (; p < pl; p++)
1729 {
1730 *p = lookup_r[(*p & 0xff0000)>>16] | 1740 *p = lookup_r[(*p & 0xff0000) >> 16] |
1731 lookup_g[(*p & 0x00ff00)>> 8] | 1741 lookup_g[(*p & 0x00ff00) >> 8] |
1732 lookup_b[(*p & 0x0000ff)] | 1742 lookup_b[(*p & 0x0000ff)] |
1733 (*p & ~0xffffff); 1743 (*p & 0xff000000);
1744 }
1745 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line);
1746 }
1747 }
1748 else
1749 {
1750 for (int y = 0; y < srcImage->height; y++)
1751 for (int x = 0; x < srcImage->width; x++)
1752 {
1753 unsigned long pixel = XGetPixel (srcImage, x, y);
1754 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1755 lookup_g[(pixel & mask_g) >> sh_g] |
1756 lookup_b[(pixel & mask_b) >> sh_b];
1757 XPutPixel (srcImage, x, y, pixel);
1734 } 1758 }
1735 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1736 } 1759 }
1737 break;
1738 }
1739 }
1740 1760
1741 free (lookup); 1761 free (lookup);
1742} 1762}
1743#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1763#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */

Diff Legend

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