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.58 by sf-exg, Fri Sep 3 22:57:31 2010 UTC vs.
Revision 1.116 by sf-exg, Thu Nov 11 11:58:10 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 */
28
29#if XRENDER
30# include <X11/extensions/Xrender.h>
31#endif
26 32
27#define DO_TIMING_TEST 0 33#define DO_TIMING_TEST 0
28 34
29#if DO_TIMING_TEST 35#if DO_TIMING_TEST
30# include <sys/time.h> 36# include <sys/time.h>
… …
104#ifdef BG_IMAGE_FROM_FILE 110#ifdef BG_IMAGE_FROM_FILE
105 have_image = false; 111 have_image = false;
106 h_scale = v_scale = 0; 112 h_scale = v_scale = 0;
107 h_align = v_align = 0; 113 h_align = v_align = 0;
108#endif 114#endif
115#ifdef ENABLE_TRANSPARENCY
116 shade = 100;
117#endif
109 flags = 0; 118 flags = 0;
110 pixmap = None; 119 pixmap = None;
111 valid_since = invalid_since = 0; 120 valid_since = invalid_since = 0;
112 target = 0; 121 target = 0;
113} 122}
… …
138# endif 147# endif
139 148
140# ifdef BG_IMAGE_FROM_FILE 149# ifdef BG_IMAGE_FROM_FILE
141 if (have_image) 150 if (have_image)
142 { 151 {
143 if (h_scale != 0 || v_scale != 0 152 if (flags & sizeSensitive)
144 || h_align != 0 || v_align != 0)
145 return true; 153 return true;
146 } 154 }
147# endif 155# endif
148 156
149 return false; 157 return false;
… …
158# endif 166# endif
159 167
160# ifdef BG_IMAGE_FROM_FILE 168# ifdef BG_IMAGE_FROM_FILE
161 if (have_image) 169 if (have_image)
162 { 170 {
163 if (h_align == rootAlign || v_align == rootAlign) 171 if (flags & rootAlign)
164 return true; 172 return true;
165 } 173 }
166# endif 174# endif
167 175
168 return false; 176 return false;
… …
172{ 180{
173# ifdef HAVE_AFTERIMAGE 181# ifdef HAVE_AFTERIMAGE
174 if (original_asim) 182 if (original_asim)
175 return true; 183 return true;
176# endif 184# 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; 185 return false;
189} 186}
190 187
191# ifdef BG_IMAGE_FROM_FILE 188# ifdef BG_IMAGE_FROM_FILE
192static inline bool 189static inline bool
… …
208static inline bool 205static inline bool
209check_set_align_value (int geom_flags, int flag, int &align, int new_value) 206check_set_align_value (int geom_flags, int flag, int &align, int new_value)
210{ 207{
211 if (geom_flags & flag) 208 if (geom_flags & flag)
212 { 209 {
213 if (new_value != bgPixmap_t::rootAlign)
214 {
215 if (new_value < -100) 210 if (new_value < -100)
216 new_value = -100; 211 new_value = -100;
217 else if (new_value > 200) 212 else if (new_value > 200)
218 new_value = 200; 213 new_value = 200;
219 }
220 if (new_value != align) 214 if (new_value != align)
221 { 215 {
222 align = new_value; 216 align = new_value;
223 return true; 217 return true;
224 } 218 }
… …
230make_align_position (int align, int window_size, int image_size) 224make_align_position (int align, int window_size, int image_size)
231{ 225{
232 int diff = window_size - image_size; 226 int diff = window_size - image_size;
233 int smaller = min (image_size, window_size); 227 int smaller = min (image_size, window_size);
234 228
235 if (align >= 0 && align <= 50) 229 if (align >= 0 && align <= 100)
236 return diff * align / 100; 230 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 ) 231 else if (align > 100 && align <= 200)
240 return ((align - 100) * smaller / 100) + window_size - smaller; 232 return ((align - 100) * smaller / 100) + window_size - smaller;
241 else if (align > -100 && align < 0) 233 else if (align >= -100 && align < 0)
242 return ((align + 100) * smaller / 100) - image_size; 234 return ((align + 100) * smaller / 100) - image_size;
243 return 0; 235 return 0;
244} 236}
245 237
246static inline int 238static inline int
247make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 239make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
248{ 240{
249 int src_pos = 0; 241 int src_pos = 0;
250 dst_pos = 0; 242 dst_pos = pos;
251 dst_size = size; 243 dst_size = size;
252 if (pos < 0 && size > target_size) 244 if (pos < 0)
253 { 245 {
254 src_pos = -pos; 246 src_pos = -pos;
247 dst_pos = 0;
255 dst_size += pos; 248 dst_size += pos;
256 } 249 }
257 else if (pos > 0)
258 dst_pos = pos;
259 250
260 if (dst_pos + dst_size > target_size) 251 if (dst_pos + dst_size > target_size)
261 dst_size = target_size - dst_pos; 252 dst_size = target_size - dst_pos;
262 return src_pos; 253 return src_pos;
263} 254}
264 255
265bool 256bool
266bgPixmap_t::set_geometry (const char *geom) 257bgPixmap_t::set_geometry (const char *geom)
267{ 258{
259 bool changed = false;
268 int geom_flags = 0, changed = 0; 260 int geom_flags = 0;
269 int x = 0, y = 0; 261 int x = 0, y = 0;
270 unsigned int w = 0, h = 0; 262 unsigned int w = 0, h = 0;
271 unsigned int n; 263 unsigned int n;
272 unsigned long new_flags = (flags & (~geometryFlags)); 264 unsigned long new_flags = (flags & (~geometryFlags));
273 const char *p; 265 const char *p;
… …
388 w = h = noScale; 380 w = h = noScale;
389 geom_flags |= WidthValue|HeightValue; 381 geom_flags |= WidthValue|HeightValue;
390 } 382 }
391 else if (CHECK_GEOM_OPS ("propscale")) 383 else if (CHECK_GEOM_OPS ("propscale"))
392 { 384 {
393 if (w == 0 && h == 0)
394 {
395 w = windowScale;
396 geom_flags |= WidthValue;
397 }
398 new_flags |= propScale; 385 new_flags |= propScale;
399 } 386 }
400 else if (CHECK_GEOM_OPS ("hscale")) 387 else if (CHECK_GEOM_OPS ("hscale"))
401 { 388 {
402 if (w == 0) w = windowScale; 389 if (w == 0) w = windowScale;
… …
424 x = y = centerAlign; 411 x = y = centerAlign;
425 geom_flags |= WidthValue|HeightValue|XValue|YValue; 412 geom_flags |= WidthValue|HeightValue|XValue|YValue;
426 } 413 }
427 else if (CHECK_GEOM_OPS ("root")) 414 else if (CHECK_GEOM_OPS ("root"))
428 { 415 {
416 new_flags |= rootAlign;
429 w = h = noScale; 417 w = h = noScale;
430 x = y = rootAlign;
431 geom_flags |= WidthValue|HeightValue|XValue|YValue; 418 geom_flags |= WidthValue|HeightValue;
432 } 419 }
433# undef CHECK_GEOM_OPS 420# undef CHECK_GEOM_OPS
434 421
435 while (*ops != ':' && *ops != '\0') ++ops; 422 while (*ops != ':' && *ops != '\0') ++ops;
436 } /* done parsing ops */ 423 } /* done parsing ops */
437 } 424 }
438 425
439 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed; 426 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
440 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed; 427 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
441 if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed; 428 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
442 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed; 429 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
443 } 430 }
444 431
445 if (new_flags != flags) 432 if (new_flags != flags)
446 { 433 {
447 flags = new_flags; 434 flags = new_flags;
448 changed++; 435 changed = true;
449 } 436 }
450 437
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); 438 return changed;
439}
440
441void
442bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
443{
444 int target_width = target->szHint.width;
445 int target_height = target->szHint.height;
446
447 if (flags & propScale)
448 {
449 float scale = (float)target_width / image_width;
450 min_it (scale, (float)target_height / image_height);
451 w = image_width * scale + 0.5;
452 h = image_height * scale + 0.5;
453 }
454 else
455 {
456 w = h_scale * target_width / 100;
457 h = v_scale * target_height / 100;
458 }
459
460 if (!w) w = image_width;
461 if (!h) h = image_height;
462
463 if (flags & rootAlign)
464 {
465 target->get_window_origin (x, y);
466 x = -x;
467 y = -y;
468 }
469 else
470 {
471 x = make_align_position (h_align, target_width, w);
472 y = make_align_position (v_align, target_height, h);
473 }
474
475 flags &= ~sizeSensitive;
476 if ((flags & propScale) || h_scale || v_scale
477 || (!(flags & rootAlign) && (h_align || v_align))
478 || w > target_width || h > target_height)
479 flags |= sizeSensitive;
454} 480}
455 481
456# ifdef HAVE_AFTERIMAGE 482# ifdef HAVE_AFTERIMAGE
457bool 483bool
458bgPixmap_t::render_image (unsigned long background_flags) 484bgPixmap_t::render_image (unsigned long background_flags)
… …
470 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); 496 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
471 497
472 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 498 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
473 { 499 {
474 ShadingInfo as_shade; 500 ShadingInfo as_shade;
475 as_shade.shading = (shade == 0) ? 100 : shade; 501 as_shade.shading = shade;
476 502
477 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 503 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
478 if (flags & tintSet) 504 if (flags & tintSet)
479 tint.get (c); 505 tint.get (c);
480 as_shade.tintColor.red = c.r; 506 as_shade.tintColor.red = c.r;
… …
482 as_shade.tintColor.blue = c.b; 508 as_shade.tintColor.blue = c.b;
483 509
484 background_tint = shading2tint32 (&as_shade); 510 background_tint = shading2tint32 (&as_shade);
485 } 511 }
486 512
487 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL) 513 if (!(background_flags & transpPmapBlurred) && (flags & blurNeeded) && background != NULL)
488 { 514 {
489 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 515 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, 516 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
491 100, ASIMAGE_QUALITY_DEFAULT); 517 100, ASIMAGE_QUALITY_DEFAULT);
492 if (tmp) 518 if (tmp)
… …
504 int new_pmap_width = target_width; 530 int new_pmap_width = target_width;
505 int new_pmap_height = target_height; 531 int new_pmap_height = target_height;
506 532
507 int x = 0; 533 int x = 0;
508 int y = 0; 534 int y = 0;
509 int w = h_scale * target_width / 100; 535 int w = 0;
510 int h = v_scale * target_height / 100; 536 int h = 0;
511
512 TIMING_TEST_START (asim);
513 537
514 if (original_asim) 538 if (original_asim)
515 { 539 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 540
530 if (!original_asim 541 if (!original_asim
542 || (!(flags & rootAlign)
531 || x >= target_width 543 && (x >= target_width
532 || y >= target_height 544 || y >= target_height
533 || (w > 0 && x + w <= 0) 545 || (x + w <= 0)
534 || (h > 0 && y + h <= 0)) 546 || (y + h <= 0))))
535 { 547 {
536 if (background) 548 if (background)
537 { 549 {
538 new_pmap_width = background->width; 550 new_pmap_width = background->width;
539 new_pmap_height = background->height; 551 new_pmap_height = background->height;
… …
553 } 565 }
554 else 566 else
555 { 567 {
556 result = original_asim; 568 result = original_asim;
557 569
558 if ((w > 0 && w != original_asim->width) 570 if ((w != original_asim->width)
559 || (h > 0 && h != original_asim->height)) 571 || (h != original_asim->height))
560 { 572 {
561 result = scale_asimage (target->asv, original_asim, 573 result = scale_asimage (target->asv, original_asim,
562 w > 0 ? w : original_asim->width, 574 w, h,
563 h > 0 ? h : original_asim->height,
564 background ? ASA_ASImage : ASA_XImage, 575 background ? ASA_ASImage : ASA_XImage,
565 100, ASIMAGE_QUALITY_DEFAULT); 576 100, ASIMAGE_QUALITY_DEFAULT);
566 } 577 }
567 578
568 if (background == NULL) 579 if (background == NULL)
… …
600 layers[0].clip_width = target_width; 611 layers[0].clip_width = target_width;
601 layers[0].clip_height = target_height; 612 layers[0].clip_height = target_height;
602 layers[0].tint = background_tint; 613 layers[0].tint = background_tint;
603 layers[1].im = result; 614 layers[1].im = result;
604 615
605 if (w <= 0) 616 if (h_scale == 0 || v_scale == 0)
606 { 617 {
607 /* tile horizontally */ 618 /* tile horizontally */
608 while (x > 0) x -= (int)result->width; 619 while (x > 0) x -= (int)result->width;
609 layers[1].dst_x = x; 620 layers[1].dst_x = x;
610 layers[1].clip_width = result->width+target_width; 621 layers[1].clip_width = result->width+target_width;
… …
614 /* clip horizontally */ 625 /* clip horizontally */
615 layers[1].dst_x = x; 626 layers[1].dst_x = x;
616 layers[1].clip_width = result->width; 627 layers[1].clip_width = result->width;
617 } 628 }
618 629
619 if (h <= 0) 630 if (h_scale == 0 || v_scale == 0)
620 { 631 {
621 while (y > 0) y -= (int)result->height; 632 while (y > 0) y -= (int)result->height;
622 layers[1].dst_y = y; 633 layers[1].dst_y = y;
623 layers[1].clip_height = result->height + target_height; 634 layers[1].clip_height = result->height + target_height;
624 } 635 }
… …
647 } 658 }
648 659
649 free (layers); 660 free (layers);
650 } 661 }
651 } 662 }
652 TIMING_TEST_PRINT_RESULT (asim);
653 663
654 bool ret = false; 664 bool ret = false;
655 665
656 if (result) 666 if (result)
657 { 667 {
658 XGCValues gcv; 668 XGCValues gcv;
659 GC gc; 669 GC gc;
660 670
661 if (pixmap)
662 {
663 if (pmap_width != new_pmap_width
664 || pmap_height != new_pmap_height
665 || pmap_depth != target->depth)
666 {
667 XFreePixmap (target->dpy, pixmap);
668 pixmap = None;
669 }
670 }
671
672 /* create Pixmap */ 671 /* create Pixmap */
673 if (pixmap == None) 672 if (pixmap == None
673 || pmap_width != new_pmap_width
674 || pmap_height != new_pmap_height
675 || pmap_depth != target->depth)
674 { 676 {
677 if (pixmap)
678 XFreePixmap (target->dpy, pixmap);
675 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 679 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
676 pmap_width = new_pmap_width; 680 pmap_width = new_pmap_width;
677 pmap_height = new_pmap_height; 681 pmap_height = new_pmap_height;
678 pmap_depth = target->depth; 682 pmap_depth = target->depth;
679 } 683 }
… …
703 707
704 if (result != background && result != original_asim) 708 if (result != background && result != original_asim)
705 destroy_asimage (&result); 709 destroy_asimage (&result);
706 710
707 XFreeGC (target->dpy, gc); 711 XFreeGC (target->dpy, gc);
708 TIMING_TEST_PRINT_RESULT (asim);
709 712
710 ret = true; 713 ret = true;
711 } 714 }
712 715
713 if (background) 716 if (background)
… …
725 return false; 728 return false;
726 729
727 if (!pixbuf) 730 if (!pixbuf)
728 return false; 731 return false;
729 732
730 // TODO: add alpha blending
731 if (background_flags) 733 if (background_flags
734 && !(flags & HAS_RENDER))
732 return false; 735 return false;
733 736
734 GdkPixbuf *result; 737 GdkPixbuf *result;
735 738
736 int image_width = gdk_pixbuf_get_width (pixbuf); 739 int image_width = gdk_pixbuf_get_width (pixbuf);
… …
741 int new_pmap_width = target_width; 744 int new_pmap_width = target_width;
742 int new_pmap_height = target_height; 745 int new_pmap_height = target_height;
743 746
744 int x = 0; 747 int x = 0;
745 int y = 0; 748 int y = 0;
746 int w = h_scale * target_width / 100; 749 int w = 0;
747 int h = v_scale * target_height / 100; 750 int h = 0;
748 751
749 if (h_align == rootAlign || v_align == rootAlign) 752 get_image_geometry (image_width, image_height, w, h, x, y);
750 {
751 target->get_window_origin (x, y);
752 x = -x;
753 y = -y;
754 }
755 753
756 if (h_align != rootAlign) 754 if (!(flags & rootAlign)
757 x = make_align_position (h_align, target_width, w > 0 ? w : image_width);
758
759 if (v_align != rootAlign)
760 y = make_align_position (v_align, target_height, h > 0 ? h : image_height);
761
762 if (x >= target_width 755 && (x >= target_width
763 || y >= target_height 756 || y >= target_height
764 || (w > 0 && x + w <= 0) 757 || (x + w <= 0)
765 || (h > 0 && y + h <= 0)) 758 || (y + h <= 0)))
766 return false; 759 return false;
767 760
768 result = pixbuf; 761 result = pixbuf;
769 762
770 if ((w > 0 && w != image_width) 763 if ((w != image_width)
771 || (h > 0 && h != image_height)) 764 || (h != image_height))
772 { 765 {
773 result = gdk_pixbuf_scale_simple (pixbuf, 766 result = gdk_pixbuf_scale_simple (pixbuf,
774 w > 0 ? w : image_width, 767 w, h,
775 h > 0 ? h : image_height,
776 GDK_INTERP_BILINEAR); 768 GDK_INTERP_BILINEAR);
777 } 769 }
778 770
779 bool ret = false; 771 bool ret = false;
780 772
781 if (result) 773 if (result)
782 { 774 {
783 XGCValues gcv; 775 XGCValues gcv;
784 GC gc; 776 GC gc;
777 Pixmap root_pmap;
785 778
786 image_width = gdk_pixbuf_get_width (result); 779 image_width = gdk_pixbuf_get_width (result);
787 image_height = gdk_pixbuf_get_height (result); 780 image_height = gdk_pixbuf_get_height (result);
788 781
782 if (background_flags)
783 {
784 root_pmap = pixmap;
785 pixmap = None;
786 }
787 else
788 {
789 if (h_scale == 0 || v_scale == 0) 789 if (h_scale == 0 || v_scale == 0)
790 { 790 {
791 new_pmap_width = min (image_width, target_width); 791 new_pmap_width = min (image_width, target_width);
792 new_pmap_height = min (image_height, target_height); 792 new_pmap_height = min (image_height, target_height);
793 }
794
795 if (pixmap)
796 {
797 if (pmap_width != new_pmap_width
798 || pmap_height != new_pmap_height
799 || pmap_depth != target->depth)
800 { 793 }
801 XFreePixmap (target->dpy, pixmap);
802 pixmap = None;
803 } 794 }
804 }
805 795
806 if (pixmap == None) 796 if (pixmap == None
797 || pmap_width != new_pmap_width
798 || pmap_height != new_pmap_height
799 || pmap_depth != target->depth)
807 { 800 {
801 if (pixmap)
802 XFreePixmap (target->dpy, pixmap);
808 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 803 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
809 pmap_width = new_pmap_width; 804 pmap_width = new_pmap_width;
810 pmap_height = new_pmap_height; 805 pmap_height = new_pmap_height;
811 pmap_depth = target->depth; 806 pmap_depth = target->depth;
812 } 807 }
… …
853 dst_width, dst_height, 848 dst_width, dst_height,
854 XLIB_RGB_DITHER_NONE, 849 XLIB_RGB_DITHER_NONE,
855 0, 0); 850 0, 0);
856 } 851 }
857 852
853#if XRENDER
854 if (background_flags)
855 {
856 Display *dpy = target->dpy;
857 XRenderPictureAttributes pa;
858
859 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, target->visual);
860 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
861
862 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
863 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
864
865 pa.repeat = True;
866 Pixmap mask_pmap = XCreatePixmap (dpy, target->vt, 1, 1, 8);
867 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
868 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
869 XFreePixmap (dpy, mask_pmap);
870
871 if (src && dst && mask)
872 {
873 XRenderColor mask_c;
874
875 mask_c.alpha = 0x8000;
876 mask_c.red = 0;
877 mask_c.green = 0;
878 mask_c.blue = 0;
879 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
880 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
881 }
882
883 XRenderFreePicture (dpy, src);
884 XRenderFreePicture (dpy, dst);
885 XRenderFreePicture (dpy, mask);
886
887 XFreePixmap (dpy, root_pmap);
888 }
889#endif
890
858 if (result != pixbuf) 891 if (result != pixbuf)
859 g_object_unref (result); 892 g_object_unref (result);
860 893
861 XFreeGC (target->dpy, gc); 894 XFreeGC (target->dpy, gc);
862 895
… …
868# endif /* HAVE_PIXBUF */ 901# endif /* HAVE_PIXBUF */
869 902
870bool 903bool
871bgPixmap_t::set_file (const char *file) 904bgPixmap_t::set_file (const char *file)
872{ 905{
873 assert (file); 906 if (!file || !*file)
907 return false;
874 908
875 if (*file)
876 {
877 if (const char *p = strchr (file, ';')) 909 if (const char *p = strchr (file, ';'))
878 { 910 {
879 size_t len = p - file; 911 size_t len = p - file;
880 char *f = rxvt_temp_buf<char> (len + 1); 912 char *f = rxvt_temp_buf<char> (len + 1);
881 memcpy (f, file, len); 913 memcpy (f, file, len);
882 f[len] = '\0'; 914 f[len] = '\0';
883 file = f; 915 file = f;
884 } 916 }
885 917
886# ifdef HAVE_AFTERIMAGE 918# ifdef HAVE_AFTERIMAGE
887 if (!target->asimman) 919 if (!target->asimman)
888 target->asimman = create_generic_imageman (target->rs[Rs_path]); 920 target->asimman = create_generic_imageman (target->rs[Rs_path]);
889 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 921 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
922 if (image)
923 {
890 if (original_asim) 924 if (original_asim)
925 safe_asimage_destroy (original_asim);
926 original_asim = image;
891 have_image = true; 927 have_image = true;
892 return have_image; 928 return true;
929 }
893# endif 930# endif
894 931
895# ifdef HAVE_PIXBUF 932# ifdef HAVE_PIXBUF
896 pixbuf = gdk_pixbuf_new_from_file (file, NULL); 933 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
934 if (image)
935 {
897 if (pixbuf) 936 if (pixbuf)
937 g_object_unref (pixbuf);
938 pixbuf = image;
898 have_image = true; 939 have_image = true;
899 return have_image; 940 return true;
941 }
900# endif 942# endif
901 }
902 943
903 return false; 944 return false;
904} 945}
905 946
906# endif /* BG_IMAGE_FROM_FILE */ 947# endif /* BG_IMAGE_FROM_FILE */
… …
919} 960}
920 961
921bool 962bool
922bgPixmap_t::set_blur_radius (const char *geom) 963bgPixmap_t::set_blur_radius (const char *geom)
923{ 964{
924 int changed = 0; 965 bool changed = false;
925 unsigned int hr, vr; 966 unsigned int hr, vr;
926 int junk; 967 int junk;
927 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 968 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
928 969
929 if (!(geom_flags & WidthValue)) 970 if (!(geom_flags & WidthValue))
930 hr = 1; 971 hr = 1;
931 if (!(geom_flags & HeightValue)) 972 if (!(geom_flags & HeightValue))
932 vr = hr; 973 vr = hr;
933 974
975 min_it (hr, 128);
976 min_it (vr, 128);
977
934 if (h_blurRadius != hr) 978 if (h_blurRadius != hr)
935 { 979 {
936 ++changed; 980 changed = true;
937 h_blurRadius = hr; 981 h_blurRadius = hr;
938 } 982 }
939 983
940 if (v_blurRadius != vr) 984 if (v_blurRadius != vr)
941 { 985 {
942 ++changed; 986 changed = true;
943 v_blurRadius = vr; 987 v_blurRadius = vr;
944 } 988 }
945 989
946 if (v_blurRadius == 0 && h_blurRadius == 0) 990 if (v_blurRadius == 0 && h_blurRadius == 0)
947 flags &= ~blurNeeded; 991 flags &= ~blurNeeded;
948 else 992 else
949 flags |= blurNeeded; 993 flags |= blurNeeded;
950 994
951 return (changed > 0); 995 return changed;
952} 996}
953 997
954static inline unsigned long 998static inline unsigned long
955compute_tint_shade_flags (rxvt_color *tint, int shade) 999compute_tint_shade_flags (rxvt_color *tint, int shade)
956{ 1000{
957 unsigned long flags = 0; 1001 unsigned long flags = 0;
958 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1002 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
959 bool has_shade = (shade > 0 && shade < 100) || (shade > 100 && shade < 200); 1003 bool has_shade = shade != 100;
960 1004
961 if (tint) 1005 if (tint)
962 { 1006 {
963 tint->get (c); 1007 tint->get (c);
964# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 1008# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
… …
978 { 1022 {
979 flags |= bgPixmap_t::tintNeeded; 1023 flags |= bgPixmap_t::tintNeeded;
980 } 1024 }
981 } 1025 }
982 1026
983 if (flags & bgPixmap_t::tintNeeded)
984 {
985 if (flags & bgPixmap_t::tintWholesome)
986 flags |= bgPixmap_t::tintServerSide;
987 else
988 {
989#if XFT
990 flags |= bgPixmap_t::tintServerSide;
991#endif
992 }
993 }
994
995 return flags; 1027 return flags;
996} 1028}
997 1029
998bool 1030bool
999bgPixmap_t::set_tint (rxvt_color &new_tint) 1031bgPixmap_t::set_tint (rxvt_color &new_tint)
1000{ 1032{
1001 if (tint != new_tint) 1033 if (!(flags & tintSet) || tint != new_tint)
1002 { 1034 {
1003 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1035 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
1004 tint = new_tint; 1036 tint = new_tint;
1005 flags = (flags & ~tintFlags) | new_flags | tintSet; 1037 flags = (flags & ~tintFlags) | new_flags | tintSet;
1006 return true; 1038 return true;
… …
1024} 1056}
1025 1057
1026bool 1058bool
1027bgPixmap_t::set_shade (const char *shade_str) 1059bgPixmap_t::set_shade (const char *shade_str)
1028{ 1060{
1029 int new_shade = (shade_str) ? atoi (shade_str) : 0; 1061 int new_shade = (shade_str) ? atoi (shade_str) : 100;
1030 1062
1031 if (new_shade < 0 && new_shade > -100) 1063 clamp_it (new_shade, -100, 200);
1064 if (new_shade < 0)
1032 new_shade = 200 - (100 + new_shade); 1065 new_shade = 200 - (100 + new_shade);
1033 else if (new_shade == 100)
1034 new_shade = 0;
1035 1066
1036 if (new_shade != shade) 1067 if (new_shade != shade)
1037 { 1068 {
1038 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 1069 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
1039 shade = new_shade; 1070 shade = new_shade;
… …
1042 } 1073 }
1043 1074
1044 return false; 1075 return false;
1045} 1076}
1046 1077
1078#if XRENDER
1079static void
1080get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1081{
1082 double sigma = radius / 2.0;
1083 double scale = sqrt (2.0 * M_PI) * sigma;
1084 double sum = 0.0;
1085
1086 for (int i = 0; i < width; i++)
1087 {
1088 double x = i - width / 2;
1089 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1090 sum += kernel[i];
1091 }
1092
1093 params[0] = XDoubleToFixed (width);
1094 params[1] = XDoubleToFixed (1);
1095
1096 for (int i = 0; i < width; i++)
1097 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1098}
1099#endif
1100
1101bool
1102bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1103{
1104 bool ret = false;
1105#if XRENDER
1106 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1107 double *kernel = (double *)malloc (size * sizeof (double));
1108 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1109
1110 Display *dpy = target->dpy;
1111 XRenderPictureAttributes pa;
1112 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1113
1114 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1115 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1116
1117 if (kernel && params && src && dst)
1118 {
1119 if (h_blurRadius)
1120 {
1121 size = h_blurRadius * 2 + 1;
1122 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1123
1124 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1125 XRenderComposite (dpy,
1126 PictOpSrc,
1127 src,
1128 None,
1129 dst,
1130 0, 0,
1131 0, 0,
1132 0, 0,
1133 width, height);
1134 }
1135
1136 if (v_blurRadius)
1137 {
1138 size = v_blurRadius * 2 + 1;
1139 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1140 swap (params[0], params[1]);
1141
1142 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1143 XRenderComposite (dpy,
1144 PictOpSrc,
1145 src,
1146 None,
1147 dst,
1148 0, 0,
1149 0, 0,
1150 0, 0,
1151 width, height);
1152 }
1153
1154 ret = true;
1155 }
1156
1157 free (kernel);
1158 free (params);
1159 XRenderFreePicture (dpy, src);
1160 XRenderFreePicture (dpy, dst);
1161#endif
1162 return ret;
1163}
1164
1165bool
1166bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1167{
1168 Display *dpy = target->dpy;
1169 bool ret = false;
1170
1171 if (flags & tintWholesome)
1172 {
1173 XGCValues gcv;
1174 GC gc;
1175
1176 /* In this case we can tint image server-side getting significant
1177 * performance improvements, as we eliminate XImage transfer
1178 */
1179 gcv.foreground = Pixel (tint);
1180 gcv.function = GXand;
1181 gcv.fill_style = FillSolid;
1182 gc = XCreateGC (dpy, pixmap, GCFillStyle | GCForeground | GCFunction, &gcv);
1183 if (gc)
1184 {
1185 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1186 ret = true;
1187 XFreeGC (dpy, gc);
1188 }
1189 }
1190 else
1191 {
1192# if XRENDER
1193 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1194
1195 if (flags & tintSet)
1196 tint.get (c);
1197
1198 if (shade <= 100)
1199 {
1200 c.r = (c.r * shade) / 100;
1201 c.g = (c.g * shade) / 100;
1202 c.b = (c.b * shade) / 100;
1203 }
1204 else
1205 {
1206 c.r = ((0xffff - c.r) * (200 - shade)) / 100;
1207 c.g = ((0xffff - c.g) * (200 - shade)) / 100;
1208 c.b = ((0xffff - c.b) * (200 - shade)) / 100;
1209 }
1210
1211 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1212 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1213 XRenderPictureAttributes pa;
1214
1215 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1216
1217 pa.repeat = True;
1218
1219 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1220 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1221 XFreePixmap (dpy, overlay_pmap);
1222
1223 pa.component_alpha = True;
1224 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1225 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1226 XFreePixmap (dpy, mask_pmap);
1227
1228 if (mask_pic && overlay_pic && back_pic)
1229 {
1230 XRenderColor mask_c;
1231
1232 mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0;
1233 mask_c.alpha = 0xffff;
1234 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1235
1236 mask_c.alpha = 0;
1237 mask_c.red = 0xffff - c.r;
1238 mask_c.green = 0xffff - c.g;
1239 mask_c.blue = 0xffff - c.b;
1240 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1241 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1242 ret = true;
1243 }
1244
1245 XRenderFreePicture (dpy, mask_pic);
1246 XRenderFreePicture (dpy, overlay_pic);
1247 XRenderFreePicture (dpy, back_pic);
1248# endif
1249 }
1250
1251 return ret;
1252}
1253
1047/* make_transparency_pixmap() 1254/* make_transparency_pixmap()
1048 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1255 * Builds a pixmap of the same size as the terminal window that contains
1049 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 1256 * the tiled portion of the root pixmap that is supposed to be covered by
1050 * our window. 1257 * our window.
1051 */ 1258 */
1052unsigned long 1259unsigned long
1053bgPixmap_t::make_transparency_pixmap () 1260bgPixmap_t::make_transparency_pixmap ()
1054{ 1261{
… …
1058 return 0; 1265 return 0;
1059 1266
1060 /* root dimensions may change from call to call - but Display structure should 1267 /* root dimensions may change from call to call - but Display structure should
1061 * be always up-to-date, so let's use it : 1268 * be always up-to-date, so let's use it :
1062 */ 1269 */
1063 Window root = target->display->root;
1064 int screen = target->display->screen; 1270 int screen = target->display->screen;
1065 Display *dpy = target->dpy; 1271 Display *dpy = target->dpy;
1272 int root_depth = DefaultDepth (dpy, screen);
1066 int root_width = DisplayWidth (dpy, screen); 1273 int root_width = DisplayWidth (dpy, screen);
1067 int root_height = DisplayHeight (dpy, screen); 1274 int root_height = DisplayHeight (dpy, screen);
1068 unsigned int root_pmap_width, root_pmap_height; 1275 unsigned int root_pmap_width, root_pmap_height;
1069 int window_width = target->szHint.width; 1276 int window_width = target->szHint.width;
1070 int window_height = target->szHint.height; 1277 int window_height = target->szHint.height;
1071 int sx, sy; 1278 int sx, sy;
1072 XGCValues gcv; 1279 XGCValues gcv;
1280 GC gc;
1073 1281
1074 TIMING_TEST_START (tp);
1075 target->get_window_origin (sx, sy); 1282 target->get_window_origin (sx, sy);
1076 1283
1077 /* check if we are outside of the visible part of the virtual screen : */ 1284 /* check if we are outside of the visible part of the virtual screen : */
1078 if (sx + window_width <= 0 || sy + window_height <= 0 1285 if (sx + window_width <= 0 || sy + window_height <= 0
1079 || sx >= root_width || sy >= root_height) 1286 || sx >= root_width || sy >= root_height)
1080 return 0; 1287 return 0;
1081 1288
1289 // validate root pixmap and get its size
1082 if (root_pixmap != None) 1290 if (root_pixmap != None)
1083 { 1291 {
1084 /* we want to validate the pixmap and get it's size at the same time : */ 1292 Window wdummy;
1085 int junk; 1293 int idummy;
1086 unsigned int ujunk; 1294 unsigned int udummy;
1087 /* root pixmap may be bad - allow a error */ 1295
1088 target->allowedxerror = -1; 1296 target->allowedxerror = -1;
1089 1297
1090 if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk)) 1298 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy))
1091 root_pixmap = None; 1299 root_pixmap = None;
1092 1300
1093 target->allowedxerror = 0; 1301 target->allowedxerror = 0;
1094 } 1302 }
1095 1303
1304 Pixmap recoded_root_pmap = root_pixmap;
1305
1306 if (root_pixmap != None && root_depth != target->depth)
1307 {
1308#if XRENDER
1309 if (flags & HAS_RENDER)
1310 {
1311 XRenderPictureAttributes pa;
1312
1313 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1314 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1315
1316 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
1317 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
1318 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1319
1320 if (src && dst)
1321 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1322 else
1323 {
1324 XFreePixmap (dpy, recoded_root_pmap);
1325 root_pixmap = None;
1326 }
1327
1328 XRenderFreePicture (dpy, src);
1329 XRenderFreePicture (dpy, dst);
1330 }
1331 else
1332#endif
1333 root_pixmap = None;
1334 }
1335
1336 if (root_pixmap == None)
1337 return 0;
1338
1096 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1339 Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth);
1097 GC gc = NULL;
1098 1340
1099 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1341 if (tiled_root_pmap == None) /* something really bad happened - abort */
1100 return 0; 1342 return 0;
1101 1343
1102 if (root_pixmap == None)
1103 {
1104 /* use tricks to obtain the root background image :*/
1105 /* we want to create Overrideredirect window overlapping out window
1106 with background type of Parent Relative and then grab it */
1107 XSetWindowAttributes attr;
1108 Window src;
1109 bool success = false;
1110
1111 attr.background_pixmap = ParentRelative;
1112 attr.backing_store = Always;
1113 attr.event_mask = ExposureMask;
1114 attr.override_redirect = True;
1115 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
1116 CopyFromParent, CopyFromParent, CopyFromParent,
1117 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
1118 &attr);
1119
1120 if (src != None)
1121 {
1122 XEvent event;
1123 int ev_count = 0;
1124 XGrabServer (dpy);
1125 XMapRaised (dpy, src);
1126 XSync (dpy, False);
1127
1128 /* XSync should get window where it's properly exposed,
1129 * but to be on the safe side - let's check for the actual event to arrive : */
1130 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
1131 ++ev_count;
1132
1133 if (ev_count > 0);
1134 {
1135 /* hooray! - we can grab the image! */
1136 gc = XCreateGC (dpy, root, 0, NULL);
1137 if (gc)
1138 {
1139 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
1140 success = true;
1141 }
1142 }
1143
1144 XDestroyWindow (dpy, src);
1145 XUngrabServer (dpy);
1146 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
1147 }
1148
1149 if (!success)
1150 {
1151 XFreePixmap (dpy, tiled_root_pmap);
1152 tiled_root_pmap = None;
1153 }
1154 else
1155 result |= transpPmapTiled;
1156 }
1157 else
1158 {
1159 /* straightforward pixmap copy */ 1344 /* straightforward pixmap copy */
1160 gcv.tile = root_pixmap; 1345 gcv.tile = recoded_root_pmap;
1161 gcv.fill_style = FillTiled; 1346 gcv.fill_style = FillTiled;
1162 1347
1163 while (sx < 0) sx += (int)root_width; 1348 while (sx < 0) sx += (int)root_width;
1164 while (sy < 0) sy += (int)root_height; 1349 while (sy < 0) sy += (int)root_height;
1165 1350
1166 gcv.ts_x_origin = -sx; 1351 gcv.ts_x_origin = -sx;
1167 gcv.ts_y_origin = -sy; 1352 gcv.ts_y_origin = -sy;
1168 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1353 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1169 1354
1170 if (gc) 1355 if (gc)
1171 { 1356 {
1172 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1357 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1173 result |= transpPmapTiled; 1358 result |= transpPmapTiled;
1174 } 1359 XFreeGC (dpy, gc);
1175 }
1176 TIMING_TEST_PRINT_RESULT (tp);
1177 1360
1178 if (tiled_root_pmap != None)
1179 {
1180 if (!need_client_side_rendering ()) 1361 if (!need_client_side_rendering ())
1181 { 1362 {
1363 if ((flags & blurNeeded)
1364 && (flags & HAS_RENDER_CONV))
1365 {
1366 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1367 result |= transpPmapBlurred;
1368 }
1182 if ((flags & tintNeeded)) 1369 if ((flags & tintNeeded)
1183 {
1184 if (flags & tintWholesome) 1370 && (flags & (tintWholesome | HAS_RENDER)))
1185 { 1371 {
1186 /* In this case we can tint image server-side getting significant 1372 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1187 * performance improvements, as we eliminate XImage transfer
1188 */
1189 gcv.foreground = Pixel (tint);
1190 gcv.function = GXand;
1191 gcv.fill_style = FillSolid;
1192 if (gc)
1193 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcv);
1194 else
1195 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv);
1196 if (gc)
1197 {
1198 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1199 result |= transpPmapTinted; 1373 result |= transpPmapTinted;
1200 }
1201 }
1202 else
1203 {
1204# if XFT
1205 Picture back_pic = 0;
1206 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1207
1208 if (flags & tintSet)
1209 tint.get (c);
1210
1211 if (shade > 0 && shade < 100)
1212 {
1213 c.r = (c.r * shade) / 100;
1214 c.g = (c.g * shade) / 100;
1215 c.b = (c.b * shade) / 100;
1216 }
1217 else if (shade > 100 && shade < 200)
1218 {
1219 c.r = (c.r * (200 - shade)) / 100;
1220 c.g = (c.g * (200 - shade)) / 100;
1221 c.b = (c.b * (200 - shade)) / 100;
1222 }
1223
1224 XRenderPictFormat pf;
1225 pf.type = PictTypeDirect;
1226 pf.depth = 32;
1227 pf.direct.redMask = 0xff;
1228 pf.direct.greenMask = 0xff;
1229 pf.direct.blueMask = 0xff;
1230 pf.direct.alphaMask = 0xff;
1231
1232 XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
1233 (PictFormatType|
1234 PictFormatDepth|
1235 PictFormatRedMask|
1236 PictFormatGreenMask|
1237 PictFormatBlueMask|
1238 PictFormatAlphaMask),
1239 &pf,
1240 0);
1241 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
1242 XRenderPictureAttributes pa ;
1243
1244 back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa);
1245
1246 pa.repeat = True;
1247
1248 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1249 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1250 XFreePixmap (dpy, overlay_pmap);
1251
1252 pa.component_alpha = True;
1253 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1254 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1255 XFreePixmap (dpy, mask_pmap);
1256
1257 if (mask_pic && overlay_pic && back_pic)
1258 {
1259 XRenderColor mask_c;
1260
1261 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1262 mask_c.alpha = 0xffff;
1263 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1264
1265 mask_c.alpha = 0;
1266 mask_c.red = 0xffff - c.r;
1267 mask_c.green = 0xffff - c.g;
1268 mask_c.blue = 0xffff - c.b;
1269 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1270 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
1271 result |= transpPmapTinted;
1272 }
1273
1274 XRenderFreePicture (dpy, mask_pic);
1275 XRenderFreePicture (dpy, overlay_pic);
1276 XRenderFreePicture (dpy, back_pic);
1277# if DO_TIMING_TEST
1278 XSync (dpy, False);
1279# endif
1280# endif
1281 }
1282 } 1374 }
1283 } /* server side rendering completed */ 1375 } /* server side rendering completed */
1284 1376
1285 if (pixmap) 1377 if (pixmap)
1286 XFreePixmap (dpy, pixmap); 1378 XFreePixmap (dpy, pixmap);
1287 1379
1288 pixmap = tiled_root_pmap; 1380 pixmap = tiled_root_pmap;
1289 pmap_width = window_width; 1381 pmap_width = window_width;
1290 pmap_height = window_height; 1382 pmap_height = window_height;
1291 pmap_depth = root_depth; 1383 pmap_depth = target->depth;
1292 } 1384 }
1385 else
1386 XFreePixmap (dpy, tiled_root_pmap);
1293 1387
1294 if (gc) 1388 if (recoded_root_pmap != root_pixmap)
1295 XFreeGC (dpy, gc); 1389 XFreePixmap (dpy, recoded_root_pmap);
1296
1297 TIMING_TEST_PRINT_RESULT (tp);
1298 1390
1299 return result; 1391 return result;
1300} 1392}
1301 1393
1302bool 1394void
1303bgPixmap_t::set_root_pixmap () 1395bgPixmap_t::set_root_pixmap ()
1304{ 1396{
1305 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1397 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1306 if (new_root_pixmap == None) 1398 if (new_root_pixmap == None)
1307 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1399 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1308 1400
1309 if (new_root_pixmap != root_pixmap)
1310 {
1311 root_pixmap = new_root_pixmap; 1401 root_pixmap = new_root_pixmap;
1312 return true;
1313 }
1314
1315 return false;
1316} 1402}
1317# endif /* ENABLE_TRANSPARENCY */ 1403# endif /* ENABLE_TRANSPARENCY */
1318 1404
1319# ifndef HAVE_AFTERIMAGE 1405#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1320static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm); 1406static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c);
1321# endif 1407# endif
1322 1408
1323bool 1409bool
1324bgPixmap_t::render () 1410bgPixmap_t::render ()
1325{ 1411{
1326 unsigned long background_flags = 0; 1412 unsigned long background_flags = 0;
1327 1413
1328 if (target == NULL) 1414 if (target == NULL)
1329 return false; 1415 return false;
1330
1331 TIMING_TEST_START (tp);
1332 1416
1333 invalidate (); 1417 invalidate ();
1334# ifdef ENABLE_TRANSPARENCY 1418# ifdef ENABLE_TRANSPARENCY
1335 if (flags & isTransparent) 1419 if (flags & isTransparent)
1336 { 1420 {
1337 /* we need to re-generate transparency pixmap in that case ! */ 1421 /* we need to re-generate transparency pixmap in that case ! */
1338 background_flags = make_transparency_pixmap (); 1422 background_flags = make_transparency_pixmap ();
1339 if (background_flags == 0) 1423 if (background_flags == 0)
1340 return false; 1424 return false;
1341 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1425 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1342 && pmap_depth == target->depth)
1343 flags = flags & ~isInvalid; 1426 flags = flags & ~isInvalid;
1344 } 1427 }
1345# endif 1428# endif
1346 1429
1347# ifdef BG_IMAGE_FROM_FILE 1430# ifdef BG_IMAGE_FROM_FILE
… …
1351 if (render_image (background_flags)) 1434 if (render_image (background_flags))
1352 flags = flags & ~isInvalid; 1435 flags = flags & ~isInvalid;
1353 } 1436 }
1354# endif 1437# endif
1355 1438
1439# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1356 XImage *result = NULL; 1440 XImage *result = NULL;
1357 1441
1358 if (background_flags && (flags & isInvalid)) 1442 if (background_flags && (flags & isInvalid))
1359 { 1443 {
1360 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1444 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1361 } 1445 }
1362 1446
1363 if (result) 1447 if (result)
1364 { 1448 {
1365# if !defined(HAVE_AFTERIMAGE) && !XFT
1366 /* our own client-side tinting */ 1449 /* our own client-side tinting */
1367 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1368 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1369 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1450 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1370 { 1451 {
1371 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1452 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1372 if (flags & tintSet) 1453 if (flags & tintSet)
1373 tint.get (c); 1454 tint.get (c);
1374 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1455 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1375 } 1456 }
1376# endif
1377 1457
1378 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1458 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1379 1459
1380 if (gc) 1460 if (gc)
1381 { 1461 {
1382 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1383 {
1384 XFreePixmap (target->dpy, pixmap);
1385 pixmap = None;
1386 }
1387
1388 if (pixmap == None)
1389 {
1390 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1391 pmap_width = result->width;
1392 pmap_height = result->height;
1393 pmap_depth = target->depth;
1394 }
1395
1396 if (pmap_depth != result->depth)
1397 {
1398 /* Bad Match error will ensue ! stupid X !!!! */
1399 if (result->depth == 24 && pmap_depth == 32)
1400 result->depth = 32;
1401 else if (result->depth == 32 && pmap_depth == 24)
1402 result->depth = 24;
1403 else
1404 {
1405 /* TODO: implement image recoding */
1406 }
1407 }
1408
1409 if (pmap_depth == result->depth)
1410 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1462 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1411 1463
1412 XFreeGC (target->dpy, gc); 1464 XFreeGC (target->dpy, gc);
1413 flags = flags & ~isInvalid; 1465 flags = flags & ~isInvalid;
1414 } 1466 }
1415 1467
1416 XDestroyImage (result); 1468 XDestroyImage (result);
1417 } 1469 }
1470# endif
1418 1471
1419 if (flags & isInvalid) 1472 if (flags & isInvalid)
1420 { 1473 {
1421 if (pixmap != None) 1474 if (pixmap != None)
1422 { 1475 {
… …
1425 } 1478 }
1426 } 1479 }
1427 1480
1428 apply (); 1481 apply ();
1429 1482
1430 XSync (target->dpy, False);
1431 valid_since = ev::now (); 1483 valid_since = ev::now ();
1432 1484
1433 TIMING_TEST_PRINT_RESULT (tp);
1434
1435 return true; 1485 return true;
1436} 1486}
1437 1487
1438bool 1488void
1439bgPixmap_t::set_target (rxvt_term *new_target) 1489bgPixmap_t::set_target (rxvt_term *new_target)
1440{ 1490{
1441 if (new_target)
1442 if (target != new_target)
1443 {
1444 target = new_target; 1491 target = new_target;
1445# ifdef ENABLE_TRANSPARENCY 1492
1446 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1493 flags &= ~(HAS_RENDER | HAS_RENDER_CONV);
1494#if XRENDER
1495 int major, minor;
1496 if (XRenderQueryVersion (target->dpy, &major, &minor))
1497 flags |= HAS_RENDER;
1498 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1499 if (filters)
1500 {
1501 for (int i = 0; i < filters->nfilter; i++)
1502 if (!strcmp (filters->filter[i], FilterConvolution))
1503 flags |= HAS_RENDER_CONV;
1504
1505 XFree (filters);
1506 }
1447# endif 1507#endif
1448 return true;
1449 }
1450
1451 return false;
1452} 1508}
1453 1509
1454void 1510void
1455bgPixmap_t::apply () 1511bgPixmap_t::apply ()
1456{ 1512{
1457 if (target) 1513 if (target == NULL)
1458 { 1514 return;
1459 flags &= ~isVtOrigin;
1460 1515
1461 if (pixmap != None) 1516 if (pixmap != None)
1462 { 1517 {
1463 /* set target's background to pixmap */ 1518 /* set target's background to pixmap */
1464# ifdef ENABLE_TRANSPARENCY 1519# ifdef ENABLE_TRANSPARENCY
1465 if (flags & isTransparent) 1520 if (flags & isTransparent)
1466 { 1521 {
1467 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1522 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1468 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1523 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1469 1524
1470 if (target->scrollBar.win) 1525 if (target->scrollBar.win)
1471 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1526 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1472 } 1527 }
1473 else 1528 else
1474# endif 1529# endif
1475 { 1530 {
1476 flags |= isVtOrigin;
1477 /* force old pixmap dereference in case it was transparent before :*/ 1531 /* force old pixmap dereference in case it was transparent before :*/
1478 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1479 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1480 /* do we also need to set scrollbar's background here ? */
1481
1482 if (target->scrollBar.win)
1483 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1484 }
1485 }
1486 else
1487 {
1488 /* set target background to a pixel */
1489 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1532 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1490 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1533 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1491 /* do we also need to set scrollbar's background here ? */ 1534 /* do we also need to set scrollbar's background here ? */
1535
1492 if (target->scrollBar.win) 1536 if (target->scrollBar.win)
1493 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1537 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1494 } 1538 }
1539 }
1540 else
1541 {
1542 /* set target background to a pixel */
1543 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1544 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1545 /* do we also need to set scrollbar's background here ? */
1546 if (target->scrollBar.win)
1547 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1548 }
1495 1549
1496 /* don't want Expose on the parent or vt. It is better to use 1550 /* don't want Expose on the parent or vt. It is better to use
1497 scr_touch or we get a great deal of flicker otherwise: */ 1551 scr_touch or we get a great deal of flicker otherwise: */
1498 XClearWindow (target->dpy, target->parent[0]); 1552 XClearWindow (target->dpy, target->parent[0]);
1499 1553
1500 if (target->scrollBar.state && target->scrollBar.win) 1554 if (target->scrollBar.state && target->scrollBar.win)
1501 { 1555 {
1502 target->scrollBar.state = STATE_IDLE; 1556 target->scrollBar.state = STATE_IDLE;
1503 target->scrollBar.show (0); 1557 target->scrollBar.show (0);
1504 } 1558 }
1505 1559
1506 target->want_refresh = 1; 1560 target->want_refresh = 1;
1507 flags |= hasChanged; 1561 flags |= hasChanged;
1508 }
1509} 1562}
1510 1563
1511#endif /* HAVE_BG_PIXMAP */ 1564#endif /* HAVE_BG_PIXMAP */
1512 1565
1513#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1566#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1514/* taken from aterm-0.4.2 */ 1567/* taken from aterm-0.4.2 */
1515 1568
1516typedef uint32_t RUINT32T;
1517
1518static void 1569static void
1519ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm) 1570ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c)
1520{ 1571{
1521 int sh_r, sh_g, sh_b; 1572 int sh_r, sh_g, sh_b;
1522 RUINT32T mask_r, mask_g, mask_b; 1573 uint32_t mask_r, mask_g, mask_b;
1523 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1574 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1524 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1575 rgba low;
1525 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1576 rgba high;
1526 int i; 1577 int i;
1578 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1527 1579
1528 Visual *visual = term->visual;
1529
1530 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1580 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1531
1532 if (shade == 0)
1533 shade = 100;
1534 1581
1535 /* for convenience */ 1582 /* for convenience */
1536 mask_r = visual->red_mask; 1583 mask_r = visual->red_mask;
1537 mask_g = visual->green_mask; 1584 mask_g = visual->green_mask;
1538 mask_b = visual->blue_mask; 1585 mask_b = visual->blue_mask;
1539 1586
1540 /* boring lookup table pre-initialization */ 1587 /* boring lookup table pre-initialization */
1541 switch (srcImage->bits_per_pixel) { 1588 switch (srcImage->depth)
1589 {
1542 case 15: 1590 case 15:
1543 if ((mask_r != 0x7c00) || 1591 if ((mask_r != 0x7c00) ||
1544 (mask_g != 0x03e0) || 1592 (mask_g != 0x03e0) ||
1545 (mask_b != 0x001f)) 1593 (mask_b != 0x001f))
1546 return; 1594 return;
1547 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1595 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32));
1548 lookup_r = lookup; 1596 lookup_r = lookup;
1549 lookup_g = lookup+32; 1597 lookup_g = lookup+32;
1550 lookup_b = lookup+32+32; 1598 lookup_b = lookup+32+32;
1551 sh_r = 10; 1599 sh_r = 10;
1552 sh_g = 5; 1600 sh_g = 5;
1553 sh_b = 0; 1601 sh_b = 0;
1554 break; 1602 break;
1555 case 16: 1603 case 16:
1556 if ((mask_r != 0xf800) || 1604 if ((mask_r != 0xf800) ||
1557 (mask_g != 0x07e0) || 1605 (mask_g != 0x07e0) ||
1558 (mask_b != 0x001f)) 1606 (mask_b != 0x001f))
1559 return; 1607 return;
1560 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1608 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1561 lookup_r = lookup; 1609 lookup_r = lookup;
1562 lookup_g = lookup+32; 1610 lookup_g = lookup+32;
1563 lookup_b = lookup+32+64; 1611 lookup_b = lookup+32+64;
1564 sh_r = 11; 1612 sh_r = 11;
1565 sh_g = 5; 1613 sh_g = 5;
1566 sh_b = 0; 1614 sh_b = 0;
1567 break; 1615 break;
1568 case 24: 1616 case 24:
1569 if ((mask_r != 0xff0000) || 1617 if ((mask_r != 0xff0000) ||
1570 (mask_g != 0x00ff00) || 1618 (mask_g != 0x00ff00) ||
1571 (mask_b != 0x0000ff)) 1619 (mask_b != 0x0000ff))
1572 return; 1620 return;
1573 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1621 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1574 lookup_r = lookup; 1622 lookup_r = lookup;
1575 lookup_g = lookup+256; 1623 lookup_g = lookup+256;
1576 lookup_b = lookup+256+256; 1624 lookup_b = lookup+256+256;
1577 sh_r = 16; 1625 sh_r = 16;
1578 sh_g = 8; 1626 sh_g = 8;
1579 sh_b = 0; 1627 sh_b = 0;
1580 break; 1628 break;
1581 case 32: 1629 case 32:
1582 if ((mask_r != 0xff0000) || 1630 if ((mask_r != 0xff0000) ||
1583 (mask_g != 0x00ff00) || 1631 (mask_g != 0x00ff00) ||
1584 (mask_b != 0x0000ff)) 1632 (mask_b != 0x0000ff))
1585 return; 1633 return;
1586 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1634 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1587 lookup_r = lookup; 1635 lookup_r = lookup;
1588 lookup_g = lookup+256; 1636 lookup_g = lookup+256;
1589 lookup_b = lookup+256+256; 1637 lookup_b = lookup+256+256;
1590 sh_r = 16; 1638 sh_r = 16;
1591 sh_g = 8; 1639 sh_g = 8;
1592 sh_b = 0; 1640 sh_b = 0;
1593 break; 1641 break;
1594 default: 1642 default:
1595 return; /* we do not support this color depth */ 1643 return; /* we do not support this color depth */
1596 } 1644 }
1597 1645
1598 /* prepare limits for color transformation (each channel is handled separately) */ 1646 /* prepare limits for color transformation (each channel is handled separately) */
1599 if (shade < 0) { 1647 if (shade > 100)
1648 {
1600 shade = -shade; 1649 shade = 200 - shade;
1601 if (shade < 0) shade = 0;
1602 if (shade > 100) shade = 100;
1603 1650
1604 lower_lim_r = 65535-rm; 1651 high.r = (65535 - c.r) * shade / 100;
1605 lower_lim_g = 65535-gm; 1652 high.g = (65535 - c.g) * shade / 100;
1606 lower_lim_b = 65535-bm; 1653 high.b = (65535 - c.b) * shade / 100;
1607 1654
1608 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1655 low.r = 65535 - high.r;
1609 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1656 low.g = 65535 - high.g;
1610 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1657 low.b = 65535 - high.b;
1611
1612 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1613 } else {
1614 if (shade < 0) shade = 0;
1615 if (shade > 100) shade = 100;
1616
1617 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1618
1619 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1620 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1621 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1622 } 1658 }
1623 1659 else
1624 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1625 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1626 { 1660 {
1627 unsigned int tmp; 1661 high.r = c.r * shade / 100;
1662 high.g = c.g * shade / 100;
1663 high.b = c.b * shade / 100;
1628 1664
1629 tmp = lower_lim_r; 1665 low.r = low.g = low.b = 0;
1630 lower_lim_r = lower_lim_b;
1631 lower_lim_b = tmp;
1632
1633 tmp = upper_lim_r;
1634 upper_lim_r = upper_lim_b;
1635 upper_lim_b = tmp;
1636 } 1666 }
1637 1667
1638 /* fill our lookup tables */ 1668 /* fill our lookup tables */
1639 for (i = 0; i <= mask_r>>sh_r; i++) 1669 for (i = 0; i <= mask_r>>sh_r; i++)
1640 { 1670 {
1641 RUINT32T tmp; 1671 uint32_t tmp;
1642 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1672 tmp = i * high.r;
1643 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1673 tmp += (mask_r>>sh_r) * low.r;
1644 lookup_r[i] = (tmp/65535)<<sh_r; 1674 lookup_r[i] = (tmp/65535)<<sh_r;
1645 } 1675 }
1646 for (i = 0; i <= mask_g>>sh_g; i++) 1676 for (i = 0; i <= mask_g>>sh_g; i++)
1647 { 1677 {
1648 RUINT32T tmp; 1678 uint32_t tmp;
1649 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1679 tmp = i * high.g;
1650 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1680 tmp += (mask_g>>sh_g) * low.g;
1651 lookup_g[i] = (tmp/65535)<<sh_g; 1681 lookup_g[i] = (tmp/65535)<<sh_g;
1652 } 1682 }
1653 for (i = 0; i <= mask_b>>sh_b; i++) 1683 for (i = 0; i <= mask_b>>sh_b; i++)
1654 { 1684 {
1655 RUINT32T tmp; 1685 uint32_t tmp;
1656 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1686 tmp = i * high.b;
1657 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1687 tmp += (mask_b>>sh_b) * low.b;
1658 lookup_b[i] = (tmp/65535)<<sh_b; 1688 lookup_b[i] = (tmp/65535)<<sh_b;
1659 } 1689 }
1660 1690
1661 /* apply table to input image (replacing colors by newly calculated ones) */ 1691 /* apply table to input image (replacing colors by newly calculated ones) */
1662 switch (srcImage->bits_per_pixel) 1692 if (srcImage->bits_per_pixel == 32
1693 && (srcImage->depth == 24 || srcImage->depth == 32)
1694 && srcImage->byte_order == host_byte_order)
1663 { 1695 {
1664 case 15:
1665 {
1666 unsigned short *p1, *pf, *p, *pl; 1696 uint32_t *p1, *pf, *p, *pl;
1667 p1 = (unsigned short *) srcImage->data; 1697 p1 = (uint32_t *) srcImage->data;
1668 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1698 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1699
1669 while (p1 < pf) 1700 while (p1 < pf)
1670 { 1701 {
1671 p = p1; 1702 p = p1;
1672 pl = p1 + srcImage->width; 1703 pl = p1 + srcImage->width;
1673 for (; p < pl; p++) 1704 for (; p < pl; p++)
1674 { 1705 {
1675 *p = lookup_r[(*p & 0x7c00)>>10] |
1676 lookup_g[(*p & 0x03e0)>> 5] |
1677 lookup_b[(*p & 0x001f)];
1678 }
1679 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1680 }
1681 break;
1682 }
1683 case 16:
1684 {
1685 unsigned short *p1, *pf, *p, *pl;
1686 p1 = (unsigned short *) srcImage->data;
1687 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1688 while (p1 < pf)
1689 {
1690 p = p1;
1691 pl = p1 + srcImage->width;
1692 for (; p < pl; p++)
1693 {
1694 *p = lookup_r[(*p & 0xf800)>>11] |
1695 lookup_g[(*p & 0x07e0)>> 5] |
1696 lookup_b[(*p & 0x001f)];
1697 }
1698 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1699 }
1700 break;
1701 }
1702 case 24:
1703 {
1704 unsigned char *p1, *pf, *p, *pl;
1705 p1 = (unsigned char *) srcImage->data;
1706 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1707 while (p1 < pf)
1708 {
1709 p = p1;
1710 pl = p1 + srcImage->width * 3;
1711 for (; p < pl; p += 3)
1712 {
1713 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1714 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1715 p[2] = lookup_r[(p[2] & 0x0000ff)];
1716 }
1717 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1718 }
1719 break;
1720 }
1721 case 32:
1722 {
1723 RUINT32T *p1, *pf, *p, *pl;
1724 p1 = (RUINT32T *) srcImage->data;
1725 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1726
1727 while (p1 < pf)
1728 {
1729 p = p1;
1730 pl = p1 + srcImage->width;
1731 for (; p < pl; p++)
1732 {
1733 *p = lookup_r[(*p & 0xff0000)>>16] | 1706 *p = lookup_r[(*p & 0xff0000) >> 16] |
1734 lookup_g[(*p & 0x00ff00)>> 8] | 1707 lookup_g[(*p & 0x00ff00) >> 8] |
1735 lookup_b[(*p & 0x0000ff)] | 1708 lookup_b[(*p & 0x0000ff)] |
1736 (*p & ~0xffffff); 1709 (*p & 0xff000000);
1710 }
1711 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line);
1712 }
1713 }
1714 else
1715 {
1716 for (int y = 0; y < srcImage->height; y++)
1717 for (int x = 0; x < srcImage->width; x++)
1718 {
1719 unsigned long pixel = XGetPixel (srcImage, x, y);
1720 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1721 lookup_g[(pixel & mask_g) >> sh_g] |
1722 lookup_b[(pixel & mask_b) >> sh_b];
1723 XPutPixel (srcImage, x, y, pixel);
1737 } 1724 }
1738 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1739 } 1725 }
1740 break;
1741 }
1742 }
1743 1726
1744 free (lookup); 1727 free (lookup);
1745} 1728}
1746#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1729#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */

Diff Legend

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