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.93 by sf-exg, Tue Oct 19 14:44:30 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 */
… …
451 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 433 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
452 // flags, h_scale, v_scale, h_align, v_align); 434 // flags, h_scale, v_scale, h_align, v_align);
453 return (changed > 0); 435 return (changed > 0);
454} 436}
455 437
438void
439bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
440{
441 int target_width = target->szHint.width;
442 int target_height = target->szHint.height;
443
444 if (flags & propScale)
445 {
446 float scale = (float)target_width / image_width;
447 min_it (scale, (float)target_height / image_height);
448 w = image_width * scale + 0.5;
449 h = image_height * scale + 0.5;
450 }
451 else
452 {
453 w = h_scale * target_width / 100;
454 h = v_scale * target_height / 100;
455 }
456
457 if (!w) w = image_width;
458 if (!h) h = image_height;
459
460 if (flags & rootAlign)
461 {
462 target->get_window_origin (x, y);
463 x = -x;
464 y = -y;
465 }
466 else
467 {
468 x = make_align_position (h_align, target_width, w);
469 y = make_align_position (v_align, target_height, h);
470 }
471
472 flags &= ~sizeSensitive;
473 if ((flags & propScale) || h_scale || v_scale
474 || (!(flags & rootAlign) && (h_align || v_align))
475 || w > target_width || h > target_height)
476 flags |= sizeSensitive;
477}
478
456# ifdef HAVE_AFTERIMAGE 479# ifdef HAVE_AFTERIMAGE
457bool 480bool
458bgPixmap_t::render_image (unsigned long background_flags) 481bgPixmap_t::render_image (unsigned long background_flags)
459{ 482{
460 if (target == NULL) 483 if (target == NULL)
… …
470 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); 493 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
471 494
472 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 495 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
473 { 496 {
474 ShadingInfo as_shade; 497 ShadingInfo as_shade;
475 as_shade.shading = (shade == 0) ? 100 : shade; 498 as_shade.shading = shade;
476 499
477 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 500 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
478 if (flags & tintSet) 501 if (flags & tintSet)
479 tint.get (c); 502 tint.get (c);
480 as_shade.tintColor.red = c.r; 503 as_shade.tintColor.red = c.r;
… …
482 as_shade.tintColor.blue = c.b; 505 as_shade.tintColor.blue = c.b;
483 506
484 background_tint = shading2tint32 (&as_shade); 507 background_tint = shading2tint32 (&as_shade);
485 } 508 }
486 509
487 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL) 510 if (!(background_flags & transpPmapBlurred) && (flags & blurNeeded) && background != NULL)
488 { 511 {
489 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 512 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, 513 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
491 100, ASIMAGE_QUALITY_DEFAULT); 514 100, ASIMAGE_QUALITY_DEFAULT);
492 if (tmp) 515 if (tmp)
… …
504 int new_pmap_width = target_width; 527 int new_pmap_width = target_width;
505 int new_pmap_height = target_height; 528 int new_pmap_height = target_height;
506 529
507 int x = 0; 530 int x = 0;
508 int y = 0; 531 int y = 0;
509 int w = h_scale * target_width / 100; 532 int w = 0;
510 int h = v_scale * target_height / 100; 533 int h = 0;
511 534
512 TIMING_TEST_START (asim); 535 TIMING_TEST_START (asim);
513 536
514 if (original_asim) 537 if (original_asim)
515 { 538 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 539
530 if (!original_asim 540 if (!original_asim
541 || (!(flags & rootAlign)
531 || x >= target_width 542 && (x >= target_width
532 || y >= target_height 543 || y >= target_height
533 || (w > 0 && x + w <= 0) 544 || (x + w <= 0)
534 || (h > 0 && y + h <= 0)) 545 || (y + h <= 0))))
535 { 546 {
536 if (background) 547 if (background)
537 { 548 {
538 new_pmap_width = background->width; 549 new_pmap_width = background->width;
539 new_pmap_height = background->height; 550 new_pmap_height = background->height;
… …
553 } 564 }
554 else 565 else
555 { 566 {
556 result = original_asim; 567 result = original_asim;
557 568
558 if ((w > 0 && w != original_asim->width) 569 if ((w != original_asim->width)
559 || (h > 0 && h != original_asim->height)) 570 || (h != original_asim->height))
560 { 571 {
561 result = scale_asimage (target->asv, original_asim, 572 result = scale_asimage (target->asv, original_asim,
562 w > 0 ? w : original_asim->width, 573 w, h,
563 h > 0 ? h : original_asim->height,
564 background ? ASA_ASImage : ASA_XImage, 574 background ? ASA_ASImage : ASA_XImage,
565 100, ASIMAGE_QUALITY_DEFAULT); 575 100, ASIMAGE_QUALITY_DEFAULT);
566 } 576 }
567 577
568 if (background == NULL) 578 if (background == NULL)
569 { 579 {
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) 580 if (h_scale == 0 || v_scale == 0)
578 { 581 {
582 /* if tiling - pixmap has to be sized exactly as the image,
583 but there is no need to make it bigger than the window! */
584 new_pmap_width = min (result->width, target_width);
585 new_pmap_height = min (result->height, target_height);
586
587 /* we also need to tile our image in both directions */
579 ASImage *tmp = tile_asimage (target->asv, result, 588 ASImage *tmp = tile_asimage (target->asv, result,
580 (h_scale > 0) ? 0 : (int)result->width - x, 589 (int)result->width - x,
581 (v_scale > 0) ? 0 : (int)result->height - y, 590 (int)result->height - y,
582 new_pmap_width, 591 new_pmap_width,
583 new_pmap_height, 592 new_pmap_height,
584 TINT_LEAVE_SAME, ASA_XImage, 593 TINT_LEAVE_SAME, ASA_XImage,
585 100, ASIMAGE_QUALITY_DEFAULT); 594 100, ASIMAGE_QUALITY_DEFAULT);
586 if (tmp) 595 if (tmp)
… …
601 layers[0].clip_width = target_width; 610 layers[0].clip_width = target_width;
602 layers[0].clip_height = target_height; 611 layers[0].clip_height = target_height;
603 layers[0].tint = background_tint; 612 layers[0].tint = background_tint;
604 layers[1].im = result; 613 layers[1].im = result;
605 614
606 if (w <= 0) 615 if (h_scale == 0 || v_scale == 0)
607 { 616 {
608 /* tile horizontally */ 617 /* tile horizontally */
609 while (x > 0) x -= (int)result->width; 618 while (x > 0) x -= (int)result->width;
610 layers[1].dst_x = x; 619 layers[1].dst_x = x;
611 layers[1].clip_width = result->width+target_width; 620 layers[1].clip_width = result->width+target_width;
… …
615 /* clip horizontally */ 624 /* clip horizontally */
616 layers[1].dst_x = x; 625 layers[1].dst_x = x;
617 layers[1].clip_width = result->width; 626 layers[1].clip_width = result->width;
618 } 627 }
619 628
620 if (h <= 0) 629 if (h_scale == 0 || v_scale == 0)
621 { 630 {
622 while (y > 0) y -= (int)result->height; 631 while (y > 0) y -= (int)result->height;
623 layers[1].dst_y = y; 632 layers[1].dst_y = y;
624 layers[1].clip_height = result->height + target_height; 633 layers[1].clip_height = result->height + target_height;
625 } 634 }
… …
684 693
685 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 694 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
686 int dst_width = result->width, dst_height = result->height; 695 int dst_width = result->width, dst_height = result->height;
687 if (background == NULL) 696 if (background == NULL)
688 { 697 {
698 if (!(h_scale == 0 || v_scale == 0))
699 {
689 if (h_scale > 0) src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width ); 700 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); 701 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
702 }
691 703
692 if (dst_x > 0 || dst_y > 0 704 if (dst_x > 0 || dst_y > 0
693 || dst_x + dst_width < new_pmap_width 705 || dst_x + dst_width < new_pmap_width
694 || dst_y + dst_height < new_pmap_height) 706 || dst_y + dst_height < new_pmap_height)
695 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 707 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
… …
723 return false; 735 return false;
724 736
725 if (!pixbuf) 737 if (!pixbuf)
726 return false; 738 return false;
727 739
728 // TODO: add alpha blending 740#if !XFT
729 if (background_flags) 741 if (background_flags)
730 return false; 742 return false;
743#endif
731 744
732 GdkPixbuf *result; 745 GdkPixbuf *result;
733 746
734 int image_width = gdk_pixbuf_get_width (pixbuf); 747 int image_width = gdk_pixbuf_get_width (pixbuf);
735 int image_height = gdk_pixbuf_get_height (pixbuf); 748 int image_height = gdk_pixbuf_get_height (pixbuf);
… …
739 int new_pmap_width = target_width; 752 int new_pmap_width = target_width;
740 int new_pmap_height = target_height; 753 int new_pmap_height = target_height;
741 754
742 int x = 0; 755 int x = 0;
743 int y = 0; 756 int y = 0;
744 int w = h_scale * target_width / 100; 757 int w = 0;
745 int h = v_scale * target_height / 100; 758 int h = 0;
746 759
747 if (h_align == rootAlign || v_align == rootAlign) 760 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 761
754 if (h_align != rootAlign) 762 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 763 && (x >= target_width
761 || y >= target_height 764 || y >= target_height
762 || (w > 0 && x + w <= 0) 765 || (x + w <= 0)
763 || (h > 0 && y + h <= 0)) 766 || (y + h <= 0)))
764 return false; 767 return false;
765 768
766 result = pixbuf; 769 result = pixbuf;
767 770
768 if ((w > 0 && w != image_width) 771 if ((w != image_width)
769 || (h > 0 && h != image_height)) 772 || (h != image_height))
770 { 773 {
771 result = gdk_pixbuf_scale_simple (pixbuf, 774 result = gdk_pixbuf_scale_simple (pixbuf,
772 w > 0 ? w : image_width, 775 w, h,
773 h > 0 ? h : image_height,
774 GDK_INTERP_BILINEAR); 776 GDK_INTERP_BILINEAR);
775 } 777 }
776 778
777 bool ret = false; 779 bool ret = false;
778 780
779 if (result) 781 if (result)
780 { 782 {
781 XGCValues gcv; 783 XGCValues gcv;
782 GC gc; 784 GC gc;
785 Pixmap root_pmap;
783 786
784 image_width = gdk_pixbuf_get_width (result); 787 image_width = gdk_pixbuf_get_width (result);
785 image_height = gdk_pixbuf_get_height (result); 788 image_height = gdk_pixbuf_get_height (result);
786 789
787 if (h_scale == 0) 790 if (background_flags)
791 {
792 root_pmap = pixmap;
793 pixmap = None;
794 }
795 else
796 {
797 if (h_scale == 0 || v_scale == 0)
798 {
788 new_pmap_width = min (image_width, target_width); 799 new_pmap_width = min (image_width, target_width);
789 if (v_scale == 0)
790 new_pmap_height = min (image_height, target_height); 800 new_pmap_height = min (image_height, target_height);
801 }
802 }
791 803
792 if (pixmap) 804 if (pixmap)
793 { 805 {
794 if (pmap_width != new_pmap_width 806 if (pmap_width != new_pmap_width
795 || pmap_height != new_pmap_height 807 || pmap_height != new_pmap_height
… …
850 dst_width, dst_height, 862 dst_width, dst_height,
851 XLIB_RGB_DITHER_NONE, 863 XLIB_RGB_DITHER_NONE,
852 0, 0); 864 0, 0);
853 } 865 }
854 866
867#if XFT
868 if (background_flags)
869 {
870 Display *dpy = target->dpy;
871 XRenderPictureAttributes pa;
872
873 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen));
874 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
875
876 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
877 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
878
879 pa.repeat = True;
880 Pixmap mask_pmap = XCreatePixmap (dpy, target->vt, 1, 1, 8);
881 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
882 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
883 XFreePixmap (dpy, mask_pmap);
884
885 if (src && dst && mask)
886 {
887 XRenderColor mask_c;
888
889 mask_c.alpha = 0x8000;
890 mask_c.red = 0;
891 mask_c.green = 0;
892 mask_c.blue = 0;
893 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
894 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
895 }
896
897 XRenderFreePicture (dpy, src);
898 XRenderFreePicture (dpy, dst);
899 XRenderFreePicture (dpy, mask);
900
901 XFreePixmap (dpy, root_pmap);
902 }
903#endif
904
855 if (result != pixbuf) 905 if (result != pixbuf)
856 g_object_unref (result); 906 g_object_unref (result);
857 907
858 XFreeGC (target->dpy, gc); 908 XFreeGC (target->dpy, gc);
859 909
… …
881 } 931 }
882 932
883# ifdef HAVE_AFTERIMAGE 933# ifdef HAVE_AFTERIMAGE
884 if (!target->asimman) 934 if (!target->asimman)
885 target->asimman = create_generic_imageman (target->rs[Rs_path]); 935 target->asimman = create_generic_imageman (target->rs[Rs_path]);
886 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 936 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
937 if (image)
938 {
887 if (original_asim) 939 if (original_asim)
940 safe_asimage_destroy (original_asim);
941 original_asim = image;
888 have_image = true; 942 have_image = true;
889 return have_image; 943 return true;
944 }
890# endif 945# endif
891 946
892# ifdef HAVE_PIXBUF 947# ifdef HAVE_PIXBUF
893 pixbuf = gdk_pixbuf_new_from_file (file, NULL); 948 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
949 if (image)
950 {
894 if (pixbuf) 951 if (pixbuf)
952 g_object_unref (pixbuf);
953 pixbuf = image;
895 have_image = true; 954 have_image = true;
896 return have_image; 955 return true;
956 }
897# endif 957# endif
898 } 958 }
899 959
900 return false; 960 return false;
901} 961}
… …
926 if (!(geom_flags & WidthValue)) 986 if (!(geom_flags & WidthValue))
927 hr = 1; 987 hr = 1;
928 if (!(geom_flags & HeightValue)) 988 if (!(geom_flags & HeightValue))
929 vr = hr; 989 vr = hr;
930 990
991 min_it (hr, 128);
992 min_it (vr, 128);
993
931 if (h_blurRadius != hr) 994 if (h_blurRadius != hr)
932 { 995 {
933 ++changed; 996 ++changed;
934 h_blurRadius = hr; 997 h_blurRadius = hr;
935 } 998 }
… …
943 if (v_blurRadius == 0 && h_blurRadius == 0) 1006 if (v_blurRadius == 0 && h_blurRadius == 0)
944 flags &= ~blurNeeded; 1007 flags &= ~blurNeeded;
945 else 1008 else
946 flags |= blurNeeded; 1009 flags |= blurNeeded;
947 1010
1011#if XFT
1012 XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root);
1013 if (filters)
1014 {
1015 for (int i = 0; i < filters->nfilter; i++)
1016 if (!strcmp (filters->filter[i], FilterConvolution))
1017 flags |= bgPixmap_t::blurServerSide;
1018
1019 XFree (filters);
1020 }
1021#endif
1022
948 return (changed > 0); 1023 return (changed > 0);
949} 1024}
950 1025
951static inline unsigned long 1026static inline unsigned long
952compute_tint_shade_flags (rxvt_color *tint, int shade) 1027compute_tint_shade_flags (rxvt_color *tint, int shade)
953{ 1028{
954 unsigned long flags = 0; 1029 unsigned long flags = 0;
955 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1030 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
956 bool has_shade = (shade > 0 && shade < 100) || (shade > 100 && shade < 200); 1031 bool has_shade = shade != 100;
957 1032
958 if (tint) 1033 if (tint)
959 { 1034 {
960 tint->get (c); 1035 tint->get (c);
961# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 1036# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
… …
993} 1068}
994 1069
995bool 1070bool
996bgPixmap_t::set_tint (rxvt_color &new_tint) 1071bgPixmap_t::set_tint (rxvt_color &new_tint)
997{ 1072{
998 if (tint != new_tint) 1073 if (!(flags & tintSet) || tint != new_tint)
999 { 1074 {
1000 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1075 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
1001 tint = new_tint; 1076 tint = new_tint;
1002 flags = (flags & ~tintFlags) | new_flags | tintSet; 1077 flags = (flags & ~tintFlags) | new_flags | tintSet;
1003 return true; 1078 return true;
… …
1021} 1096}
1022 1097
1023bool 1098bool
1024bgPixmap_t::set_shade (const char *shade_str) 1099bgPixmap_t::set_shade (const char *shade_str)
1025{ 1100{
1026 int new_shade = (shade_str) ? atoi (shade_str) : 0; 1101 int new_shade = (shade_str) ? atoi (shade_str) : 100;
1027 1102
1028 if (new_shade < 0 && new_shade > -100) 1103 clamp_it (new_shade, -100, 200);
1104 if (new_shade < 0)
1029 new_shade = 200 - (100 + new_shade); 1105 new_shade = 200 - (100 + new_shade);
1030 else if (new_shade == 100)
1031 new_shade = 0;
1032 1106
1033 if (new_shade != shade) 1107 if (new_shade != shade)
1034 { 1108 {
1035 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 1109 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
1036 shade = new_shade; 1110 shade = new_shade;
1037 flags = (flags & (~tintFlags | tintSet)) | new_flags; 1111 flags = (flags & (~tintFlags | tintSet)) | new_flags;
1038 return true; 1112 return true;
1039 } 1113 }
1040 1114
1041 return false; 1115 return false;
1116}
1117
1118#if XFT
1119static void
1120get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1121{
1122 double sigma = radius / 2.0;
1123 double scale = sqrt (2.0 * M_PI) * sigma;
1124 double sum = 0.0;
1125
1126 for (int i = 0; i < width; i++)
1127 {
1128 double x = i - width / 2;
1129 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1130 sum += kernel[i];
1131 }
1132
1133 params[0] = XDoubleToFixed (width);
1134 params[1] = XDoubleToFixed (1);
1135
1136 for (int i = 0; i < width; i++)
1137 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1138}
1139#endif
1140
1141bool
1142bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1143{
1144 bool ret = false;
1145#if XFT
1146 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1147 double *kernel = (double *)malloc (size * sizeof (double));
1148 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1149
1150 Display *dpy = target->dpy;
1151 XRenderPictureAttributes pa;
1152 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1153
1154 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1155 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1156
1157 if (kernel && params && src && dst)
1158 {
1159 if (h_blurRadius)
1160 {
1161 size = h_blurRadius * 2 + 1;
1162 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1163
1164 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1165 XRenderComposite (dpy,
1166 PictOpSrc,
1167 src,
1168 None,
1169 dst,
1170 0, 0,
1171 0, 0,
1172 0, 0,
1173 width, height);
1174 }
1175
1176 if (v_blurRadius)
1177 {
1178 size = v_blurRadius * 2 + 1;
1179 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1180 swap (params[0], params[1]);
1181
1182 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1183 XRenderComposite (dpy,
1184 PictOpSrc,
1185 src,
1186 None,
1187 dst,
1188 0, 0,
1189 0, 0,
1190 0, 0,
1191 width, height);
1192 }
1193
1194 ret = true;
1195 }
1196
1197 free (kernel);
1198 free (params);
1199 XRenderFreePicture (dpy, src);
1200 XRenderFreePicture (dpy, dst);
1201#endif
1202 return ret;
1203}
1204
1205bool
1206bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1207{
1208 Display *dpy = target->dpy;
1209 bool ret = false;
1210
1211 if (flags & tintWholesome)
1212 {
1213 XGCValues gcv;
1214 GC gc;
1215
1216 /* In this case we can tint image server-side getting significant
1217 * performance improvements, as we eliminate XImage transfer
1218 */
1219 gcv.foreground = Pixel (tint);
1220 gcv.function = GXand;
1221 gcv.fill_style = FillSolid;
1222 gc = XCreateGC (dpy, pixmap, GCFillStyle | GCForeground | GCFunction, &gcv);
1223 if (gc)
1224 {
1225 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1226 ret = true;
1227 XFreeGC (dpy, gc);
1228 }
1229 }
1230 else
1231 {
1232# if XFT
1233 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1234
1235 if (flags & tintSet)
1236 tint.get (c);
1237
1238 if (shade <= 100)
1239 {
1240 c.r = (c.r * shade) / 100;
1241 c.g = (c.g * shade) / 100;
1242 c.b = (c.b * shade) / 100;
1243 }
1244 else
1245 {
1246 c.r = ((0xffff - c.r) * (200 - shade)) / 100;
1247 c.g = ((0xffff - c.g) * (200 - shade)) / 100;
1248 c.b = ((0xffff - c.b) * (200 - shade)) / 100;
1249 }
1250
1251 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1252 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1253 XRenderPictureAttributes pa;
1254
1255 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1256
1257 pa.repeat = True;
1258
1259 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1260 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1261 XFreePixmap (dpy, overlay_pmap);
1262
1263 pa.component_alpha = True;
1264 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1265 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1266 XFreePixmap (dpy, mask_pmap);
1267
1268 if (mask_pic && overlay_pic && back_pic)
1269 {
1270 XRenderColor mask_c;
1271
1272 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1273 mask_c.alpha = 0xffff;
1274 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1275
1276 mask_c.alpha = 0;
1277 mask_c.red = 0xffff - c.r;
1278 mask_c.green = 0xffff - c.g;
1279 mask_c.blue = 0xffff - c.b;
1280 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1281 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1282 ret = true;
1283 }
1284
1285 XRenderFreePicture (dpy, mask_pic);
1286 XRenderFreePicture (dpy, overlay_pic);
1287 XRenderFreePicture (dpy, back_pic);
1288# if DO_TIMING_TEST
1289 XSync (dpy, False);
1290# endif
1291# endif
1292 }
1293
1294 return ret;
1042} 1295}
1043 1296
1044/* make_transparency_pixmap() 1297/* make_transparency_pixmap()
1045 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1298 * 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 1299 * 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; 1318 unsigned int root_pmap_width, root_pmap_height;
1066 int window_width = target->szHint.width; 1319 int window_width = target->szHint.width;
1067 int window_height = target->szHint.height; 1320 int window_height = target->szHint.height;
1068 int sx, sy; 1321 int sx, sy;
1069 XGCValues gcv; 1322 XGCValues gcv;
1323 GC gc;
1070 1324
1071 TIMING_TEST_START (tp); 1325 TIMING_TEST_START (tp);
1072 target->get_window_origin (sx, sy); 1326 target->get_window_origin (sx, sy);
1073 1327
1074 /* check if we are outside of the visible part of the virtual screen : */ 1328 /* check if we are outside of the visible part of the virtual screen : */
… …
1076 || sx >= root_width || sy >= root_height) 1330 || sx >= root_width || sy >= root_height)
1077 return 0; 1331 return 0;
1078 1332
1079 if (root_pixmap != None) 1333 if (root_pixmap != None)
1080 { 1334 {
1081 /* we want to validate the pixmap and get it's size at the same time : */ 1335 /* we want to validate the pixmap and get its size at the same time : */
1082 int junk; 1336 int junk;
1083 unsigned int ujunk; 1337 unsigned int ujunk;
1084 /* root pixmap may be bad - allow a error */ 1338 /* root pixmap may be bad - allow a error */
1085 target->allowedxerror = -1; 1339 target->allowedxerror = -1;
1086 1340
… …
1088 root_pixmap = None; 1342 root_pixmap = None;
1089 1343
1090 target->allowedxerror = 0; 1344 target->allowedxerror = 0;
1091 } 1345 }
1092 1346
1347 if (root_pixmap == None)
1348 return 0;
1349
1093 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1350 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth);
1094 GC gc = NULL;
1095 1351
1096 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1352 if (tiled_root_pmap == None) /* something really bad happened - abort */
1097 return 0; 1353 return 0;
1098 1354
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 */ 1355 /* straightforward pixmap copy */
1157 gcv.tile = root_pixmap; 1356 gcv.tile = root_pixmap;
1158 gcv.fill_style = FillTiled; 1357 gcv.fill_style = FillTiled;
1159 1358
1160 while (sx < 0) sx += (int)root_width; 1359 while (sx < 0) sx += (int)root_width;
1161 while (sy < 0) sy += (int)root_height; 1360 while (sy < 0) sy += (int)root_height;
1162 1361
1163 gcv.ts_x_origin = -sx; 1362 gcv.ts_x_origin = -sx;
1164 gcv.ts_y_origin = -sy; 1363 gcv.ts_y_origin = -sy;
1165 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1364 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1166 1365
1167 if (gc) 1366 if (gc)
1168 { 1367 {
1169 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1368 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1170 result |= transpPmapTiled; 1369 result |= transpPmapTiled;
1171 } 1370 XFreeGC (dpy, gc);
1172 } 1371 }
1173 TIMING_TEST_PRINT_RESULT (tp); 1372 TIMING_TEST_PRINT_RESULT (tp);
1174 1373
1175 if (tiled_root_pmap != None) 1374 if (tiled_root_pmap != None)
1176 { 1375 {
1177 if (!need_client_side_rendering ()) 1376 if (!need_client_side_rendering ())
1178 { 1377 {
1179 if ((flags & tintNeeded)) 1378 if (flags & (blurNeeded | blurServerSide))
1379 {
1380 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height))
1381 result |= transpPmapBlurred;
1180 { 1382 }
1181 if (flags & tintWholesome) 1383 if (flags & (tintNeeded | tintServerSide))
1182 { 1384 {
1183 /* In this case we can tint image server-side getting significant 1385 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; 1386 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 } 1387 }
1280 } /* server side rendering completed */ 1388 } /* server side rendering completed */
1281 1389
1282 if (pixmap) 1390 if (pixmap)
1283 XFreePixmap (dpy, pixmap); 1391 XFreePixmap (dpy, pixmap);
… …
1286 pmap_width = window_width; 1394 pmap_width = window_width;
1287 pmap_height = window_height; 1395 pmap_height = window_height;
1288 pmap_depth = root_depth; 1396 pmap_depth = root_depth;
1289 } 1397 }
1290 1398
1291 if (gc)
1292 XFreeGC (dpy, gc);
1293
1294 TIMING_TEST_PRINT_RESULT (tp); 1399 TIMING_TEST_PRINT_RESULT (tp);
1295 1400
1296 return result; 1401 return result;
1297} 1402}
1298 1403
… …
1312 return false; 1417 return false;
1313} 1418}
1314# endif /* ENABLE_TRANSPARENCY */ 1419# endif /* ENABLE_TRANSPARENCY */
1315 1420
1316# ifndef HAVE_AFTERIMAGE 1421# ifndef HAVE_AFTERIMAGE
1317static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm); 1422static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm);
1318# endif 1423# endif
1319 1424
1320bool 1425bool
1321bgPixmap_t::render () 1426bgPixmap_t::render ()
1322{ 1427{
… …
1366 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1471 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1367 { 1472 {
1368 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1473 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1369 if (flags & tintSet) 1474 if (flags & tintSet)
1370 tint.get (c); 1475 tint.get (c);
1371 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1476 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b);
1372 } 1477 }
1373# endif 1478# endif
1374 1479
1375 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1480 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1376 1481
… …
1511/* taken from aterm-0.4.2 */ 1616/* taken from aterm-0.4.2 */
1512 1617
1513typedef uint32_t RUINT32T; 1618typedef uint32_t RUINT32T;
1514 1619
1515static void 1620static void
1516ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm) 1621ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm)
1517{ 1622{
1518 int sh_r, sh_g, sh_b; 1623 int sh_r, sh_g, sh_b;
1519 RUINT32T mask_r, mask_g, mask_b; 1624 RUINT32T mask_r, mask_g, mask_b;
1520 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1625 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1521 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1626 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1522 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1627 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1523 int i; 1628 int i;
1629 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1524 1630
1525 Visual *visual = term->visual;
1526
1527 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1631 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1528
1529 if (shade == 0)
1530 shade = 100;
1531 1632
1532 /* for convenience */ 1633 /* for convenience */
1533 mask_r = visual->red_mask; 1634 mask_r = visual->red_mask;
1534 mask_g = visual->green_mask; 1635 mask_g = visual->green_mask;
1535 mask_b = visual->blue_mask; 1636 mask_b = visual->blue_mask;
1536 1637
1537 /* boring lookup table pre-initialization */ 1638 /* boring lookup table pre-initialization */
1538 switch (srcImage->bits_per_pixel) { 1639 switch (srcImage->depth)
1640 {
1539 case 15: 1641 case 15:
1540 if ((mask_r != 0x7c00) || 1642 if ((mask_r != 0x7c00) ||
1541 (mask_g != 0x03e0) || 1643 (mask_g != 0x03e0) ||
1542 (mask_b != 0x001f)) 1644 (mask_b != 0x001f))
1543 return; 1645 return;
1544 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1646 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
1545 lookup_r = lookup; 1647 lookup_r = lookup;
1546 lookup_g = lookup+32; 1648 lookup_g = lookup+32;
1547 lookup_b = lookup+32+32; 1649 lookup_b = lookup+32+32;
1548 sh_r = 10; 1650 sh_r = 10;
1549 sh_g = 5; 1651 sh_g = 5;
1550 sh_b = 0; 1652 sh_b = 0;
1551 break; 1653 break;
1552 case 16: 1654 case 16:
1553 if ((mask_r != 0xf800) || 1655 if ((mask_r != 0xf800) ||
1554 (mask_g != 0x07e0) || 1656 (mask_g != 0x07e0) ||
1555 (mask_b != 0x001f)) 1657 (mask_b != 0x001f))
1556 return; 1658 return;
1557 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1659 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
1558 lookup_r = lookup; 1660 lookup_r = lookup;
1559 lookup_g = lookup+32; 1661 lookup_g = lookup+32;
1560 lookup_b = lookup+32+64; 1662 lookup_b = lookup+32+64;
1561 sh_r = 11; 1663 sh_r = 11;
1562 sh_g = 5; 1664 sh_g = 5;
1563 sh_b = 0; 1665 sh_b = 0;
1564 break; 1666 break;
1565 case 24: 1667 case 24:
1566 if ((mask_r != 0xff0000) || 1668 if ((mask_r != 0xff0000) ||
1567 (mask_g != 0x00ff00) || 1669 (mask_g != 0x00ff00) ||
1568 (mask_b != 0x0000ff)) 1670 (mask_b != 0x0000ff))
1569 return; 1671 return;
1570 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1672 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
1571 lookup_r = lookup; 1673 lookup_r = lookup;
1572 lookup_g = lookup+256; 1674 lookup_g = lookup+256;
1573 lookup_b = lookup+256+256; 1675 lookup_b = lookup+256+256;
1574 sh_r = 16; 1676 sh_r = 16;
1575 sh_g = 8; 1677 sh_g = 8;
1576 sh_b = 0; 1678 sh_b = 0;
1577 break; 1679 break;
1578 case 32: 1680 case 32:
1579 if ((mask_r != 0xff0000) || 1681 if ((mask_r != 0xff0000) ||
1580 (mask_g != 0x00ff00) || 1682 (mask_g != 0x00ff00) ||
1581 (mask_b != 0x0000ff)) 1683 (mask_b != 0x0000ff))
1582 return; 1684 return;
1583 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1685 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
1584 lookup_r = lookup; 1686 lookup_r = lookup;
1585 lookup_g = lookup+256; 1687 lookup_g = lookup+256;
1586 lookup_b = lookup+256+256; 1688 lookup_b = lookup+256+256;
1587 sh_r = 16; 1689 sh_r = 16;
1588 sh_g = 8; 1690 sh_g = 8;
1589 sh_b = 0; 1691 sh_b = 0;
1590 break; 1692 break;
1591 default: 1693 default:
1592 return; /* we do not support this color depth */ 1694 return; /* we do not support this color depth */
1593 } 1695 }
1594 1696
1595 /* prepare limits for color transformation (each channel is handled separately) */ 1697 /* prepare limits for color transformation (each channel is handled separately) */
1596 if (shade < 0) { 1698 if (shade > 100)
1699 {
1597 shade = -shade; 1700 shade = 200 - shade;
1598 if (shade < 0) shade = 0;
1599 if (shade > 100) shade = 100;
1600 1701
1601 lower_lim_r = 65535-rm; 1702 lower_lim_r = 65535-rm;
1602 lower_lim_g = 65535-gm; 1703 lower_lim_g = 65535-gm;
1603 lower_lim_b = 65535-bm; 1704 lower_lim_b = 65535-bm;
1604 1705
1605 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1706 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
1606 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1707 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
1607 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1708 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
1608 1709
1609 upper_lim_r = upper_lim_g = upper_lim_b = 65535; 1710 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1711 }
1610 } else { 1712 else
1611 if (shade < 0) shade = 0; 1713 {
1612 if (shade > 100) shade = 100;
1613 1714
1614 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1715 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1615 1716
1616 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100); 1717 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1617 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100); 1718 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1618 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100); 1719 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1619 } 1720 }
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 1721
1635 /* fill our lookup tables */ 1722 /* fill our lookup tables */
1636 for (i = 0; i <= mask_r>>sh_r; i++) 1723 for (i = 0; i <= mask_r>>sh_r; i++)
1637 { 1724 {
1638 RUINT32T tmp; 1725 RUINT32T tmp;
1639 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1726 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
1640 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1727 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
1641 lookup_r[i] = (tmp/65535)<<sh_r; 1728 lookup_r[i] = (tmp/65535)<<sh_r;
1642 } 1729 }
1643 for (i = 0; i <= mask_g>>sh_g; i++) 1730 for (i = 0; i <= mask_g>>sh_g; i++)
1644 { 1731 {
1645 RUINT32T tmp; 1732 RUINT32T tmp;
1646 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1733 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
1647 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1734 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
1648 lookup_g[i] = (tmp/65535)<<sh_g; 1735 lookup_g[i] = (tmp/65535)<<sh_g;
1649 } 1736 }
1650 for (i = 0; i <= mask_b>>sh_b; i++) 1737 for (i = 0; i <= mask_b>>sh_b; i++)
1651 { 1738 {
1652 RUINT32T tmp; 1739 RUINT32T tmp;
1653 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1740 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
1654 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1741 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
1655 lookup_b[i] = (tmp/65535)<<sh_b; 1742 lookup_b[i] = (tmp/65535)<<sh_b;
1656 } 1743 }
1657 1744
1658 /* apply table to input image (replacing colors by newly calculated ones) */ 1745 /* apply table to input image (replacing colors by newly calculated ones) */
1659 switch (srcImage->bits_per_pixel) 1746 if (srcImage->bits_per_pixel == 32
1660 { 1747 && (srcImage->depth == 24 || srcImage->depth == 32)
1661 case 15: 1748 && srcImage->byte_order == host_byte_order)
1662 {
1663 unsigned short *p1, *pf, *p, *pl;
1664 p1 = (unsigned short *) srcImage->data;
1665 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1666 while (p1 < pf)
1667 {
1668 p = p1;
1669 pl = p1 + srcImage->width;
1670 for (; p < pl; p++)
1671 {
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 { 1749 {
1720 RUINT32T *p1, *pf, *p, *pl; 1750 RUINT32T *p1, *pf, *p, *pl;
1721 p1 = (RUINT32T *) srcImage->data; 1751 p1 = (RUINT32T *) srcImage->data;
1722 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1752 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1723 1753
1724 while (p1 < pf) 1754 while (p1 < pf)
1725 { 1755 {
1726 p = p1; 1756 p = p1;
1727 pl = p1 + srcImage->width; 1757 pl = p1 + srcImage->width;
1728 for (; p < pl; p++) 1758 for (; p < pl; p++)
1729 { 1759 {
1730 *p = lookup_r[(*p & 0xff0000)>>16] | 1760 *p = lookup_r[(*p & 0xff0000) >> 16] |
1731 lookup_g[(*p & 0x00ff00)>> 8] | 1761 lookup_g[(*p & 0x00ff00) >> 8] |
1732 lookup_b[(*p & 0x0000ff)] | 1762 lookup_b[(*p & 0x0000ff)] |
1733 (*p & ~0xffffff); 1763 (*p & 0xff000000);
1734 } 1764 }
1735 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line); 1765 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1736 } 1766 }
1737 break; 1767 }
1768 else
1738 } 1769 {
1770 for (int y = 0; y < srcImage->height; y++)
1771 for (int x = 0; x < srcImage->width; x++)
1772 {
1773 unsigned long pixel = XGetPixel (srcImage, x, y);
1774 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1775 lookup_g[(pixel & mask_g) >> sh_g] |
1776 lookup_b[(pixel & mask_b) >> sh_b];
1777 XPutPixel (srcImage, x, y, pixel);
1778 }
1739 } 1779 }
1740 1780
1741 free (lookup); 1781 free (lookup);
1742} 1782}
1743#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1783#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */

Diff Legend

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