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.81 by sf-exg, Wed Oct 13 23:08:11 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.
… …
23 24
24#include <cmath> 25#include <cmath>
25#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
26#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
27 28
29#if XRENDER
30# include <X11/extensions/Xrender.h>
31#endif
32
33#ifndef FilterConvolution
34#define FilterConvolution "convolution"
35#endif
36
28#define DO_TIMING_TEST 0 37#define DO_TIMING_TEST 0
29 38
30#if DO_TIMING_TEST 39#if DO_TIMING_TEST
31# include <sys/time.h> 40# include <sys/time.h>
32#define TIMING_TEST_START(id) \ 41#define TIMING_TEST_START(id) \
… …
57 * 66 *
58 * 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%.
59 * W and H are percentages of the terminal window size. 68 * W and H are percentages of the terminal window size.
60 * X and Y are also percentages; e.g., +50+50 centers 69 * X and Y are also percentages; e.g., +50+50 centers
61 * the image in the window. 70 * the image in the window.
62 * WxH+X Assumes Y == X
63 * WxH Assumes Y == X == 50 (centers the image)
64 * W+X+Y Assumes H == W
65 * W+X Assumes H == W and Y == X
66 * W Assumes H == W and Y == X == 50
67 *
68 * Adjusting position only :
69 * =+X+Y Set position to X% by Y% (absolute).
70 * =+X Set position to X% by X%.
71 * +X+Y Adjust position horizontally X% and vertically Y%
72 * from current position (relative).
73 * +X Adjust position horizontally X% and vertically X%
74 * from current position.
75 *
76 * Adjusting scale only :
77 * Wx0 Multiply horizontal scaling factor by W%
78 * 0xH Multiply vertical scaling factor by H%
79 * 0x0 No scaling (show image at normal size).
80 * 71 *
81 * Pixmap Operations : (should be prepended by a colon) 72 * Pixmap Operations : (should be prepended by a colon)
82 * tile Tile image. Scaling/position modifiers above will affect 73 * tile Tile image. Scaling/position modifiers above will affect
83 * the tile size and origin. 74 * the tile size and origin.
84 * propscale When scaling, scale proportionally. That is, maintain the 75 * propscale When scaling, scale proportionally. That is, maintain the
… …
167 return true; 158 return true;
168 } 159 }
169# endif 160# endif
170 161
171 return false; 162 return false;
172}; 163}
173 164
174bool bgPixmap_t::need_client_side_rendering () 165bool bgPixmap_t::need_client_side_rendering ()
175{ 166{
176# ifdef HAVE_AFTERIMAGE 167# ifdef HAVE_AFTERIMAGE
177 if (original_asim) 168 if (original_asim)
178 return true; 169 return true;
179# endif
180# ifdef ENABLE_TRANSPARENCY
181 if (flags & isTransparent)
182 {
183# ifdef HAVE_AFTERIMAGE
184 if ((flags & blurNeeded) && !(flags & blurServerSide))
185 return true;
186# endif
187 if ((flags & tintNeeded) && !(flags & tintServerSide))
188 return true;
189 }
190# endif 170# endif
191 return false; 171 return false;
192} 172}
193 173
194# ifdef BG_IMAGE_FROM_FILE 174# ifdef BG_IMAGE_FROM_FILE
… …
232 int diff = window_size - image_size; 212 int diff = window_size - image_size;
233 int smaller = min (image_size, window_size); 213 int smaller = min (image_size, window_size);
234 214
235 if (align >= 0 && align <= 100) 215 if (align >= 0 && align <= 100)
236 return diff * align / 100; 216 return diff * align / 100;
237 else if (align > 100 && align <= 200 ) 217 else if (align > 100 && align <= 200)
238 return ((align - 100) * smaller / 100) + window_size - smaller; 218 return ((align - 100) * smaller / 100) + window_size - smaller;
239 else if (align >= -100 && align < 0) 219 else if (align >= -100 && align < 0)
240 return ((align + 100) * smaller / 100) - image_size; 220 return ((align + 100) * smaller / 100) - image_size;
241 return 0; 221 return 0;
242} 222}
… …
258 dst_size = target_size - dst_pos; 238 dst_size = target_size - dst_pos;
259 return src_pos; 239 return src_pos;
260} 240}
261 241
262bool 242bool
263bgPixmap_t::set_geometry (const char *geom) 243bgPixmap_t::set_geometry (const char *geom, bool update)
264{ 244{
245 bool changed = false;
265 int geom_flags = 0, changed = 0; 246 int geom_flags = 0;
266 int x = 0, y = 0; 247 int x = 0, y = 0;
267 unsigned int w = 0, h = 0; 248 unsigned int w = 0, h = 0;
268 unsigned int n; 249 unsigned int n;
269 unsigned long new_flags = (flags & (~geometryFlags)); 250 unsigned long new_flags = (flags & (~geometryFlags));
270 const char *p; 251 const char *p;
… …
281 262
282 n = (p - geom); 263 n = (p - geom);
283 if (n < MAXLEN_GEOM) 264 if (n < MAXLEN_GEOM)
284 { 265 {
285 char *ops; 266 char *ops;
286 new_flags |= geometrySet;
287 267
288 memcpy (str, geom, n); 268 memcpy (str, geom, n);
289 str[n] = '\0'; 269 str[n] = '\0';
290 if (str[0] == ':') 270 if (str[0] == ':')
291 ops = &str[0]; 271 ops = &str[0];
… …
306 if (ops > str || ops == NULL) 286 if (ops > str || ops == NULL)
307 { 287 {
308 /* 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 */
309 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 289 geom_flags = XParseGeometry (str, &x, &y, &w, &h);
310 290
311 if ((geom_flags & XValue) && !(geom_flags & YValue))
312 {
313 y = x;
314 geom_flags |= YValue;
315 }
316
317 if (flags & geometrySet)
318 {
319 /* new geometry is an adjustment to the old one ! */
320 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
321 {
322 if (w == 0 && h != 0)
323 {
324 w = h_scale;
325 h = (v_scale * h) / 100;
326 }
327 else if (h == 0 && w != 0)
328 {
329 w = (h_scale * w) / 100;
330 h = v_scale;
331 }
332 }
333 if (geom_flags & XValue)
334 {
335 if (str[0] != '=')
336 {
337 y += v_align;
338 x += h_align;
339 }
340 }
341 }
342 else /* setting up geometry from scratch */ 291 if (!update) /* setting up geometry from scratch */
343 { 292 {
344 if (!(geom_flags & XValue)) 293 if (!(geom_flags & XValue))
345 { 294 {
346 /* use default geometry - centered */ 295 /* use default geometry - centered */
347 x = y = defaultAlign; 296 x = y = defaultAlign;
… …
361 } 310 }
362 else 311 else
363 w = h; 312 w = h;
364 } 313 }
365 } /* done parsing geometry string */ 314 } /* done parsing geometry string */
366 else if (!(flags & geometrySet)) 315 else if (!update)
367 { 316 {
368 /* default geometry - scaled and centered */ 317 /* default geometry - scaled and centered */
369 x = y = defaultAlign; 318 x = y = defaultAlign;
370 w = h = defaultScale; 319 w = h = defaultScale;
371 } 320 }
372 321
373 if (!(flags & geometrySet)) 322 if (!update)
374 geom_flags |= WidthValue|HeightValue|XValue|YValue; 323 geom_flags |= WidthValue|HeightValue|XValue|YValue;
375 324
376 if (ops) 325 if (ops)
377 { 326 {
378 while (*ops) 327 while (*ops)
… …
426 375
427 while (*ops != ':' && *ops != '\0') ++ops; 376 while (*ops != ':' && *ops != '\0') ++ops;
428 } /* done parsing ops */ 377 } /* done parsing ops */
429 } 378 }
430 379
431 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;
432 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;
433 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;
434 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;
435 } 384 }
436 385
437 if (new_flags != flags) 386 if (new_flags != flags)
438 { 387 {
439 flags = new_flags; 388 flags = new_flags;
440 changed++; 389 changed = true;
441 } 390 }
442 391
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); 392 return changed;
446} 393}
447 394
448void 395void
449bgPixmap_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)
450{ 397{
… …
478 x = make_align_position (h_align, target_width, w); 425 x = make_align_position (h_align, target_width, w);
479 y = make_align_position (v_align, target_height, h); 426 y = make_align_position (v_align, target_height, h);
480 } 427 }
481 428
482 flags &= ~sizeSensitive; 429 flags &= ~sizeSensitive;
483 if (h_scale != 0 || v_scale != 0 430 if ((flags & propScale) || h_scale || v_scale
484 || h_align != 0 || v_align != 0 431 || (!(flags & rootAlign) && (h_align || v_align))
485 || w > target_width || h > target_height) 432 || w > target_width || h > target_height)
486 flags |= sizeSensitive; 433 flags |= sizeSensitive;
487} 434}
488 435
489# ifdef HAVE_AFTERIMAGE 436# ifdef HAVE_AFTERIMAGE
… …
539 486
540 int x = 0; 487 int x = 0;
541 int y = 0; 488 int y = 0;
542 int w = 0; 489 int w = 0;
543 int h = 0; 490 int h = 0;
544
545 TIMING_TEST_START (asim);
546 491
547 if (original_asim) 492 if (original_asim)
548 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);
549 494
550 if (!original_asim 495 if (!original_asim
… …
667 } 612 }
668 613
669 free (layers); 614 free (layers);
670 } 615 }
671 } 616 }
672 TIMING_TEST_PRINT_RESULT (asim);
673 617
674 bool ret = false; 618 bool ret = false;
675 619
676 if (result) 620 if (result)
677 { 621 {
678 XGCValues gcv; 622 XGCValues gcv;
679 GC gc; 623 GC gc;
680 624
681 if (pixmap)
682 {
683 if (pmap_width != new_pmap_width
684 || pmap_height != new_pmap_height
685 || pmap_depth != target->depth)
686 {
687 XFreePixmap (target->dpy, pixmap);
688 pixmap = None;
689 }
690 }
691
692 /* create Pixmap */ 625 /* create Pixmap */
693 if (pixmap == None) 626 if (pixmap == None
627 || pmap_width != new_pmap_width
628 || pmap_height != new_pmap_height
629 || pmap_depth != target->depth)
694 { 630 {
631 if (pixmap)
632 XFreePixmap (target->dpy, pixmap);
695 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);
696 pmap_width = new_pmap_width; 634 pmap_width = new_pmap_width;
697 pmap_height = new_pmap_height; 635 pmap_height = new_pmap_height;
698 pmap_depth = target->depth; 636 pmap_depth = target->depth;
699 } 637 }
… …
723 661
724 if (result != background && result != original_asim) 662 if (result != background && result != original_asim)
725 destroy_asimage (&result); 663 destroy_asimage (&result);
726 664
727 XFreeGC (target->dpy, gc); 665 XFreeGC (target->dpy, gc);
728 TIMING_TEST_PRINT_RESULT (asim);
729 666
730 ret = true; 667 ret = true;
731 } 668 }
732 669
733 if (background) 670 if (background)
… …
745 return false; 682 return false;
746 683
747 if (!pixbuf) 684 if (!pixbuf)
748 return false; 685 return false;
749 686
750#if !XFT
751 if (background_flags) 687 if (background_flags
688 && !(flags & HAS_RENDER))
752 return false; 689 return false;
753#endif
754 690
755 GdkPixbuf *result; 691 GdkPixbuf *result;
756 692
757 int image_width = gdk_pixbuf_get_width (pixbuf); 693 int image_width = gdk_pixbuf_get_width (pixbuf);
758 int image_height = gdk_pixbuf_get_height (pixbuf); 694 int image_height = gdk_pixbuf_get_height (pixbuf);
… …
809 new_pmap_width = min (image_width, target_width); 745 new_pmap_width = min (image_width, target_width);
810 new_pmap_height = min (image_height, target_height); 746 new_pmap_height = min (image_height, target_height);
811 } 747 }
812 } 748 }
813 749
814 if (pixmap)
815 {
816 if (pmap_width != new_pmap_width
817 || pmap_height != new_pmap_height
818 || pmap_depth != target->depth)
819 {
820 XFreePixmap (target->dpy, pixmap);
821 pixmap = None;
822 }
823 }
824
825 if (pixmap == None) 750 if (pixmap == None
751 || pmap_width != new_pmap_width
752 || pmap_height != new_pmap_height
753 || pmap_depth != target->depth)
826 { 754 {
755 if (pixmap)
756 XFreePixmap (target->dpy, pixmap);
827 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);
828 pmap_width = new_pmap_width; 758 pmap_width = new_pmap_width;
829 pmap_height = new_pmap_height; 759 pmap_height = new_pmap_height;
830 pmap_depth = target->depth; 760 pmap_depth = target->depth;
831 } 761 }
… …
872 dst_width, dst_height, 802 dst_width, dst_height,
873 XLIB_RGB_DITHER_NONE, 803 XLIB_RGB_DITHER_NONE,
874 0, 0); 804 0, 0);
875 } 805 }
876 806
877#if XFT 807#if XRENDER
878 if (background_flags) 808 if (background_flags)
879 { 809 {
880 Display *dpy = target->dpy; 810 Display *dpy = target->dpy;
881 XRenderPictureAttributes pa; 811 XRenderPictureAttributes pa;
882 812
883 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen)); 813 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, target->visual);
884 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 814 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
885 815
886 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); 816 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
887 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa); 817 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
888 818
… …
925# endif /* HAVE_PIXBUF */ 855# endif /* HAVE_PIXBUF */
926 856
927bool 857bool
928bgPixmap_t::set_file (const char *file) 858bgPixmap_t::set_file (const char *file)
929{ 859{
930 assert (file); 860 if (!file || !*file)
861 return false;
931 862
932 if (*file)
933 {
934 if (const char *p = strchr (file, ';')) 863 if (const char *p = strchr (file, ';'))
935 { 864 {
936 size_t len = p - file; 865 size_t len = p - file;
937 char *f = rxvt_temp_buf<char> (len + 1); 866 char *f = rxvt_temp_buf<char> (len + 1);
938 memcpy (f, file, len); 867 memcpy (f, file, len);
939 f[len] = '\0'; 868 f[len] = '\0';
940 file = f; 869 file = f;
941 } 870 }
942 871
943# ifdef HAVE_AFTERIMAGE 872# ifdef HAVE_AFTERIMAGE
944 if (!target->asimman) 873 if (!target->asimman)
945 target->asimman = create_generic_imageman (target->rs[Rs_path]); 874 target->asimman = create_generic_imageman (target->rs[Rs_path]);
946 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 875 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
876 if (image)
877 {
947 if (original_asim) 878 if (original_asim)
879 safe_asimage_destroy (original_asim);
880 original_asim = image;
948 have_image = true; 881 have_image = true;
949 return have_image; 882 return true;
883 }
950# endif 884# endif
951 885
952# ifdef HAVE_PIXBUF 886# ifdef HAVE_PIXBUF
953 pixbuf = gdk_pixbuf_new_from_file (file, NULL); 887 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
888 if (image)
889 {
954 if (pixbuf) 890 if (pixbuf)
891 g_object_unref (pixbuf);
892 pixbuf = image;
955 have_image = true; 893 have_image = true;
956 return have_image; 894 return true;
895 }
957# endif 896# endif
958 }
959 897
960 return false; 898 return false;
961} 899}
962 900
963# endif /* BG_IMAGE_FROM_FILE */ 901# endif /* BG_IMAGE_FROM_FILE */
… …
976} 914}
977 915
978bool 916bool
979bgPixmap_t::set_blur_radius (const char *geom) 917bgPixmap_t::set_blur_radius (const char *geom)
980{ 918{
981 int changed = 0; 919 bool changed = false;
982 unsigned int hr, vr; 920 unsigned int hr, vr;
983 int junk; 921 int junk;
984 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 922 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
985 923
986 if (!(geom_flags & WidthValue)) 924 if (!(geom_flags & WidthValue))
… …
991 min_it (hr, 128); 929 min_it (hr, 128);
992 min_it (vr, 128); 930 min_it (vr, 128);
993 931
994 if (h_blurRadius != hr) 932 if (h_blurRadius != hr)
995 { 933 {
996 ++changed; 934 changed = true;
997 h_blurRadius = hr; 935 h_blurRadius = hr;
998 } 936 }
999 937
1000 if (v_blurRadius != vr) 938 if (v_blurRadius != vr)
1001 { 939 {
1002 ++changed; 940 changed = true;
1003 v_blurRadius = vr; 941 v_blurRadius = vr;
1004 } 942 }
1005 943
1006 if (v_blurRadius == 0 && h_blurRadius == 0) 944 if (v_blurRadius == 0 && h_blurRadius == 0)
1007 flags &= ~blurNeeded; 945 flags &= ~blurNeeded;
1008 else 946 else
1009 flags |= blurNeeded; 947 flags |= blurNeeded;
1010 948
1011#if XFT
1012 XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root);
1013 if (filters)
1014 {
1015 for (int i = 0; i < filters->nfilter; i++)
1016 if (!strcmp (filters->filter[i], FilterConvolution))
1017 flags |= bgPixmap_t::blurServerSide;
1018
1019 XFree (filters);
1020 }
1021#endif
1022
1023 return (changed > 0); 949 return changed;
1024} 950}
1025 951
1026static inline unsigned long 952static inline unsigned long
1027compute_tint_shade_flags (rxvt_color *tint, int shade) 953compute_tint_shade_flags (rxvt_color *tint, int shade)
1028{ 954{
… …
1050 { 976 {
1051 flags |= bgPixmap_t::tintNeeded; 977 flags |= bgPixmap_t::tintNeeded;
1052 } 978 }
1053 } 979 }
1054 980
1055 if (flags & bgPixmap_t::tintNeeded)
1056 {
1057 if (flags & bgPixmap_t::tintWholesome)
1058 flags |= bgPixmap_t::tintServerSide;
1059 else
1060 {
1061#if XFT
1062 flags |= bgPixmap_t::tintServerSide;
1063#endif
1064 }
1065 }
1066
1067 return flags; 981 return flags;
1068} 982}
1069 983
1070bool 984bool
1071bgPixmap_t::set_tint (rxvt_color &new_tint) 985bgPixmap_t::set_tint (rxvt_color &new_tint)
… …
1113 } 1027 }
1114 1028
1115 return false; 1029 return false;
1116} 1030}
1117 1031
1032#if XRENDER
1118static void 1033static void
1119get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 1034get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1120{ 1035{
1121 double sigma = radius / 2.0; 1036 double sigma = radius / 2.0;
1122 double scale = sqrt (2.0 * M_PI) * sigma; 1037 double scale = sqrt (2.0 * M_PI) * sigma;
1123 double sum = 0.0; 1038 double sum = 0.0;
1124 1039
1125 for (int i = 0; i < width; i++) 1040 for (int i = 0; i < width; i++)
1126 { 1041 {
1127 double x = i - width / 2; 1042 double x = i - width / 2;
1128 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; 1043 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1129 sum += kernel[i]; 1044 sum += kernel[i];
1130 } 1045 }
1131 1046
1132 params[0] = XDoubleToFixed (width); 1047 params[0] = XDoubleToFixed (width);
1133 params[1] = XDoubleToFixed (1); 1048 params[1] = XDoubleToFixed (1);
1134 1049
1135 for (int i = 0; i < width; i++) 1050 for (int i = 0; i < width; i++)
1136 params[i+2] = XDoubleToFixed (kernel[i] / sum); 1051 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1137} 1052}
1053#endif
1138 1054
1139bool 1055bool
1140bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1056bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1141{ 1057{
1142 bool ret = false; 1058 bool ret = false;
1143#if XFT 1059#if XRENDER
1144 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1060 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1145 double *kernel = (double *)malloc (size * sizeof (double)); 1061 double *kernel = (double *)malloc (size * sizeof (double));
1146 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1062 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1147 1063
1148 Display *dpy = target->dpy; 1064 Display *dpy = target->dpy;
1149 XRenderPictureAttributes pa; 1065 XRenderPictureAttributes pa;
1150 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, target->visual); 1066 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1151 1067
1152 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1068 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1153 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1069 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1154 1070
1155 if (kernel && params && src && dst) 1071 if (kernel && params && src && dst)
… …
1225 XFreeGC (dpy, gc); 1141 XFreeGC (dpy, gc);
1226 } 1142 }
1227 } 1143 }
1228 else 1144 else
1229 { 1145 {
1230# if XFT 1146# if XRENDER
1231 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1147 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1232 1148
1233 if (flags & tintSet) 1149 if (flags & tintSet)
1234 tint.get (c); 1150 tint.get (c);
1235 1151
… …
1265 1181
1266 if (mask_pic && overlay_pic && back_pic) 1182 if (mask_pic && overlay_pic && back_pic)
1267 { 1183 {
1268 XRenderColor mask_c; 1184 XRenderColor mask_c;
1269 1185
1270 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); 1186 mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0;
1271 mask_c.alpha = 0xffff; 1187 mask_c.alpha = 0xffff;
1272 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1188 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1273 1189
1274 mask_c.alpha = 0; 1190 mask_c.alpha = 0;
1275 mask_c.red = 0xffff - c.r; 1191 mask_c.red = 0xffff - c.r;
… …
1281 } 1197 }
1282 1198
1283 XRenderFreePicture (dpy, mask_pic); 1199 XRenderFreePicture (dpy, mask_pic);
1284 XRenderFreePicture (dpy, overlay_pic); 1200 XRenderFreePicture (dpy, overlay_pic);
1285 XRenderFreePicture (dpy, back_pic); 1201 XRenderFreePicture (dpy, back_pic);
1286# if DO_TIMING_TEST
1287 XSync (dpy, False);
1288# endif
1289# endif 1202# endif
1290 } 1203 }
1291 1204
1292 return ret; 1205 return ret;
1293} 1206}
1294 1207
1295/* make_transparency_pixmap() 1208/* make_transparency_pixmap()
1296 * 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
1297 * 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
1298 * our window. 1211 * our window.
1299 */ 1212 */
1300unsigned long 1213unsigned long
1301bgPixmap_t::make_transparency_pixmap () 1214bgPixmap_t::make_transparency_pixmap ()
1302{ 1215{
… …
1306 return 0; 1219 return 0;
1307 1220
1308 /* 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
1309 * be always up-to-date, so let's use it : 1222 * be always up-to-date, so let's use it :
1310 */ 1223 */
1311 Window root = target->display->root;
1312 int screen = target->display->screen; 1224 int screen = target->display->screen;
1313 Display *dpy = target->dpy; 1225 Display *dpy = target->dpy;
1226 int root_depth = DefaultDepth (dpy, screen);
1314 int root_width = DisplayWidth (dpy, screen); 1227 int root_width = DisplayWidth (dpy, screen);
1315 int root_height = DisplayHeight (dpy, screen); 1228 int root_height = DisplayHeight (dpy, screen);
1316 unsigned int root_pmap_width, root_pmap_height; 1229 unsigned int root_pmap_width, root_pmap_height;
1317 int window_width = target->szHint.width; 1230 int window_width = target->szHint.width;
1318 int window_height = target->szHint.height; 1231 int window_height = target->szHint.height;
1319 int sx, sy; 1232 int sx, sy;
1320 XGCValues gcv; 1233 XGCValues gcv;
1321 GC gc; 1234 GC gc;
1322 1235
1323 TIMING_TEST_START (tp);
1324 target->get_window_origin (sx, sy); 1236 target->get_window_origin (sx, sy);
1325 1237
1326 /* 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 : */
1327 if (sx + window_width <= 0 || sy + window_height <= 0 1239 if (sx + window_width <= 0 || sy + window_height <= 0
1328 || sx >= root_width || sy >= root_height) 1240 || sx >= root_width || sy >= root_height)
1329 return 0; 1241 return 0;
1330 1242
1243 // validate root pixmap and get its size
1331 if (root_pixmap != None) 1244 if (root_pixmap != None)
1332 { 1245 {
1333 /* we want to validate the pixmap and get its size at the same time : */ 1246 Window wdummy;
1334 int junk; 1247 int idummy;
1335 unsigned int ujunk; 1248 unsigned int udummy;
1336 /* root pixmap may be bad - allow a error */ 1249
1337 target->allowedxerror = -1; 1250 target->allowedxerror = -1;
1338 1251
1339 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))
1340 root_pixmap = None; 1253 root_pixmap = None;
1341 1254
1342 target->allowedxerror = 0; 1255 target->allowedxerror = 0;
1256 }
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;
1343 } 1288 }
1344 1289
1345 if (root_pixmap == None) 1290 if (root_pixmap == None)
1346 return 0; 1291 return 0;
1347 1292
1348 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);
1349 1294
1350 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1295 if (tiled_root_pmap == None) /* something really bad happened - abort */
1351 return 0; 1296 return 0;
1352 1297
1353 /* straightforward pixmap copy */ 1298 /* straightforward pixmap copy */
1354 gcv.tile = root_pixmap; 1299 gcv.tile = recoded_root_pmap;
1355 gcv.fill_style = FillTiled; 1300 gcv.fill_style = FillTiled;
1356 1301
1357 while (sx < 0) sx += (int)root_width; 1302 while (sx < 0) sx += (int)root_width;
1358 while (sy < 0) sy += (int)root_height; 1303 while (sy < 0) sy += (int)root_height;
1359 1304
1360 gcv.ts_x_origin = -sx; 1305 gcv.ts_x_origin = -sx;
1361 gcv.ts_y_origin = -sy; 1306 gcv.ts_y_origin = -sy;
1362 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1307 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1363 1308
1364 if (gc) 1309 if (gc)
1365 { 1310 {
1366 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1311 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1367 result |= transpPmapTiled; 1312 result |= transpPmapTiled;
1368 XFreeGC (dpy, gc); 1313 XFreeGC (dpy, gc);
1369 }
1370 TIMING_TEST_PRINT_RESULT (tp);
1371 1314
1372 if (tiled_root_pmap != None)
1373 {
1374 if (!need_client_side_rendering ()) 1315 if (!need_client_side_rendering ())
1375 { 1316 {
1376 if ((flags & blurNeeded)) 1317 if ((flags & blurNeeded)
1318 && (flags & HAS_RENDER_CONV))
1377 { 1319 {
1378 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height)) 1320 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1379 result |= transpPmapBlurred; 1321 result |= transpPmapBlurred;
1380 } 1322 }
1381 if ((flags & tintNeeded)) 1323 if ((flags & tintNeeded)
1324 && (flags & (tintWholesome | HAS_RENDER)))
1382 { 1325 {
1383 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height)) 1326 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1384 result |= transpPmapTinted; 1327 result |= transpPmapTinted;
1385 } 1328 }
1386 } /* server side rendering completed */ 1329 } /* server side rendering completed */
1387 1330
1388 if (pixmap) 1331 if (pixmap)
1389 XFreePixmap (dpy, pixmap); 1332 XFreePixmap (dpy, pixmap);
1390 1333
1391 pixmap = tiled_root_pmap; 1334 pixmap = tiled_root_pmap;
1392 pmap_width = window_width; 1335 pmap_width = window_width;
1393 pmap_height = window_height; 1336 pmap_height = window_height;
1394 pmap_depth = root_depth; 1337 pmap_depth = target->depth;
1395 } 1338 }
1339 else
1340 XFreePixmap (dpy, tiled_root_pmap);
1396 1341
1397 TIMING_TEST_PRINT_RESULT (tp); 1342 if (recoded_root_pmap != root_pixmap)
1343 XFreePixmap (dpy, recoded_root_pmap);
1398 1344
1399 return result; 1345 return result;
1400} 1346}
1401 1347
1402bool 1348void
1403bgPixmap_t::set_root_pixmap () 1349bgPixmap_t::set_root_pixmap ()
1404{ 1350{
1405 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1351 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1406 if (new_root_pixmap == None) 1352 if (new_root_pixmap == None)
1407 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1353 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1408 1354
1409 if (new_root_pixmap != root_pixmap)
1410 {
1411 root_pixmap = new_root_pixmap; 1355 root_pixmap = new_root_pixmap;
1412 return true;
1413 }
1414
1415 return false;
1416} 1356}
1417# endif /* ENABLE_TRANSPARENCY */ 1357# endif /* ENABLE_TRANSPARENCY */
1418 1358
1419# ifndef HAVE_AFTERIMAGE 1359#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1420static 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);
1421# endif 1361# endif
1422 1362
1423bool 1363bool
1424bgPixmap_t::render () 1364bgPixmap_t::render ()
1425{ 1365{
1426 unsigned long background_flags = 0; 1366 unsigned long background_flags = 0;
1427 1367
1428 if (target == NULL) 1368 if (target == NULL)
1429 return false; 1369 return false;
1430
1431 TIMING_TEST_START (tp);
1432 1370
1433 invalidate (); 1371 invalidate ();
1434# ifdef ENABLE_TRANSPARENCY 1372# ifdef ENABLE_TRANSPARENCY
1435 if (flags & isTransparent) 1373 if (flags & isTransparent)
1436 { 1374 {
1437 /* we need to re-generate transparency pixmap in that case ! */ 1375 /* we need to re-generate transparency pixmap in that case ! */
1438 background_flags = make_transparency_pixmap (); 1376 background_flags = make_transparency_pixmap ();
1439 if (background_flags == 0) 1377 if (background_flags == 0)
1440 return false; 1378 return false;
1441 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1379 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1442 && pmap_depth == target->depth)
1443 flags = flags & ~isInvalid; 1380 flags = flags & ~isInvalid;
1444 } 1381 }
1445# endif 1382# endif
1446 1383
1447# ifdef BG_IMAGE_FROM_FILE 1384# ifdef BG_IMAGE_FROM_FILE
… …
1451 if (render_image (background_flags)) 1388 if (render_image (background_flags))
1452 flags = flags & ~isInvalid; 1389 flags = flags & ~isInvalid;
1453 } 1390 }
1454# endif 1391# endif
1455 1392
1393# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1456 XImage *result = NULL; 1394 XImage *result = NULL;
1457 1395
1458 if (background_flags && (flags & isInvalid)) 1396 if (background_flags && (flags & isInvalid))
1459 { 1397 {
1460 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);
1461 } 1399 }
1462 1400
1463 if (result) 1401 if (result)
1464 { 1402 {
1465# if !defined(HAVE_AFTERIMAGE) && !XFT
1466 /* our own client-side tinting */ 1403 /* our own client-side tinting */
1467 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1468 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1469 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1404 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1470 { 1405 {
1471 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1406 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1472 if (flags & tintSet) 1407 if (flags & tintSet)
1473 tint.get (c); 1408 tint.get (c);
1474 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1409 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1475 } 1410 }
1476# endif
1477 1411
1478 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1412 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1479 1413
1480 if (gc) 1414 if (gc)
1481 { 1415 {
1482 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1483 {
1484 XFreePixmap (target->dpy, pixmap);
1485 pixmap = None;
1486 }
1487
1488 if (pixmap == None)
1489 {
1490 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1491 pmap_width = result->width;
1492 pmap_height = result->height;
1493 pmap_depth = target->depth;
1494 }
1495
1496 if (pmap_depth != result->depth)
1497 {
1498 /* Bad Match error will ensue ! stupid X !!!! */
1499 if (result->depth == 24 && pmap_depth == 32)
1500 result->depth = 32;
1501 else if (result->depth == 32 && pmap_depth == 24)
1502 result->depth = 24;
1503 else
1504 {
1505 /* TODO: implement image recoding */
1506 }
1507 }
1508
1509 if (pmap_depth == result->depth)
1510 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);
1511 1417
1512 XFreeGC (target->dpy, gc); 1418 XFreeGC (target->dpy, gc);
1513 flags = flags & ~isInvalid; 1419 flags = flags & ~isInvalid;
1514 } 1420 }
1515 1421
1516 XDestroyImage (result); 1422 XDestroyImage (result);
1517 } 1423 }
1424# endif
1518 1425
1519 if (flags & isInvalid) 1426 if (flags & isInvalid)
1520 { 1427 {
1521 if (pixmap != None) 1428 if (pixmap != None)
1522 { 1429 {
… …
1525 } 1432 }
1526 } 1433 }
1527 1434
1528 apply (); 1435 apply ();
1529 1436
1530 XSync (target->dpy, False);
1531 valid_since = ev::now (); 1437 valid_since = ev::now ();
1532 1438
1533 TIMING_TEST_PRINT_RESULT (tp);
1534
1535 return true; 1439 return true;
1536} 1440}
1537 1441
1538bool 1442void
1539bgPixmap_t::set_target (rxvt_term *new_target) 1443bgPixmap_t::set_target (rxvt_term *new_target)
1540{ 1444{
1541 if (new_target)
1542 if (target != new_target)
1543 {
1544 target = new_target; 1445 target = new_target;
1545# ifdef ENABLE_TRANSPARENCY 1446
1546 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 }
1547# endif 1461#endif
1548 return true;
1549 }
1550
1551 return false;
1552} 1462}
1553 1463
1554void 1464void
1555bgPixmap_t::apply () 1465bgPixmap_t::apply ()
1556{ 1466{
1557 if (target) 1467 if (target == NULL)
1558 { 1468 return;
1559 flags &= ~isVtOrigin;
1560 1469
1561 if (pixmap != None) 1470 if (pixmap != None)
1562 { 1471 {
1563 /* set target's background to pixmap */ 1472 /* set target's background to pixmap */
1564# ifdef ENABLE_TRANSPARENCY 1473# ifdef ENABLE_TRANSPARENCY
1565 if (flags & isTransparent) 1474 if (flags & isTransparent)
1566 { 1475 {
1567 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1476 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1568 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1477 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1569 1478
1570 if (target->scrollBar.win) 1479 if (target->scrollBar.win)
1571 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1480 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1572 } 1481 }
1573 else 1482 else
1574# endif 1483# endif
1575 { 1484 {
1576 flags |= isVtOrigin;
1577 /* force old pixmap dereference in case it was transparent before :*/ 1485 /* force old pixmap dereference in case it was transparent before :*/
1578 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1579 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1580 /* do we also need to set scrollbar's background here ? */
1581
1582 if (target->scrollBar.win)
1583 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1584 }
1585 }
1586 else
1587 {
1588 /* set target background to a pixel */
1589 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1486 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1590 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1487 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1591 /* do we also need to set scrollbar's background here ? */ 1488 /* do we also need to set scrollbar's background here ? */
1489
1592 if (target->scrollBar.win) 1490 if (target->scrollBar.win)
1593 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1491 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1594 } 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 }
1595 1503
1596 /* 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
1597 scr_touch or we get a great deal of flicker otherwise: */ 1505 scr_touch or we get a great deal of flicker otherwise: */
1598 XClearWindow (target->dpy, target->parent[0]); 1506 XClearWindow (target->dpy, target->parent[0]);
1599 1507
1600 if (target->scrollBar.state && target->scrollBar.win) 1508 if (target->scrollBar.state && target->scrollBar.win)
1601 { 1509 {
1602 target->scrollBar.state = STATE_IDLE; 1510 target->scrollBar.state = STATE_IDLE;
1603 target->scrollBar.show (0); 1511 target->scrollBar.show (0);
1604 } 1512 }
1605 1513
1606 target->want_refresh = 1; 1514 target->want_refresh = 1;
1607 flags |= hasChanged; 1515 flags |= hasChanged;
1608 }
1609} 1516}
1610 1517
1611#endif /* HAVE_BG_PIXMAP */ 1518#endif /* HAVE_BG_PIXMAP */
1612 1519
1613#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1520#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1614/* taken from aterm-0.4.2 */ 1521/* taken from aterm-0.4.2 */
1615 1522
1616typedef uint32_t RUINT32T;
1617
1618static void 1523static void
1619ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm) 1524ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c)
1620{ 1525{
1621 int sh_r, sh_g, sh_b; 1526 int sh_r, sh_g, sh_b;
1622 RUINT32T mask_r, mask_g, mask_b; 1527 uint32_t mask_r, mask_g, mask_b;
1623 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1528 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1624 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1529 rgba low;
1625 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1530 rgba high;
1626 int i; 1531 int i;
1532 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1627 1533
1628 Visual *visual = term->visual;
1629
1630 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1534 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1631 1535
1632 /* for convenience */ 1536 /* for convenience */
1633 mask_r = visual->red_mask; 1537 mask_r = visual->red_mask;
1634 mask_g = visual->green_mask; 1538 mask_g = visual->green_mask;
1635 mask_b = visual->blue_mask; 1539 mask_b = visual->blue_mask;
1636 1540
1637 /* boring lookup table pre-initialization */ 1541 /* boring lookup table pre-initialization */
1638 switch (srcImage->bits_per_pixel) { 1542 switch (srcImage->depth)
1543 {
1639 case 15: 1544 case 15:
1640 if ((mask_r != 0x7c00) || 1545 if ((mask_r != 0x7c00) ||
1641 (mask_g != 0x03e0) || 1546 (mask_g != 0x03e0) ||
1642 (mask_b != 0x001f)) 1547 (mask_b != 0x001f))
1643 return; 1548 return;
1644 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1549 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32));
1645 lookup_r = lookup; 1550 lookup_r = lookup;
1646 lookup_g = lookup+32; 1551 lookup_g = lookup+32;
1647 lookup_b = lookup+32+32; 1552 lookup_b = lookup+32+32;
1648 sh_r = 10; 1553 sh_r = 10;
1649 sh_g = 5; 1554 sh_g = 5;
1650 sh_b = 0; 1555 sh_b = 0;
1651 break; 1556 break;
1652 case 16: 1557 case 16:
1653 if ((mask_r != 0xf800) || 1558 if ((mask_r != 0xf800) ||
1654 (mask_g != 0x07e0) || 1559 (mask_g != 0x07e0) ||
1655 (mask_b != 0x001f)) 1560 (mask_b != 0x001f))
1656 return; 1561 return;
1657 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1562 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1658 lookup_r = lookup; 1563 lookup_r = lookup;
1659 lookup_g = lookup+32; 1564 lookup_g = lookup+32;
1660 lookup_b = lookup+32+64; 1565 lookup_b = lookup+32+64;
1661 sh_r = 11; 1566 sh_r = 11;
1662 sh_g = 5; 1567 sh_g = 5;
1663 sh_b = 0; 1568 sh_b = 0;
1664 break; 1569 break;
1665 case 24: 1570 case 24:
1666 if ((mask_r != 0xff0000) || 1571 if ((mask_r != 0xff0000) ||
1667 (mask_g != 0x00ff00) || 1572 (mask_g != 0x00ff00) ||
1668 (mask_b != 0x0000ff)) 1573 (mask_b != 0x0000ff))
1669 return; 1574 return;
1670 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1575 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1671 lookup_r = lookup; 1576 lookup_r = lookup;
1672 lookup_g = lookup+256; 1577 lookup_g = lookup+256;
1673 lookup_b = lookup+256+256; 1578 lookup_b = lookup+256+256;
1674 sh_r = 16; 1579 sh_r = 16;
1675 sh_g = 8; 1580 sh_g = 8;
1676 sh_b = 0; 1581 sh_b = 0;
1677 break; 1582 break;
1678 case 32: 1583 case 32:
1679 if ((mask_r != 0xff0000) || 1584 if ((mask_r != 0xff0000) ||
1680 (mask_g != 0x00ff00) || 1585 (mask_g != 0x00ff00) ||
1681 (mask_b != 0x0000ff)) 1586 (mask_b != 0x0000ff))
1682 return; 1587 return;
1683 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1588 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1684 lookup_r = lookup; 1589 lookup_r = lookup;
1685 lookup_g = lookup+256; 1590 lookup_g = lookup+256;
1686 lookup_b = lookup+256+256; 1591 lookup_b = lookup+256+256;
1687 sh_r = 16; 1592 sh_r = 16;
1688 sh_g = 8; 1593 sh_g = 8;
1689 sh_b = 0; 1594 sh_b = 0;
1690 break; 1595 break;
1691 default: 1596 default:
1692 return; /* we do not support this color depth */ 1597 return; /* we do not support this color depth */
1693 } 1598 }
1694 1599
1695 /* prepare limits for color transformation (each channel is handled separately) */ 1600 /* prepare limits for color transformation (each channel is handled separately) */
1696 if (shade > 100) { 1601 if (shade > 100)
1602 {
1697 shade = 200 - shade; 1603 shade = 200 - shade;
1698 1604
1699 lower_lim_r = 65535-rm; 1605 high.r = (65535 - c.r) * shade / 100;
1700 lower_lim_g = 65535-gm; 1606 high.g = (65535 - c.g) * shade / 100;
1701 lower_lim_b = 65535-bm; 1607 high.b = (65535 - c.b) * shade / 100;
1702 1608
1703 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1609 low.r = 65535 - high.r;
1704 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1610 low.g = 65535 - high.g;
1705 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1611 low.b = 65535 - high.b;
1706
1707 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1708 } else {
1709
1710 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1711
1712 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1713 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1714 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1715 } 1612 }
1716 1613 else
1717 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1718 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1719 { 1614 {
1720 unsigned int tmp; 1615 high.r = c.r * shade / 100;
1616 high.g = c.g * shade / 100;
1617 high.b = c.b * shade / 100;
1721 1618
1722 tmp = lower_lim_r; 1619 low.r = low.g = low.b = 0;
1723 lower_lim_r = lower_lim_b;
1724 lower_lim_b = tmp;
1725
1726 tmp = upper_lim_r;
1727 upper_lim_r = upper_lim_b;
1728 upper_lim_b = tmp;
1729 } 1620 }
1730 1621
1731 /* fill our lookup tables */ 1622 /* fill our lookup tables */
1732 for (i = 0; i <= mask_r>>sh_r; i++) 1623 for (i = 0; i <= mask_r>>sh_r; i++)
1733 { 1624 {
1734 RUINT32T tmp; 1625 uint32_t tmp;
1735 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1626 tmp = i * high.r;
1736 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1627 tmp += (mask_r>>sh_r) * low.r;
1737 lookup_r[i] = (tmp/65535)<<sh_r; 1628 lookup_r[i] = (tmp/65535)<<sh_r;
1738 } 1629 }
1739 for (i = 0; i <= mask_g>>sh_g; i++) 1630 for (i = 0; i <= mask_g>>sh_g; i++)
1740 { 1631 {
1741 RUINT32T tmp; 1632 uint32_t tmp;
1742 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1633 tmp = i * high.g;
1743 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1634 tmp += (mask_g>>sh_g) * low.g;
1744 lookup_g[i] = (tmp/65535)<<sh_g; 1635 lookup_g[i] = (tmp/65535)<<sh_g;
1745 } 1636 }
1746 for (i = 0; i <= mask_b>>sh_b; i++) 1637 for (i = 0; i <= mask_b>>sh_b; i++)
1747 { 1638 {
1748 RUINT32T tmp; 1639 uint32_t tmp;
1749 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1640 tmp = i * high.b;
1750 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1641 tmp += (mask_b>>sh_b) * low.b;
1751 lookup_b[i] = (tmp/65535)<<sh_b; 1642 lookup_b[i] = (tmp/65535)<<sh_b;
1752 } 1643 }
1753 1644
1754 /* apply table to input image (replacing colors by newly calculated ones) */ 1645 /* apply table to input image (replacing colors by newly calculated ones) */
1755 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)
1756 { 1649 {
1757 case 15:
1758 {
1759 unsigned short *p1, *pf, *p, *pl; 1650 uint32_t *p1, *pf, *p, *pl;
1760 p1 = (unsigned short *) srcImage->data; 1651 p1 = (uint32_t *) srcImage->data;
1761 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1652 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1653
1762 while (p1 < pf) 1654 while (p1 < pf)
1763 { 1655 {
1764 p = p1; 1656 p = p1;
1765 pl = p1 + srcImage->width; 1657 pl = p1 + srcImage->width;
1766 for (; p < pl; p++) 1658 for (; p < pl; p++)
1767 { 1659 {
1768 *p = lookup_r[(*p & 0x7c00)>>10] |
1769 lookup_g[(*p & 0x03e0)>> 5] |
1770 lookup_b[(*p & 0x001f)];
1771 }
1772 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1773 }
1774 break;
1775 }
1776 case 16:
1777 {
1778 unsigned short *p1, *pf, *p, *pl;
1779 p1 = (unsigned short *) srcImage->data;
1780 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1781 while (p1 < pf)
1782 {
1783 p = p1;
1784 pl = p1 + srcImage->width;
1785 for (; p < pl; p++)
1786 {
1787 *p = lookup_r[(*p & 0xf800)>>11] |
1788 lookup_g[(*p & 0x07e0)>> 5] |
1789 lookup_b[(*p & 0x001f)];
1790 }
1791 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1792 }
1793 break;
1794 }
1795 case 24:
1796 {
1797 unsigned char *p1, *pf, *p, *pl;
1798 p1 = (unsigned char *) srcImage->data;
1799 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1800 while (p1 < pf)
1801 {
1802 p = p1;
1803 pl = p1 + srcImage->width * 3;
1804 for (; p < pl; p += 3)
1805 {
1806 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1807 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1808 p[2] = lookup_r[(p[2] & 0x0000ff)];
1809 }
1810 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1811 }
1812 break;
1813 }
1814 case 32:
1815 {
1816 RUINT32T *p1, *pf, *p, *pl;
1817 p1 = (RUINT32T *) srcImage->data;
1818 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1819
1820 while (p1 < pf)
1821 {
1822 p = p1;
1823 pl = p1 + srcImage->width;
1824 for (; p < pl; p++)
1825 {
1826 *p = lookup_r[(*p & 0xff0000)>>16] | 1660 *p = lookup_r[(*p & 0xff0000) >> 16] |
1827 lookup_g[(*p & 0x00ff00)>> 8] | 1661 lookup_g[(*p & 0x00ff00) >> 8] |
1828 lookup_b[(*p & 0x0000ff)] | 1662 lookup_b[(*p & 0x0000ff)] |
1829 (*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);
1830 } 1678 }
1831 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1832 } 1679 }
1833 break;
1834 }
1835 }
1836 1680
1837 free (lookup); 1681 free (lookup);
1838} 1682}
1839#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