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

Diff Legend

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