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

Diff Legend

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