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.73 by sf-exg, Sat Oct 9 14:58:15 2010 UTC vs.
Revision 1.119 by sf-exg, Thu Nov 18 17:28:12 2010 UTC

… …
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com>
7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net> 7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net>
8 * Copyright (c) 2010 Emanuele Giaquinta <e.giaquinta@glauco.it>
8 * 9 *
9 * This program is free software; you can redistribute it and/or modify 10 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by 11 * it under the terms of the GNU General Public License as published by
11 * the Free Software Foundation; either version 2 of the License, or 12 * the Free Software Foundation; either version 2 of the License, or
12 * (at your option) any later version. 13 * (at your option) any later version.
… …
19 * You should have received a copy of the GNU General Public License 20 * You should have received a copy of the GNU General Public License
20 * along with this program; if not, write to the Free Software 21 * along with this program; if not, write to the Free Software
21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 22 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22 *---------------------------------------------------------------------*/ 23 *---------------------------------------------------------------------*/
23 24
25#include <cmath>
24#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
25#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
28
29#if XRENDER
30# include <X11/extensions/Xrender.h>
31#endif
32
33#ifndef FilterConvolution
34#define FilterConvolution "convolution"
35#endif
26 36
27#define DO_TIMING_TEST 0 37#define DO_TIMING_TEST 0
28 38
29#if DO_TIMING_TEST 39#if DO_TIMING_TEST
30# include <sys/time.h> 40# include <sys/time.h>
… …
56 * 66 *
57 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%. 67 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
58 * W and H are percentages of the terminal window size. 68 * W and H are percentages of the terminal window size.
59 * X and Y are also percentages; e.g., +50+50 centers 69 * X and Y are also percentages; e.g., +50+50 centers
60 * the image in the window. 70 * the image in the window.
61 * WxH+X Assumes Y == X
62 * WxH Assumes Y == X == 50 (centers the image)
63 * W+X+Y Assumes H == W
64 * W+X Assumes H == W and Y == X
65 * W Assumes H == W and Y == X == 50
66 *
67 * Adjusting position only :
68 * =+X+Y Set position to X% by Y% (absolute).
69 * =+X Set position to X% by X%.
70 * +X+Y Adjust position horizontally X% and vertically Y%
71 * from current position (relative).
72 * +X Adjust position horizontally X% and vertically X%
73 * from current position.
74 *
75 * Adjusting scale only :
76 * Wx0 Multiply horizontal scaling factor by W%
77 * 0xH Multiply vertical scaling factor by H%
78 * 0x0 No scaling (show image at normal size).
79 * 71 *
80 * Pixmap Operations : (should be prepended by a colon) 72 * Pixmap Operations : (should be prepended by a colon)
81 * tile Tile image. Scaling/position modifiers above will affect 73 * tile Tile image. Scaling/position modifiers above will affect
82 * the tile size and origin. 74 * the tile size and origin.
83 * propscale When scaling, scale proportionally. That is, maintain the 75 * propscale When scaling, scale proportionally. That is, maintain the
… …
104#ifdef BG_IMAGE_FROM_FILE 96#ifdef BG_IMAGE_FROM_FILE
105 have_image = false; 97 have_image = false;
106 h_scale = v_scale = 0; 98 h_scale = v_scale = 0;
107 h_align = v_align = 0; 99 h_align = v_align = 0;
108#endif 100#endif
101#ifdef ENABLE_TRANSPARENCY
102 shade = 100;
103#endif
109 flags = 0; 104 flags = 0;
110 pixmap = None; 105 pixmap = None;
111 valid_since = invalid_since = 0; 106 valid_since = invalid_since = 0;
112 target = 0; 107 target = 0;
113} 108}
… …
163 return true; 158 return true;
164 } 159 }
165# endif 160# endif
166 161
167 return false; 162 return false;
168}; 163}
169 164
170bool bgPixmap_t::need_client_side_rendering () 165bool bgPixmap_t::need_client_side_rendering ()
171{ 166{
172# ifdef HAVE_AFTERIMAGE 167# ifdef HAVE_AFTERIMAGE
173 if (original_asim) 168 if (original_asim)
174 return true; 169 return true;
175# endif
176# ifdef ENABLE_TRANSPARENCY
177 if (flags & isTransparent)
178 {
179# ifdef HAVE_AFTERIMAGE // can't blur without libAI anyways
180 if ((flags & blurNeeded) && !(flags & blurServerSide))
181 return true;
182# endif
183 if ((flags & tintNeeded) && !(flags & tintServerSide))
184 return true;
185 }
186# endif 170# endif
187 return false; 171 return false;
188} 172}
189 173
190# ifdef BG_IMAGE_FROM_FILE 174# ifdef BG_IMAGE_FROM_FILE
… …
228 int diff = window_size - image_size; 212 int diff = window_size - image_size;
229 int smaller = min (image_size, window_size); 213 int smaller = min (image_size, window_size);
230 214
231 if (align >= 0 && align <= 100) 215 if (align >= 0 && align <= 100)
232 return diff * align / 100; 216 return diff * align / 100;
233 else if (align > 100 && align <= 200 ) 217 else if (align > 100 && align <= 200)
234 return ((align - 100) * smaller / 100) + window_size - smaller; 218 return ((align - 100) * smaller / 100) + window_size - smaller;
235 else if (align >= -100 && align < 0) 219 else if (align >= -100 && align < 0)
236 return ((align + 100) * smaller / 100) - image_size; 220 return ((align + 100) * smaller / 100) - image_size;
237 return 0; 221 return 0;
238} 222}
… …
254 dst_size = target_size - dst_pos; 238 dst_size = target_size - dst_pos;
255 return src_pos; 239 return src_pos;
256} 240}
257 241
258bool 242bool
259bgPixmap_t::set_geometry (const char *geom) 243bgPixmap_t::set_geometry (const char *geom, bool update)
260{ 244{
245 bool changed = false;
261 int geom_flags = 0, changed = 0; 246 int geom_flags = 0;
262 int x = 0, y = 0; 247 int x = 0, y = 0;
263 unsigned int w = 0, h = 0; 248 unsigned int w = 0, h = 0;
264 unsigned int n; 249 unsigned int n;
265 unsigned long new_flags = (flags & (~geometryFlags)); 250 unsigned long new_flags = (flags & (~geometryFlags));
266 const char *p; 251 const char *p;
… …
277 262
278 n = (p - geom); 263 n = (p - geom);
279 if (n < MAXLEN_GEOM) 264 if (n < MAXLEN_GEOM)
280 { 265 {
281 char *ops; 266 char *ops;
282 new_flags |= geometrySet;
283 267
284 memcpy (str, geom, n); 268 memcpy (str, geom, n);
285 str[n] = '\0'; 269 str[n] = '\0';
286 if (str[0] == ':') 270 if (str[0] == ':')
287 ops = &str[0]; 271 ops = &str[0];
… …
302 if (ops > str || ops == NULL) 286 if (ops > str || ops == NULL)
303 { 287 {
304 /* we have geometry string - let's handle it prior to applying ops */ 288 /* we have geometry string - let's handle it prior to applying ops */
305 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 289 geom_flags = XParseGeometry (str, &x, &y, &w, &h);
306 290
307 if ((geom_flags & XValue) && !(geom_flags & YValue))
308 {
309 y = x;
310 geom_flags |= YValue;
311 }
312
313 if (flags & geometrySet)
314 {
315 /* new geometry is an adjustment to the old one ! */
316 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
317 {
318 if (w == 0 && h != 0)
319 {
320 w = h_scale;
321 h = (v_scale * h) / 100;
322 }
323 else if (h == 0 && w != 0)
324 {
325 w = (h_scale * w) / 100;
326 h = v_scale;
327 }
328 }
329 if (geom_flags & XValue)
330 {
331 if (str[0] != '=')
332 {
333 y += v_align;
334 x += h_align;
335 }
336 }
337 }
338 else /* setting up geometry from scratch */ 291 if (!update) /* setting up geometry from scratch */
339 { 292 {
340 if (!(geom_flags & XValue)) 293 if (!(geom_flags & XValue))
341 { 294 {
342 /* use default geometry - centered */ 295 /* use default geometry - centered */
343 x = y = defaultAlign; 296 x = y = defaultAlign;
… …
357 } 310 }
358 else 311 else
359 w = h; 312 w = h;
360 } 313 }
361 } /* done parsing geometry string */ 314 } /* done parsing geometry string */
362 else if (!(flags & geometrySet)) 315 else if (!update)
363 { 316 {
364 /* default geometry - scaled and centered */ 317 /* default geometry - scaled and centered */
365 x = y = defaultAlign; 318 x = y = defaultAlign;
366 w = h = defaultScale; 319 w = h = defaultScale;
367 } 320 }
368 321
369 if (!(flags & geometrySet)) 322 if (!update)
370 geom_flags |= WidthValue|HeightValue|XValue|YValue; 323 geom_flags |= WidthValue|HeightValue|XValue|YValue;
371 324
372 if (ops) 325 if (ops)
373 { 326 {
374 while (*ops) 327 while (*ops)
… …
422 375
423 while (*ops != ':' && *ops != '\0') ++ops; 376 while (*ops != ':' && *ops != '\0') ++ops;
424 } /* done parsing ops */ 377 } /* done parsing ops */
425 } 378 }
426 379
427 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed; 380 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
428 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed; 381 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
429 if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed; 382 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
430 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed; 383 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
431 } 384 }
432 385
433 if (new_flags != flags) 386 if (new_flags != flags)
434 { 387 {
435 flags = new_flags; 388 flags = new_flags;
436 changed++; 389 changed = true;
437 } 390 }
438 391
439 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
440 // flags, h_scale, v_scale, h_align, v_align);
441 return (changed > 0); 392 return changed;
442} 393}
443 394
444void 395void
445bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 396bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
446{ 397{
… …
474 x = make_align_position (h_align, target_width, w); 425 x = make_align_position (h_align, target_width, w);
475 y = make_align_position (v_align, target_height, h); 426 y = make_align_position (v_align, target_height, h);
476 } 427 }
477 428
478 flags &= ~sizeSensitive; 429 flags &= ~sizeSensitive;
479 if (h_scale != 0 || v_scale != 0 430 if ((flags & propScale) || h_scale || v_scale
480 || h_align != 0 || v_align != 0 431 || (!(flags & rootAlign) && (h_align || v_align))
481 || w > target_width || h > target_height) 432 || w > target_width || h > target_height)
482 flags |= sizeSensitive; 433 flags |= sizeSensitive;
483} 434}
484 435
485# ifdef HAVE_AFTERIMAGE 436# ifdef HAVE_AFTERIMAGE
… …
499 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); 450 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
500 451
501 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 452 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
502 { 453 {
503 ShadingInfo as_shade; 454 ShadingInfo as_shade;
504 as_shade.shading = (shade == 0) ? 100 : shade; 455 as_shade.shading = shade;
505 456
506 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 457 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
507 if (flags & tintSet) 458 if (flags & tintSet)
508 tint.get (c); 459 tint.get (c);
509 as_shade.tintColor.red = c.r; 460 as_shade.tintColor.red = c.r;
… …
511 as_shade.tintColor.blue = c.b; 462 as_shade.tintColor.blue = c.b;
512 463
513 background_tint = shading2tint32 (&as_shade); 464 background_tint = shading2tint32 (&as_shade);
514 } 465 }
515 466
516 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL) 467 if (!(background_flags & transpPmapBlurred) && (flags & blurNeeded) && background != NULL)
517 { 468 {
518 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 469 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
519 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 470 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
520 100, ASIMAGE_QUALITY_DEFAULT); 471 100, ASIMAGE_QUALITY_DEFAULT);
521 if (tmp) 472 if (tmp)
… …
535 486
536 int x = 0; 487 int x = 0;
537 int y = 0; 488 int y = 0;
538 int w = 0; 489 int w = 0;
539 int h = 0; 490 int h = 0;
540
541 TIMING_TEST_START (asim);
542 491
543 if (original_asim) 492 if (original_asim)
544 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y); 493 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
545 494
546 if (!original_asim 495 if (!original_asim
… …
663 } 612 }
664 613
665 free (layers); 614 free (layers);
666 } 615 }
667 } 616 }
668 TIMING_TEST_PRINT_RESULT (asim);
669 617
670 bool ret = false; 618 bool ret = false;
671 619
672 if (result) 620 if (result)
673 { 621 {
674 XGCValues gcv; 622 XGCValues gcv;
675 GC gc; 623 GC gc;
676 624
677 if (pixmap)
678 {
679 if (pmap_width != new_pmap_width
680 || pmap_height != new_pmap_height
681 || pmap_depth != target->depth)
682 {
683 XFreePixmap (target->dpy, pixmap);
684 pixmap = None;
685 }
686 }
687
688 /* create Pixmap */ 625 /* create Pixmap */
689 if (pixmap == None) 626 if (pixmap == None
627 || pmap_width != new_pmap_width
628 || pmap_height != new_pmap_height
629 || pmap_depth != target->depth)
690 { 630 {
631 if (pixmap)
632 XFreePixmap (target->dpy, pixmap);
691 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 633 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
692 pmap_width = new_pmap_width; 634 pmap_width = new_pmap_width;
693 pmap_height = new_pmap_height; 635 pmap_height = new_pmap_height;
694 pmap_depth = target->depth; 636 pmap_depth = target->depth;
695 } 637 }
… …
719 661
720 if (result != background && result != original_asim) 662 if (result != background && result != original_asim)
721 destroy_asimage (&result); 663 destroy_asimage (&result);
722 664
723 XFreeGC (target->dpy, gc); 665 XFreeGC (target->dpy, gc);
724 TIMING_TEST_PRINT_RESULT (asim);
725 666
726 ret = true; 667 ret = true;
727 } 668 }
728 669
729 if (background) 670 if (background)
… …
741 return false; 682 return false;
742 683
743 if (!pixbuf) 684 if (!pixbuf)
744 return false; 685 return false;
745 686
746 // TODO: add alpha blending
747 if (background_flags) 687 if (background_flags
688 && !(flags & HAS_RENDER))
748 return false; 689 return false;
749 690
750 GdkPixbuf *result; 691 GdkPixbuf *result;
751 692
752 int image_width = gdk_pixbuf_get_width (pixbuf); 693 int image_width = gdk_pixbuf_get_width (pixbuf);
… …
785 726
786 if (result) 727 if (result)
787 { 728 {
788 XGCValues gcv; 729 XGCValues gcv;
789 GC gc; 730 GC gc;
731 Pixmap root_pmap;
790 732
791 image_width = gdk_pixbuf_get_width (result); 733 image_width = gdk_pixbuf_get_width (result);
792 image_height = gdk_pixbuf_get_height (result); 734 image_height = gdk_pixbuf_get_height (result);
793 735
736 if (background_flags)
737 {
738 root_pmap = pixmap;
739 pixmap = None;
740 }
741 else
742 {
794 if (h_scale == 0 || v_scale == 0) 743 if (h_scale == 0 || v_scale == 0)
795 { 744 {
796 new_pmap_width = min (image_width, target_width); 745 new_pmap_width = min (image_width, target_width);
797 new_pmap_height = min (image_height, target_height); 746 new_pmap_height = min (image_height, target_height);
798 }
799
800 if (pixmap)
801 {
802 if (pmap_width != new_pmap_width
803 || pmap_height != new_pmap_height
804 || pmap_depth != target->depth)
805 {
806 XFreePixmap (target->dpy, pixmap);
807 pixmap = None;
808 } 747 }
809 } 748 }
810 749
811 if (pixmap == None) 750 if (pixmap == None
751 || pmap_width != new_pmap_width
752 || pmap_height != new_pmap_height
753 || pmap_depth != target->depth)
812 { 754 {
755 if (pixmap)
756 XFreePixmap (target->dpy, pixmap);
813 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 757 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
814 pmap_width = new_pmap_width; 758 pmap_width = new_pmap_width;
815 pmap_height = new_pmap_height; 759 pmap_height = new_pmap_height;
816 pmap_depth = target->depth; 760 pmap_depth = target->depth;
817 } 761 }
… …
858 dst_width, dst_height, 802 dst_width, dst_height,
859 XLIB_RGB_DITHER_NONE, 803 XLIB_RGB_DITHER_NONE,
860 0, 0); 804 0, 0);
861 } 805 }
862 806
807#if XRENDER
808 if (background_flags)
809 {
810 Display *dpy = target->dpy;
811 XRenderPictureAttributes pa;
812
813 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, target->visual);
814 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
815
816 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
817 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
818
819 pa.repeat = True;
820 Pixmap mask_pmap = XCreatePixmap (dpy, target->vt, 1, 1, 8);
821 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
822 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
823 XFreePixmap (dpy, mask_pmap);
824
825 if (src && dst && mask)
826 {
827 XRenderColor mask_c;
828
829 mask_c.alpha = 0x8000;
830 mask_c.red = 0;
831 mask_c.green = 0;
832 mask_c.blue = 0;
833 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
834 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
835 }
836
837 XRenderFreePicture (dpy, src);
838 XRenderFreePicture (dpy, dst);
839 XRenderFreePicture (dpy, mask);
840
841 XFreePixmap (dpy, root_pmap);
842 }
843#endif
844
863 if (result != pixbuf) 845 if (result != pixbuf)
864 g_object_unref (result); 846 g_object_unref (result);
865 847
866 XFreeGC (target->dpy, gc); 848 XFreeGC (target->dpy, gc);
867 849
… …
873# endif /* HAVE_PIXBUF */ 855# endif /* HAVE_PIXBUF */
874 856
875bool 857bool
876bgPixmap_t::set_file (const char *file) 858bgPixmap_t::set_file (const char *file)
877{ 859{
878 assert (file); 860 if (!file || !*file)
861 return false;
879 862
880 if (*file)
881 {
882 if (const char *p = strchr (file, ';')) 863 if (const char *p = strchr (file, ';'))
883 { 864 {
884 size_t len = p - file; 865 size_t len = p - file;
885 char *f = rxvt_temp_buf<char> (len + 1); 866 char *f = rxvt_temp_buf<char> (len + 1);
886 memcpy (f, file, len); 867 memcpy (f, file, len);
887 f[len] = '\0'; 868 f[len] = '\0';
888 file = f; 869 file = f;
889 } 870 }
890 871
891# ifdef HAVE_AFTERIMAGE 872# ifdef HAVE_AFTERIMAGE
892 if (!target->asimman) 873 if (!target->asimman)
893 target->asimman = create_generic_imageman (target->rs[Rs_path]); 874 target->asimman = create_generic_imageman (target->rs[Rs_path]);
894 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 875 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
876 if (image)
877 {
895 if (original_asim) 878 if (original_asim)
879 safe_asimage_destroy (original_asim);
880 original_asim = image;
896 have_image = true; 881 have_image = true;
897 return have_image; 882 return true;
883 }
898# endif 884# endif
899 885
900# ifdef HAVE_PIXBUF 886# ifdef HAVE_PIXBUF
901 pixbuf = gdk_pixbuf_new_from_file (file, NULL); 887 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
888 if (image)
889 {
902 if (pixbuf) 890 if (pixbuf)
891 g_object_unref (pixbuf);
892 pixbuf = image;
903 have_image = true; 893 have_image = true;
904 return have_image; 894 return true;
895 }
905# endif 896# endif
906 }
907 897
908 return false; 898 return false;
909} 899}
910 900
911# endif /* BG_IMAGE_FROM_FILE */ 901# endif /* BG_IMAGE_FROM_FILE */
… …
924} 914}
925 915
926bool 916bool
927bgPixmap_t::set_blur_radius (const char *geom) 917bgPixmap_t::set_blur_radius (const char *geom)
928{ 918{
929 int changed = 0; 919 bool changed = false;
930 unsigned int hr, vr; 920 unsigned int hr, vr;
931 int junk; 921 int junk;
932 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 922 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
933 923
934 if (!(geom_flags & WidthValue)) 924 if (!(geom_flags & WidthValue))
935 hr = 1; 925 hr = 1;
936 if (!(geom_flags & HeightValue)) 926 if (!(geom_flags & HeightValue))
937 vr = hr; 927 vr = hr;
938 928
929 min_it (hr, 128);
930 min_it (vr, 128);
931
939 if (h_blurRadius != hr) 932 if (h_blurRadius != hr)
940 { 933 {
941 ++changed; 934 changed = true;
942 h_blurRadius = hr; 935 h_blurRadius = hr;
943 } 936 }
944 937
945 if (v_blurRadius != vr) 938 if (v_blurRadius != vr)
946 { 939 {
947 ++changed; 940 changed = true;
948 v_blurRadius = vr; 941 v_blurRadius = vr;
949 } 942 }
950 943
951 if (v_blurRadius == 0 && h_blurRadius == 0) 944 if (v_blurRadius == 0 && h_blurRadius == 0)
952 flags &= ~blurNeeded; 945 flags &= ~blurNeeded;
953 else 946 else
954 flags |= blurNeeded; 947 flags |= blurNeeded;
955 948
956 return (changed > 0); 949 return changed;
957} 950}
958 951
959static inline unsigned long 952static inline unsigned long
960compute_tint_shade_flags (rxvt_color *tint, int shade) 953compute_tint_shade_flags (rxvt_color *tint, int shade)
961{ 954{
962 unsigned long flags = 0; 955 unsigned long flags = 0;
963 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 956 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
964 bool has_shade = (shade > 0 && shade < 100) || (shade > 100 && shade < 200); 957 bool has_shade = shade != 100;
965 958
966 if (tint) 959 if (tint)
967 { 960 {
968 tint->get (c); 961 tint->get (c);
969# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 962# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
… …
983 { 976 {
984 flags |= bgPixmap_t::tintNeeded; 977 flags |= bgPixmap_t::tintNeeded;
985 } 978 }
986 } 979 }
987 980
988 if (flags & bgPixmap_t::tintNeeded)
989 {
990 if (flags & bgPixmap_t::tintWholesome)
991 flags |= bgPixmap_t::tintServerSide;
992 else
993 {
994#if XFT
995 flags |= bgPixmap_t::tintServerSide;
996#endif
997 }
998 }
999
1000 return flags; 981 return flags;
1001} 982}
1002 983
1003bool 984bool
1004bgPixmap_t::set_tint (rxvt_color &new_tint) 985bgPixmap_t::set_tint (rxvt_color &new_tint)
… …
1029} 1010}
1030 1011
1031bool 1012bool
1032bgPixmap_t::set_shade (const char *shade_str) 1013bgPixmap_t::set_shade (const char *shade_str)
1033{ 1014{
1034 int new_shade = (shade_str) ? atoi (shade_str) : 0; 1015 int new_shade = (shade_str) ? atoi (shade_str) : 100;
1035 1016
1036 if (new_shade < 0 && new_shade > -100) 1017 clamp_it (new_shade, -100, 200);
1018 if (new_shade < 0)
1037 new_shade = 200 - (100 + new_shade); 1019 new_shade = 200 - (100 + new_shade);
1038 else if (new_shade == 100)
1039 new_shade = 0;
1040 1020
1041 if (new_shade != shade) 1021 if (new_shade != shade)
1042 { 1022 {
1043 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 1023 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
1044 shade = new_shade; 1024 shade = new_shade;
… …
1047 } 1027 }
1048 1028
1049 return false; 1029 return false;
1050} 1030}
1051 1031
1032#if XRENDER
1033static void
1034get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1035{
1036 double sigma = radius / 2.0;
1037 double scale = sqrt (2.0 * M_PI) * sigma;
1038 double sum = 0.0;
1039
1040 for (int i = 0; i < width; i++)
1041 {
1042 double x = i - width / 2;
1043 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1044 sum += kernel[i];
1045 }
1046
1047 params[0] = XDoubleToFixed (width);
1048 params[1] = XDoubleToFixed (1);
1049
1050 for (int i = 0; i < width; i++)
1051 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1052}
1053#endif
1054
1052bool 1055bool
1056bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1057{
1058 bool ret = false;
1059#if XRENDER
1060 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1061 double *kernel = (double *)malloc (size * sizeof (double));
1062 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1063
1064 Display *dpy = target->dpy;
1065 XRenderPictureAttributes pa;
1066 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1067
1068 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1069 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1070
1071 if (kernel && params && src && dst)
1072 {
1073 if (h_blurRadius)
1074 {
1075 size = h_blurRadius * 2 + 1;
1076 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1077
1078 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1079 XRenderComposite (dpy,
1080 PictOpSrc,
1081 src,
1082 None,
1083 dst,
1084 0, 0,
1085 0, 0,
1086 0, 0,
1087 width, height);
1088 }
1089
1090 if (v_blurRadius)
1091 {
1092 size = v_blurRadius * 2 + 1;
1093 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1094 swap (params[0], params[1]);
1095
1096 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1097 XRenderComposite (dpy,
1098 PictOpSrc,
1099 src,
1100 None,
1101 dst,
1102 0, 0,
1103 0, 0,
1104 0, 0,
1105 width, height);
1106 }
1107
1108 ret = true;
1109 }
1110
1111 free (kernel);
1112 free (params);
1113 XRenderFreePicture (dpy, src);
1114 XRenderFreePicture (dpy, dst);
1115#endif
1116 return ret;
1117}
1118
1119bool
1053bgPixmap_t::tint_pixmap (Pixmap pixmap, Window root, int width, int height) 1120bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1054{ 1121{
1055 Display *dpy = target->dpy; 1122 Display *dpy = target->dpy;
1056 bool ret = false; 1123 bool ret = false;
1057 1124
1058 if (flags & tintWholesome) 1125 if (flags & tintWholesome)
… …
1064 * performance improvements, as we eliminate XImage transfer 1131 * performance improvements, as we eliminate XImage transfer
1065 */ 1132 */
1066 gcv.foreground = Pixel (tint); 1133 gcv.foreground = Pixel (tint);
1067 gcv.function = GXand; 1134 gcv.function = GXand;
1068 gcv.fill_style = FillSolid; 1135 gcv.fill_style = FillSolid;
1069 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv); 1136 gc = XCreateGC (dpy, pixmap, GCFillStyle | GCForeground | GCFunction, &gcv);
1070 if (gc) 1137 if (gc)
1071 { 1138 {
1072 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height); 1139 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1073 ret = true; 1140 ret = true;
1074 XFreeGC (dpy, gc); 1141 XFreeGC (dpy, gc);
1075 } 1142 }
1076 } 1143 }
1077 else 1144 else
1078 { 1145 {
1079# if XFT 1146# if XRENDER
1080 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1147 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1081 1148
1082 if (flags & tintSet) 1149 if (flags & tintSet)
1083 tint.get (c); 1150 tint.get (c);
1084 1151
1085 if (shade > 0 && shade < 100) 1152 if (shade <= 100)
1086 { 1153 {
1087 c.r = (c.r * shade) / 100; 1154 c.r = (c.r * shade) / 100;
1088 c.g = (c.g * shade) / 100; 1155 c.g = (c.g * shade) / 100;
1089 c.b = (c.b * shade) / 100; 1156 c.b = (c.b * shade) / 100;
1090 } 1157 }
1091 else if (shade > 100 && shade < 200) 1158 else
1092 { 1159 {
1093 c.r = ((0xffff - c.r) * (200 - shade)) / 100; 1160 c.r = ((0xffff - c.r) * (200 - shade)) / 100;
1094 c.g = ((0xffff - c.g) * (200 - shade)) / 100; 1161 c.g = ((0xffff - c.g) * (200 - shade)) / 100;
1095 c.b = ((0xffff - c.b) * (200 - shade)) / 100; 1162 c.b = ((0xffff - c.b) * (200 - shade)) / 100;
1096 } 1163 }
1097 1164
1098 XRenderPictFormat pf; 1165 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1099 pf.type = PictTypeDirect;
1100 pf.depth = 32;
1101 pf.direct.redMask = 0xff;
1102 pf.direct.greenMask = 0xff;
1103 pf.direct.blueMask = 0xff;
1104 pf.direct.alphaMask = 0xff;
1105
1106 XRenderPictFormat *solid_format = XRenderFindFormat (dpy, 1166 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1107 (PictFormatType|
1108 PictFormatDepth|
1109 PictFormatRedMask|
1110 PictFormatGreenMask|
1111 PictFormatBlueMask|
1112 PictFormatAlphaMask),
1113 &pf,
1114 0);
1115 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
1116 XRenderPictureAttributes pa; 1167 XRenderPictureAttributes pa;
1117 1168
1118 Picture back_pic = XRenderCreatePicture (dpy, pixmap, root_format, 0, &pa); 1169 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1119 1170
1120 pa.repeat = True; 1171 pa.repeat = True;
1121 1172
1122 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32); 1173 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1123 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa); 1174 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1124 XFreePixmap (dpy, overlay_pmap); 1175 XFreePixmap (dpy, overlay_pmap);
1125 1176
1126 pa.component_alpha = True; 1177 pa.component_alpha = True;
1127 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32); 1178 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1128 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa); 1179 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1129 XFreePixmap (dpy, mask_pmap); 1180 XFreePixmap (dpy, mask_pmap);
1130 1181
1131 if (mask_pic && overlay_pic && back_pic) 1182 if (mask_pic && overlay_pic && back_pic)
1132 { 1183 {
1133 XRenderColor mask_c; 1184 XRenderColor mask_c;
1134 1185
1135 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); 1186 mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0;
1136 mask_c.alpha = 0xffff; 1187 mask_c.alpha = 0xffff;
1137 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1188 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1138 1189
1139 mask_c.alpha = 0; 1190 mask_c.alpha = 0;
1140 mask_c.red = 0xffff - c.r; 1191 mask_c.red = 0xffff - c.r;
… …
1146 } 1197 }
1147 1198
1148 XRenderFreePicture (dpy, mask_pic); 1199 XRenderFreePicture (dpy, mask_pic);
1149 XRenderFreePicture (dpy, overlay_pic); 1200 XRenderFreePicture (dpy, overlay_pic);
1150 XRenderFreePicture (dpy, back_pic); 1201 XRenderFreePicture (dpy, back_pic);
1151# if DO_TIMING_TEST
1152 XSync (dpy, False);
1153# endif
1154# endif 1202# endif
1155 } 1203 }
1156 1204
1157 return ret; 1205 return ret;
1158} 1206}
1159 1207
1160/* make_transparency_pixmap() 1208/* make_transparency_pixmap()
1161 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1209 * Builds a pixmap of the same size as the terminal window that contains
1162 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 1210 * the tiled portion of the root pixmap that is supposed to be covered by
1163 * our window. 1211 * our window.
1164 */ 1212 */
1165unsigned long 1213unsigned long
1166bgPixmap_t::make_transparency_pixmap () 1214bgPixmap_t::make_transparency_pixmap ()
1167{ 1215{
… …
1171 return 0; 1219 return 0;
1172 1220
1173 /* root dimensions may change from call to call - but Display structure should 1221 /* root dimensions may change from call to call - but Display structure should
1174 * be always up-to-date, so let's use it : 1222 * be always up-to-date, so let's use it :
1175 */ 1223 */
1176 Window root = target->display->root;
1177 int screen = target->display->screen; 1224 int screen = target->display->screen;
1178 Display *dpy = target->dpy; 1225 Display *dpy = target->dpy;
1226 int root_depth = DefaultDepth (dpy, screen);
1179 int root_width = DisplayWidth (dpy, screen); 1227 int root_width = DisplayWidth (dpy, screen);
1180 int root_height = DisplayHeight (dpy, screen); 1228 int root_height = DisplayHeight (dpy, screen);
1181 unsigned int root_pmap_width, root_pmap_height; 1229 unsigned int root_pmap_width, root_pmap_height;
1182 int window_width = target->szHint.width; 1230 int window_width = target->szHint.width;
1183 int window_height = target->szHint.height; 1231 int window_height = target->szHint.height;
1184 int sx, sy; 1232 int sx, sy;
1185 XGCValues gcv; 1233 XGCValues gcv;
1234 GC gc;
1186 1235
1187 TIMING_TEST_START (tp);
1188 target->get_window_origin (sx, sy); 1236 target->get_window_origin (sx, sy);
1189 1237
1190 /* check if we are outside of the visible part of the virtual screen : */ 1238 /* check if we are outside of the visible part of the virtual screen : */
1191 if (sx + window_width <= 0 || sy + window_height <= 0 1239 if (sx + window_width <= 0 || sy + window_height <= 0
1192 || sx >= root_width || sy >= root_height) 1240 || sx >= root_width || sy >= root_height)
1193 return 0; 1241 return 0;
1194 1242
1243 // validate root pixmap and get its size
1195 if (root_pixmap != None) 1244 if (root_pixmap != None)
1196 { 1245 {
1197 /* we want to validate the pixmap and get it's size at the same time : */ 1246 Window wdummy;
1198 int junk; 1247 int idummy;
1199 unsigned int ujunk; 1248 unsigned int udummy;
1200 /* root pixmap may be bad - allow a error */ 1249
1201 target->allowedxerror = -1; 1250 target->allowedxerror = -1;
1202 1251
1203 if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk)) 1252 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy))
1204 root_pixmap = None; 1253 root_pixmap = None;
1205 1254
1206 target->allowedxerror = 0; 1255 target->allowedxerror = 0;
1207 } 1256 }
1208 1257
1258 Pixmap recoded_root_pmap = root_pixmap;
1259
1260 if (root_pixmap != None && root_depth != target->depth)
1261 {
1262#if XRENDER
1263 if (flags & HAS_RENDER)
1264 {
1265 XRenderPictureAttributes pa;
1266
1267 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1268 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1269
1270 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
1271 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
1272 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1273
1274 if (src && dst)
1275 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1276 else
1277 {
1278 XFreePixmap (dpy, recoded_root_pmap);
1279 root_pixmap = None;
1280 }
1281
1282 XRenderFreePicture (dpy, src);
1283 XRenderFreePicture (dpy, dst);
1284 }
1285 else
1286#endif
1287 root_pixmap = None;
1288 }
1289
1290 if (root_pixmap == None)
1291 return 0;
1292
1209 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1293 Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth);
1210 GC gc = NULL;
1211 1294
1212 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1295 if (tiled_root_pmap == None) /* something really bad happened - abort */
1213 return 0; 1296 return 0;
1214 1297
1215 if (root_pixmap == None) 1298 /* straightforward pixmap copy */
1216 { 1299 gcv.tile = recoded_root_pmap;
1217 /* use tricks to obtain the root background image :*/ 1300 gcv.fill_style = FillTiled;
1218 /* we want to create Overrideredirect window overlapping out window
1219 with background type of Parent Relative and then grab it */
1220 XSetWindowAttributes attr;
1221 Window src;
1222 bool success = false;
1223 1301
1224 attr.background_pixmap = ParentRelative; 1302 while (sx < 0) sx += (int)root_width;
1225 attr.backing_store = Always; 1303 while (sy < 0) sy += (int)root_height;
1226 attr.event_mask = ExposureMask;
1227 attr.override_redirect = True;
1228 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
1229 CopyFromParent, CopyFromParent, CopyFromParent,
1230 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
1231 &attr);
1232 1304
1233 if (src != None) 1305 gcv.ts_x_origin = -sx;
1234 { 1306 gcv.ts_y_origin = -sy;
1235 XEvent event; 1307 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1236 int ev_count = 0;
1237 XGrabServer (dpy);
1238 XMapRaised (dpy, src);
1239 XSync (dpy, False);
1240 1308
1241 /* XSync should get window where it's properly exposed, 1309 if (gc)
1242 * but to be on the safe side - let's check for the actual event to arrive : */ 1310 {
1243 while (XCheckWindowEvent (dpy, src, ExposureMask, &event)) 1311 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1244 ++ev_count; 1312 result |= transpPmapTiled;
1313 XFreeGC (dpy, gc);
1245 1314
1246 if (ev_count > 0); 1315 if (!need_client_side_rendering ())
1247 { 1316 {
1248 /* hooray! - we can grab the image! */ 1317 if ((flags & blurNeeded)
1249 gc = XCreateGC (dpy, root, 0, NULL); 1318 && (flags & HAS_RENDER_CONV))
1250 if (gc)
1251 { 1319 {
1252 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0); 1320 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1253 success = true; 1321 result |= transpPmapBlurred;
1254 }
1255 } 1322 }
1256
1257 XDestroyWindow (dpy, src);
1258 XUngrabServer (dpy);
1259 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
1260 }
1261
1262 if (!success)
1263 {
1264 XFreePixmap (dpy, tiled_root_pmap);
1265 tiled_root_pmap = None;
1266 }
1267 else
1268 result |= transpPmapTiled;
1269 }
1270 else
1271 {
1272 /* straightforward pixmap copy */
1273 gcv.tile = root_pixmap;
1274 gcv.fill_style = FillTiled;
1275
1276 while (sx < 0) sx += (int)root_width;
1277 while (sy < 0) sy += (int)root_height;
1278
1279 gcv.ts_x_origin = -sx;
1280 gcv.ts_y_origin = -sy;
1281 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1282
1283 if (gc)
1284 {
1285 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1286 result |= transpPmapTiled;
1287 }
1288 }
1289 TIMING_TEST_PRINT_RESULT (tp);
1290
1291 if (tiled_root_pmap != None)
1292 {
1293 if (!need_client_side_rendering ())
1294 {
1295 if ((flags & tintNeeded)) 1323 if ((flags & tintNeeded)
1324 && (flags & (tintWholesome | HAS_RENDER)))
1296 { 1325 {
1297 if (tint_pixmap (tiled_root_pmap, root, window_width, window_height)) 1326 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1298 result |= transpPmapTinted; 1327 result |= transpPmapTinted;
1299 } 1328 }
1300 } /* server side rendering completed */ 1329 } /* server side rendering completed */
1301 1330
1302 if (pixmap) 1331 if (pixmap)
1303 XFreePixmap (dpy, pixmap); 1332 XFreePixmap (dpy, pixmap);
1304 1333
1305 pixmap = tiled_root_pmap; 1334 pixmap = tiled_root_pmap;
1306 pmap_width = window_width; 1335 pmap_width = window_width;
1307 pmap_height = window_height; 1336 pmap_height = window_height;
1308 pmap_depth = root_depth; 1337 pmap_depth = target->depth;
1309 } 1338 }
1339 else
1340 XFreePixmap (dpy, tiled_root_pmap);
1310 1341
1311 if (gc) 1342 if (recoded_root_pmap != root_pixmap)
1312 XFreeGC (dpy, gc); 1343 XFreePixmap (dpy, recoded_root_pmap);
1313
1314 TIMING_TEST_PRINT_RESULT (tp);
1315 1344
1316 return result; 1345 return result;
1317} 1346}
1318 1347
1319bool 1348void
1320bgPixmap_t::set_root_pixmap () 1349bgPixmap_t::set_root_pixmap ()
1321{ 1350{
1322 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1351 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1323 if (new_root_pixmap == None) 1352 if (new_root_pixmap == None)
1324 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1353 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1325 1354
1326 if (new_root_pixmap != root_pixmap)
1327 {
1328 root_pixmap = new_root_pixmap; 1355 root_pixmap = new_root_pixmap;
1329 return true;
1330 }
1331
1332 return false;
1333} 1356}
1334# endif /* ENABLE_TRANSPARENCY */ 1357# endif /* ENABLE_TRANSPARENCY */
1335 1358
1336# ifndef HAVE_AFTERIMAGE 1359#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1337static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm); 1360static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c);
1338# endif 1361# endif
1339 1362
1340bool 1363bool
1341bgPixmap_t::render () 1364bgPixmap_t::render ()
1342{ 1365{
1343 unsigned long background_flags = 0; 1366 unsigned long background_flags = 0;
1344 1367
1345 if (target == NULL) 1368 if (target == NULL)
1346 return false; 1369 return false;
1347
1348 TIMING_TEST_START (tp);
1349 1370
1350 invalidate (); 1371 invalidate ();
1351# ifdef ENABLE_TRANSPARENCY 1372# ifdef ENABLE_TRANSPARENCY
1352 if (flags & isTransparent) 1373 if (flags & isTransparent)
1353 { 1374 {
1354 /* we need to re-generate transparency pixmap in that case ! */ 1375 /* we need to re-generate transparency pixmap in that case ! */
1355 background_flags = make_transparency_pixmap (); 1376 background_flags = make_transparency_pixmap ();
1356 if (background_flags == 0) 1377 if (background_flags == 0)
1357 return false; 1378 return false;
1358 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1379 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1359 && pmap_depth == target->depth)
1360 flags = flags & ~isInvalid; 1380 flags = flags & ~isInvalid;
1361 } 1381 }
1362# endif 1382# endif
1363 1383
1364# ifdef BG_IMAGE_FROM_FILE 1384# ifdef BG_IMAGE_FROM_FILE
… …
1368 if (render_image (background_flags)) 1388 if (render_image (background_flags))
1369 flags = flags & ~isInvalid; 1389 flags = flags & ~isInvalid;
1370 } 1390 }
1371# endif 1391# endif
1372 1392
1393# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1373 XImage *result = NULL; 1394 XImage *result = NULL;
1374 1395
1375 if (background_flags && (flags & isInvalid)) 1396 if (background_flags && (flags & isInvalid))
1376 { 1397 {
1377 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1398 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1378 } 1399 }
1379 1400
1380 if (result) 1401 if (result)
1381 { 1402 {
1382# if !defined(HAVE_AFTERIMAGE) && !XFT
1383 /* our own client-side tinting */ 1403 /* our own client-side tinting */
1384 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1385 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1386 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1404 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1387 { 1405 {
1388 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1406 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1389 if (flags & tintSet) 1407 if (flags & tintSet)
1390 tint.get (c); 1408 tint.get (c);
1391 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1409 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1392 } 1410 }
1393# endif
1394 1411
1395 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1412 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1396 1413
1397 if (gc) 1414 if (gc)
1398 { 1415 {
1399 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1400 {
1401 XFreePixmap (target->dpy, pixmap);
1402 pixmap = None;
1403 }
1404
1405 if (pixmap == None)
1406 {
1407 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1408 pmap_width = result->width;
1409 pmap_height = result->height;
1410 pmap_depth = target->depth;
1411 }
1412
1413 if (pmap_depth != result->depth)
1414 {
1415 /* Bad Match error will ensue ! stupid X !!!! */
1416 if (result->depth == 24 && pmap_depth == 32)
1417 result->depth = 32;
1418 else if (result->depth == 32 && pmap_depth == 24)
1419 result->depth = 24;
1420 else
1421 {
1422 /* TODO: implement image recoding */
1423 }
1424 }
1425
1426 if (pmap_depth == result->depth)
1427 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1416 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1428 1417
1429 XFreeGC (target->dpy, gc); 1418 XFreeGC (target->dpy, gc);
1430 flags = flags & ~isInvalid; 1419 flags = flags & ~isInvalid;
1431 } 1420 }
1432 1421
1433 XDestroyImage (result); 1422 XDestroyImage (result);
1434 } 1423 }
1424# endif
1435 1425
1436 if (flags & isInvalid) 1426 if (flags & isInvalid)
1437 { 1427 {
1438 if (pixmap != None) 1428 if (pixmap != None)
1439 { 1429 {
… …
1442 } 1432 }
1443 } 1433 }
1444 1434
1445 apply (); 1435 apply ();
1446 1436
1447 XSync (target->dpy, False);
1448 valid_since = ev::now (); 1437 valid_since = ev::now ();
1449 1438
1450 TIMING_TEST_PRINT_RESULT (tp);
1451
1452 return true; 1439 return true;
1453} 1440}
1454 1441
1455bool 1442void
1456bgPixmap_t::set_target (rxvt_term *new_target) 1443bgPixmap_t::set_target (rxvt_term *new_target)
1457{ 1444{
1458 if (new_target)
1459 if (target != new_target)
1460 {
1461 target = new_target; 1445 target = new_target;
1462# ifdef ENABLE_TRANSPARENCY 1446
1463 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1447 flags &= ~(HAS_RENDER | HAS_RENDER_CONV);
1448#if XRENDER
1449 int major, minor;
1450 if (XRenderQueryVersion (target->dpy, &major, &minor))
1451 flags |= HAS_RENDER;
1452 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1453 if (filters)
1454 {
1455 for (int i = 0; i < filters->nfilter; i++)
1456 if (!strcmp (filters->filter[i], FilterConvolution))
1457 flags |= HAS_RENDER_CONV;
1458
1459 XFree (filters);
1460 }
1464# endif 1461#endif
1465 return true;
1466 }
1467
1468 return false;
1469} 1462}
1470 1463
1471void 1464void
1472bgPixmap_t::apply () 1465bgPixmap_t::apply ()
1473{ 1466{
1474 if (target) 1467 if (target == NULL)
1475 { 1468 return;
1476 flags &= ~isVtOrigin;
1477 1469
1478 if (pixmap != None) 1470 if (pixmap != None)
1479 { 1471 {
1480 /* set target's background to pixmap */ 1472 /* set target's background to pixmap */
1481# ifdef ENABLE_TRANSPARENCY 1473# ifdef ENABLE_TRANSPARENCY
1482 if (flags & isTransparent) 1474 if (flags & isTransparent)
1483 { 1475 {
1484 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1476 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1485 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1477 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1486 1478
1487 if (target->scrollBar.win) 1479 if (target->scrollBar.win)
1488 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1480 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1489 } 1481 }
1490 else 1482 else
1491# endif 1483# endif
1492 { 1484 {
1493 flags |= isVtOrigin;
1494 /* force old pixmap dereference in case it was transparent before :*/ 1485 /* force old pixmap dereference in case it was transparent before :*/
1495 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1496 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1497 /* do we also need to set scrollbar's background here ? */
1498
1499 if (target->scrollBar.win)
1500 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1501 }
1502 }
1503 else
1504 {
1505 /* set target background to a pixel */
1506 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1486 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1507 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1487 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1508 /* do we also need to set scrollbar's background here ? */ 1488 /* do we also need to set scrollbar's background here ? */
1489
1509 if (target->scrollBar.win) 1490 if (target->scrollBar.win)
1510 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1491 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1511 } 1492 }
1493 }
1494 else
1495 {
1496 /* set target background to a pixel */
1497 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1498 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1499 /* do we also need to set scrollbar's background here ? */
1500 if (target->scrollBar.win)
1501 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1502 }
1512 1503
1513 /* don't want Expose on the parent or vt. It is better to use 1504 /* don't want Expose on the parent or vt. It is better to use
1514 scr_touch or we get a great deal of flicker otherwise: */ 1505 scr_touch or we get a great deal of flicker otherwise: */
1515 XClearWindow (target->dpy, target->parent[0]); 1506 XClearWindow (target->dpy, target->parent[0]);
1516 1507
1517 if (target->scrollBar.state && target->scrollBar.win) 1508 if (target->scrollBar.state && target->scrollBar.win)
1518 { 1509 {
1519 target->scrollBar.state = STATE_IDLE; 1510 target->scrollBar.state = STATE_IDLE;
1520 target->scrollBar.show (0); 1511 target->scrollBar.show (0);
1521 } 1512 }
1522 1513
1523 target->want_refresh = 1; 1514 target->want_refresh = 1;
1524 flags |= hasChanged; 1515 flags |= hasChanged;
1525 }
1526} 1516}
1527 1517
1528#endif /* HAVE_BG_PIXMAP */ 1518#endif /* HAVE_BG_PIXMAP */
1529 1519
1530#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1520#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1531/* taken from aterm-0.4.2 */ 1521/* taken from aterm-0.4.2 */
1532 1522
1533typedef uint32_t RUINT32T;
1534
1535static void 1523static void
1536ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm) 1524ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c)
1537{ 1525{
1538 int sh_r, sh_g, sh_b; 1526 int sh_r, sh_g, sh_b;
1539 RUINT32T mask_r, mask_g, mask_b; 1527 uint32_t mask_r, mask_g, mask_b;
1540 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1528 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1541 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1529 rgba low;
1542 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1530 rgba high;
1543 int i; 1531 int i;
1532 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1544 1533
1545 Visual *visual = term->visual;
1546
1547 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1534 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1548
1549 if (shade == 0)
1550 shade = 100;
1551 1535
1552 /* for convenience */ 1536 /* for convenience */
1553 mask_r = visual->red_mask; 1537 mask_r = visual->red_mask;
1554 mask_g = visual->green_mask; 1538 mask_g = visual->green_mask;
1555 mask_b = visual->blue_mask; 1539 mask_b = visual->blue_mask;
1556 1540
1557 /* boring lookup table pre-initialization */ 1541 /* boring lookup table pre-initialization */
1558 switch (srcImage->bits_per_pixel) { 1542 switch (srcImage->depth)
1543 {
1559 case 15: 1544 case 15:
1560 if ((mask_r != 0x7c00) || 1545 if ((mask_r != 0x7c00) ||
1561 (mask_g != 0x03e0) || 1546 (mask_g != 0x03e0) ||
1562 (mask_b != 0x001f)) 1547 (mask_b != 0x001f))
1563 return; 1548 return;
1564 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1549 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32));
1565 lookup_r = lookup; 1550 lookup_r = lookup;
1566 lookup_g = lookup+32; 1551 lookup_g = lookup+32;
1567 lookup_b = lookup+32+32; 1552 lookup_b = lookup+32+32;
1568 sh_r = 10; 1553 sh_r = 10;
1569 sh_g = 5; 1554 sh_g = 5;
1570 sh_b = 0; 1555 sh_b = 0;
1571 break; 1556 break;
1572 case 16: 1557 case 16:
1573 if ((mask_r != 0xf800) || 1558 if ((mask_r != 0xf800) ||
1574 (mask_g != 0x07e0) || 1559 (mask_g != 0x07e0) ||
1575 (mask_b != 0x001f)) 1560 (mask_b != 0x001f))
1576 return; 1561 return;
1577 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1562 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1578 lookup_r = lookup; 1563 lookup_r = lookup;
1579 lookup_g = lookup+32; 1564 lookup_g = lookup+32;
1580 lookup_b = lookup+32+64; 1565 lookup_b = lookup+32+64;
1581 sh_r = 11; 1566 sh_r = 11;
1582 sh_g = 5; 1567 sh_g = 5;
1583 sh_b = 0; 1568 sh_b = 0;
1584 break; 1569 break;
1585 case 24: 1570 case 24:
1586 if ((mask_r != 0xff0000) || 1571 if ((mask_r != 0xff0000) ||
1587 (mask_g != 0x00ff00) || 1572 (mask_g != 0x00ff00) ||
1588 (mask_b != 0x0000ff)) 1573 (mask_b != 0x0000ff))
1589 return; 1574 return;
1590 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1575 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1591 lookup_r = lookup; 1576 lookup_r = lookup;
1592 lookup_g = lookup+256; 1577 lookup_g = lookup+256;
1593 lookup_b = lookup+256+256; 1578 lookup_b = lookup+256+256;
1594 sh_r = 16; 1579 sh_r = 16;
1595 sh_g = 8; 1580 sh_g = 8;
1596 sh_b = 0; 1581 sh_b = 0;
1597 break; 1582 break;
1598 case 32: 1583 case 32:
1599 if ((mask_r != 0xff0000) || 1584 if ((mask_r != 0xff0000) ||
1600 (mask_g != 0x00ff00) || 1585 (mask_g != 0x00ff00) ||
1601 (mask_b != 0x0000ff)) 1586 (mask_b != 0x0000ff))
1602 return; 1587 return;
1603 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1588 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1604 lookup_r = lookup; 1589 lookup_r = lookup;
1605 lookup_g = lookup+256; 1590 lookup_g = lookup+256;
1606 lookup_b = lookup+256+256; 1591 lookup_b = lookup+256+256;
1607 sh_r = 16; 1592 sh_r = 16;
1608 sh_g = 8; 1593 sh_g = 8;
1609 sh_b = 0; 1594 sh_b = 0;
1610 break; 1595 break;
1611 default: 1596 default:
1612 return; /* we do not support this color depth */ 1597 return; /* we do not support this color depth */
1613 } 1598 }
1614 1599
1615 /* prepare limits for color transformation (each channel is handled separately) */ 1600 /* prepare limits for color transformation (each channel is handled separately) */
1616 if (shade < 0) { 1601 if (shade > 100)
1602 {
1617 shade = -shade; 1603 shade = 200 - shade;
1618 if (shade < 0) shade = 0;
1619 if (shade > 100) shade = 100;
1620 1604
1621 lower_lim_r = 65535-rm; 1605 high.r = (65535 - c.r) * shade / 100;
1622 lower_lim_g = 65535-gm; 1606 high.g = (65535 - c.g) * shade / 100;
1623 lower_lim_b = 65535-bm; 1607 high.b = (65535 - c.b) * shade / 100;
1624 1608
1625 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1609 low.r = 65535 - high.r;
1626 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1610 low.g = 65535 - high.g;
1627 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1611 low.b = 65535 - high.b;
1628
1629 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1630 } else {
1631 if (shade < 0) shade = 0;
1632 if (shade > 100) shade = 100;
1633
1634 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1635
1636 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1637 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1638 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1639 } 1612 }
1640 1613 else
1641 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1642 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1643 { 1614 {
1644 unsigned int tmp; 1615 high.r = c.r * shade / 100;
1616 high.g = c.g * shade / 100;
1617 high.b = c.b * shade / 100;
1645 1618
1646 tmp = lower_lim_r; 1619 low.r = low.g = low.b = 0;
1647 lower_lim_r = lower_lim_b;
1648 lower_lim_b = tmp;
1649
1650 tmp = upper_lim_r;
1651 upper_lim_r = upper_lim_b;
1652 upper_lim_b = tmp;
1653 } 1620 }
1654 1621
1655 /* fill our lookup tables */ 1622 /* fill our lookup tables */
1656 for (i = 0; i <= mask_r>>sh_r; i++) 1623 for (i = 0; i <= mask_r>>sh_r; i++)
1657 { 1624 {
1658 RUINT32T tmp; 1625 uint32_t tmp;
1659 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1626 tmp = i * high.r;
1660 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1627 tmp += (mask_r>>sh_r) * low.r;
1661 lookup_r[i] = (tmp/65535)<<sh_r; 1628 lookup_r[i] = (tmp/65535)<<sh_r;
1662 } 1629 }
1663 for (i = 0; i <= mask_g>>sh_g; i++) 1630 for (i = 0; i <= mask_g>>sh_g; i++)
1664 { 1631 {
1665 RUINT32T tmp; 1632 uint32_t tmp;
1666 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1633 tmp = i * high.g;
1667 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1634 tmp += (mask_g>>sh_g) * low.g;
1668 lookup_g[i] = (tmp/65535)<<sh_g; 1635 lookup_g[i] = (tmp/65535)<<sh_g;
1669 } 1636 }
1670 for (i = 0; i <= mask_b>>sh_b; i++) 1637 for (i = 0; i <= mask_b>>sh_b; i++)
1671 { 1638 {
1672 RUINT32T tmp; 1639 uint32_t tmp;
1673 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1640 tmp = i * high.b;
1674 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1641 tmp += (mask_b>>sh_b) * low.b;
1675 lookup_b[i] = (tmp/65535)<<sh_b; 1642 lookup_b[i] = (tmp/65535)<<sh_b;
1676 } 1643 }
1677 1644
1678 /* apply table to input image (replacing colors by newly calculated ones) */ 1645 /* apply table to input image (replacing colors by newly calculated ones) */
1679 switch (srcImage->bits_per_pixel) 1646 if (srcImage->bits_per_pixel == 32
1647 && (srcImage->depth == 24 || srcImage->depth == 32)
1648 && srcImage->byte_order == host_byte_order)
1680 { 1649 {
1681 case 15:
1682 {
1683 unsigned short *p1, *pf, *p, *pl; 1650 uint32_t *p1, *pf, *p, *pl;
1684 p1 = (unsigned short *) srcImage->data; 1651 p1 = (uint32_t *) srcImage->data;
1685 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1652 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1653
1686 while (p1 < pf) 1654 while (p1 < pf)
1687 { 1655 {
1688 p = p1; 1656 p = p1;
1689 pl = p1 + srcImage->width; 1657 pl = p1 + srcImage->width;
1690 for (; p < pl; p++) 1658 for (; p < pl; p++)
1691 { 1659 {
1692 *p = lookup_r[(*p & 0x7c00)>>10] |
1693 lookup_g[(*p & 0x03e0)>> 5] |
1694 lookup_b[(*p & 0x001f)];
1695 }
1696 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1697 }
1698 break;
1699 }
1700 case 16:
1701 {
1702 unsigned short *p1, *pf, *p, *pl;
1703 p1 = (unsigned short *) srcImage->data;
1704 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1705 while (p1 < pf)
1706 {
1707 p = p1;
1708 pl = p1 + srcImage->width;
1709 for (; p < pl; p++)
1710 {
1711 *p = lookup_r[(*p & 0xf800)>>11] |
1712 lookup_g[(*p & 0x07e0)>> 5] |
1713 lookup_b[(*p & 0x001f)];
1714 }
1715 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1716 }
1717 break;
1718 }
1719 case 24:
1720 {
1721 unsigned char *p1, *pf, *p, *pl;
1722 p1 = (unsigned char *) srcImage->data;
1723 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1724 while (p1 < pf)
1725 {
1726 p = p1;
1727 pl = p1 + srcImage->width * 3;
1728 for (; p < pl; p += 3)
1729 {
1730 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1731 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1732 p[2] = lookup_r[(p[2] & 0x0000ff)];
1733 }
1734 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1735 }
1736 break;
1737 }
1738 case 32:
1739 {
1740 RUINT32T *p1, *pf, *p, *pl;
1741 p1 = (RUINT32T *) srcImage->data;
1742 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1743
1744 while (p1 < pf)
1745 {
1746 p = p1;
1747 pl = p1 + srcImage->width;
1748 for (; p < pl; p++)
1749 {
1750 *p = lookup_r[(*p & 0xff0000)>>16] | 1660 *p = lookup_r[(*p & 0xff0000) >> 16] |
1751 lookup_g[(*p & 0x00ff00)>> 8] | 1661 lookup_g[(*p & 0x00ff00) >> 8] |
1752 lookup_b[(*p & 0x0000ff)] | 1662 lookup_b[(*p & 0x0000ff)] |
1753 (*p & ~0xffffff); 1663 (*p & 0xff000000);
1664 }
1665 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line);
1666 }
1667 }
1668 else
1669 {
1670 for (int y = 0; y < srcImage->height; y++)
1671 for (int x = 0; x < srcImage->width; x++)
1672 {
1673 unsigned long pixel = XGetPixel (srcImage, x, y);
1674 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1675 lookup_g[(pixel & mask_g) >> sh_g] |
1676 lookup_b[(pixel & mask_b) >> sh_b];
1677 XPutPixel (srcImage, x, y, pixel);
1754 } 1678 }
1755 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1756 } 1679 }
1757 break;
1758 }
1759 }
1760 1680
1761 free (lookup); 1681 free (lookup);
1762} 1682}
1763#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1683#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */

Diff Legend

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