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.120 by sf-exg, Thu Nov 18 17:29:25 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 *ops;
271# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */ 252# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
272 253
273 if (geom == NULL) 254 if (geom == NULL)
274 return false; 255 return false;
275 256
276 char str[MAXLEN_GEOM]; 257 char str[MAXLEN_GEOM];
277 258
278 while (isspace(*geom)) ++geom;
279 if ((p = strchr (geom, ';')) == NULL)
280 p = strchr (geom, '\0'); 259 ops = strchr (geom, ':');
281 260 if (ops == NULL)
261 n = strlen (geom);
262 else
282 n = (p - geom); 263 n = ops - geom;
264
283 if (n < MAXLEN_GEOM) 265 if (n < MAXLEN_GEOM)
284 { 266 {
285 char *ops;
286 new_flags |= geometrySet;
287
288 memcpy (str, geom, n); 267 memcpy (str, geom, n);
289 str[n] = '\0'; 268 str[n] = '\0';
269 rxvt_strtrim (str);
270
290 if (str[0] == ':') 271 if (str[0])
291 ops = &str[0];
292 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
293 ops = &str[0];
294 else
295 {
296 char *tmp;
297 ops = strchr (str, ':');
298 if (ops != NULL)
299 {
300 for (tmp = ops-1; tmp >= str && isspace(*tmp); --tmp);
301 *(++tmp) = '\0';
302 if (ops == tmp) ++ops;
303 }
304 }
305
306 if (ops > str || ops == NULL)
307 { 272 {
308 /* we have geometry string - let's handle it prior to applying ops */ 273 /* we have geometry string - let's handle it prior to applying ops */
309 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 274 geom_flags = XParseGeometry (str, &x, &y, &w, &h);
310
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 */
343 {
344 if (!(geom_flags & XValue))
345 {
346 /* use default geometry - centered */
347 x = y = defaultAlign;
348 }
349 else if (!(geom_flags & YValue))
350 y = x;
351
352 if ((geom_flags & (WidthValue|HeightValue)) == 0)
353 {
354 /* use default geometry - scaled */
355 w = h = defaultScale;
356 }
357 else if (geom_flags & WidthValue)
358 {
359 if (!(geom_flags & HeightValue))
360 h = w;
361 }
362 else
363 w = h;
364 }
365 } /* done parsing geometry string */ 275 } /* done parsing geometry string */
366 else if (!(flags & geometrySet)) 276
277 if (!update)
367 { 278 {
368 /* default geometry - scaled and centered */ 279 if (!(geom_flags & XValue))
369 x = y = defaultAlign; 280 x = y = defaultAlign;
281 else if (!(geom_flags & YValue))
282 y = x;
283
284 if (!(geom_flags & (WidthValue|HeightValue)))
370 w = h = defaultScale; 285 w = h = defaultScale;
371 } 286 else if (!(geom_flags & HeightValue))
287 h = w;
288 else if (!(geom_flags & WidthValue))
289 w = h;
372 290
373 if (!(flags & geometrySet))
374 geom_flags |= WidthValue|HeightValue|XValue|YValue; 291 geom_flags |= WidthValue|HeightValue|XValue|YValue;
292 }
375 293
376 if (ops) 294 if (ops)
377 { 295 {
378 while (*ops) 296 while (*ops)
379 { 297 {
… …
426 344
427 while (*ops != ':' && *ops != '\0') ++ops; 345 while (*ops != ':' && *ops != '\0') ++ops;
428 } /* done parsing ops */ 346 } /* done parsing ops */
429 } 347 }
430 348
431 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed; 349 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; 350 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; 351 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; 352 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
435 } 353 }
436 354
437 if (new_flags != flags) 355 if (new_flags != flags)
438 { 356 {
439 flags = new_flags; 357 flags = new_flags;
440 changed++; 358 changed = true;
441 } 359 }
442 360
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); 361 return changed;
446} 362}
447 363
448void 364void
449bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 365bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
450{ 366{
… …
478 x = make_align_position (h_align, target_width, w); 394 x = make_align_position (h_align, target_width, w);
479 y = make_align_position (v_align, target_height, h); 395 y = make_align_position (v_align, target_height, h);
480 } 396 }
481 397
482 flags &= ~sizeSensitive; 398 flags &= ~sizeSensitive;
483 if (h_scale != 0 || v_scale != 0 399 if ((flags & propScale) || h_scale || v_scale
484 || h_align != 0 || v_align != 0 400 || (!(flags & rootAlign) && (h_align || v_align))
485 || w > target_width || h > target_height) 401 || w > target_width || h > target_height)
486 flags |= sizeSensitive; 402 flags |= sizeSensitive;
487} 403}
488 404
489# ifdef HAVE_AFTERIMAGE 405# ifdef HAVE_AFTERIMAGE
… …
539 455
540 int x = 0; 456 int x = 0;
541 int y = 0; 457 int y = 0;
542 int w = 0; 458 int w = 0;
543 int h = 0; 459 int h = 0;
544
545 TIMING_TEST_START (asim);
546 460
547 if (original_asim) 461 if (original_asim)
548 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y); 462 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
549 463
550 if (!original_asim 464 if (!original_asim
… …
667 } 581 }
668 582
669 free (layers); 583 free (layers);
670 } 584 }
671 } 585 }
672 TIMING_TEST_PRINT_RESULT (asim);
673 586
674 bool ret = false; 587 bool ret = false;
675 588
676 if (result) 589 if (result)
677 { 590 {
678 XGCValues gcv; 591 XGCValues gcv;
679 GC gc; 592 GC gc;
680 593
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 */ 594 /* create Pixmap */
693 if (pixmap == None) 595 if (pixmap == None
596 || pmap_width != new_pmap_width
597 || pmap_height != new_pmap_height
598 || pmap_depth != target->depth)
694 { 599 {
600 if (pixmap)
601 XFreePixmap (target->dpy, pixmap);
695 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 602 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
696 pmap_width = new_pmap_width; 603 pmap_width = new_pmap_width;
697 pmap_height = new_pmap_height; 604 pmap_height = new_pmap_height;
698 pmap_depth = target->depth; 605 pmap_depth = target->depth;
699 } 606 }
… …
723 630
724 if (result != background && result != original_asim) 631 if (result != background && result != original_asim)
725 destroy_asimage (&result); 632 destroy_asimage (&result);
726 633
727 XFreeGC (target->dpy, gc); 634 XFreeGC (target->dpy, gc);
728 TIMING_TEST_PRINT_RESULT (asim);
729 635
730 ret = true; 636 ret = true;
731 } 637 }
732 638
733 if (background) 639 if (background)
… …
745 return false; 651 return false;
746 652
747 if (!pixbuf) 653 if (!pixbuf)
748 return false; 654 return false;
749 655
750#if !XFT
751 if (background_flags) 656 if (background_flags
657 && !(flags & HAS_RENDER))
752 return false; 658 return false;
753#endif
754 659
755 GdkPixbuf *result; 660 GdkPixbuf *result;
756 661
757 int image_width = gdk_pixbuf_get_width (pixbuf); 662 int image_width = gdk_pixbuf_get_width (pixbuf);
758 int image_height = gdk_pixbuf_get_height (pixbuf); 663 int image_height = gdk_pixbuf_get_height (pixbuf);
… …
809 new_pmap_width = min (image_width, target_width); 714 new_pmap_width = min (image_width, target_width);
810 new_pmap_height = min (image_height, target_height); 715 new_pmap_height = min (image_height, target_height);
811 } 716 }
812 } 717 }
813 718
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) 719 if (pixmap == None
720 || pmap_width != new_pmap_width
721 || pmap_height != new_pmap_height
722 || pmap_depth != target->depth)
826 { 723 {
724 if (pixmap)
725 XFreePixmap (target->dpy, pixmap);
827 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 726 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
828 pmap_width = new_pmap_width; 727 pmap_width = new_pmap_width;
829 pmap_height = new_pmap_height; 728 pmap_height = new_pmap_height;
830 pmap_depth = target->depth; 729 pmap_depth = target->depth;
831 } 730 }
… …
872 dst_width, dst_height, 771 dst_width, dst_height,
873 XLIB_RGB_DITHER_NONE, 772 XLIB_RGB_DITHER_NONE,
874 0, 0); 773 0, 0);
875 } 774 }
876 775
877#if XFT 776#if XRENDER
878 if (background_flags) 777 if (background_flags)
879 { 778 {
880 Display *dpy = target->dpy; 779 Display *dpy = target->dpy;
881 XRenderPictureAttributes pa; 780 XRenderPictureAttributes pa;
882 781
883 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen)); 782 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, target->visual);
884 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 783 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
885 784
886 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); 785 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
887 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa); 786 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
888 787
… …
925# endif /* HAVE_PIXBUF */ 824# endif /* HAVE_PIXBUF */
926 825
927bool 826bool
928bgPixmap_t::set_file (const char *file) 827bgPixmap_t::set_file (const char *file)
929{ 828{
930 assert (file); 829 if (!file || !*file)
830 return false;
931 831
932 if (*file)
933 {
934 if (const char *p = strchr (file, ';')) 832 if (const char *p = strchr (file, ';'))
935 { 833 {
936 size_t len = p - file; 834 size_t len = p - file;
937 char *f = rxvt_temp_buf<char> (len + 1); 835 char *f = rxvt_temp_buf<char> (len + 1);
938 memcpy (f, file, len); 836 memcpy (f, file, len);
939 f[len] = '\0'; 837 f[len] = '\0';
940 file = f; 838 file = f;
941 } 839 }
942 840
943# ifdef HAVE_AFTERIMAGE 841# ifdef HAVE_AFTERIMAGE
944 if (!target->asimman) 842 if (!target->asimman)
945 target->asimman = create_generic_imageman (target->rs[Rs_path]); 843 target->asimman = create_generic_imageman (target->rs[Rs_path]);
946 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 844 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
845 if (image)
846 {
947 if (original_asim) 847 if (original_asim)
848 safe_asimage_destroy (original_asim);
849 original_asim = image;
948 have_image = true; 850 have_image = true;
949 return have_image; 851 return true;
852 }
950# endif 853# endif
951 854
952# ifdef HAVE_PIXBUF 855# ifdef HAVE_PIXBUF
953 pixbuf = gdk_pixbuf_new_from_file (file, NULL); 856 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
857 if (image)
858 {
954 if (pixbuf) 859 if (pixbuf)
860 g_object_unref (pixbuf);
861 pixbuf = image;
955 have_image = true; 862 have_image = true;
956 return have_image; 863 return true;
864 }
957# endif 865# endif
958 }
959 866
960 return false; 867 return false;
961} 868}
962 869
963# endif /* BG_IMAGE_FROM_FILE */ 870# endif /* BG_IMAGE_FROM_FILE */
… …
976} 883}
977 884
978bool 885bool
979bgPixmap_t::set_blur_radius (const char *geom) 886bgPixmap_t::set_blur_radius (const char *geom)
980{ 887{
981 int changed = 0; 888 bool changed = false;
982 unsigned int hr, vr; 889 unsigned int hr, vr;
983 int junk; 890 int junk;
984 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 891 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
985 892
986 if (!(geom_flags & WidthValue)) 893 if (!(geom_flags & WidthValue))
… …
991 min_it (hr, 128); 898 min_it (hr, 128);
992 min_it (vr, 128); 899 min_it (vr, 128);
993 900
994 if (h_blurRadius != hr) 901 if (h_blurRadius != hr)
995 { 902 {
996 ++changed; 903 changed = true;
997 h_blurRadius = hr; 904 h_blurRadius = hr;
998 } 905 }
999 906
1000 if (v_blurRadius != vr) 907 if (v_blurRadius != vr)
1001 { 908 {
1002 ++changed; 909 changed = true;
1003 v_blurRadius = vr; 910 v_blurRadius = vr;
1004 } 911 }
1005 912
1006 if (v_blurRadius == 0 && h_blurRadius == 0) 913 if (v_blurRadius == 0 && h_blurRadius == 0)
1007 flags &= ~blurNeeded; 914 flags &= ~blurNeeded;
1008 else 915 else
1009 flags |= blurNeeded; 916 flags |= blurNeeded;
1010 917
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); 918 return changed;
1024} 919}
1025 920
1026static inline unsigned long 921static inline unsigned long
1027compute_tint_shade_flags (rxvt_color *tint, int shade) 922compute_tint_shade_flags (rxvt_color *tint, int shade)
1028{ 923{
… …
1050 { 945 {
1051 flags |= bgPixmap_t::tintNeeded; 946 flags |= bgPixmap_t::tintNeeded;
1052 } 947 }
1053 } 948 }
1054 949
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; 950 return flags;
1068} 951}
1069 952
1070bool 953bool
1071bgPixmap_t::set_tint (rxvt_color &new_tint) 954bgPixmap_t::set_tint (rxvt_color &new_tint)
… …
1113 } 996 }
1114 997
1115 return false; 998 return false;
1116} 999}
1117 1000
1001#if XRENDER
1118static void 1002static void
1119get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 1003get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1120{ 1004{
1121 double sigma = radius / 2.0; 1005 double sigma = radius / 2.0;
1122 double scale = sqrt (2.0 * M_PI) * sigma; 1006 double scale = sqrt (2.0 * M_PI) * sigma;
1123 double sum = 0.0; 1007 double sum = 0.0;
1124 1008
1125 for (int i = 0; i < width; i++) 1009 for (int i = 0; i < width; i++)
1126 { 1010 {
1127 double x = i - width / 2; 1011 double x = i - width / 2;
1128 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; 1012 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1129 sum += kernel[i]; 1013 sum += kernel[i];
1130 } 1014 }
1131 1015
1132 params[0] = XDoubleToFixed (width); 1016 params[0] = XDoubleToFixed (width);
1133 params[1] = XDoubleToFixed (1); 1017 params[1] = XDoubleToFixed (1);
1134 1018
1135 for (int i = 0; i < width; i++) 1019 for (int i = 0; i < width; i++)
1136 params[i+2] = XDoubleToFixed (kernel[i] / sum); 1020 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1137} 1021}
1022#endif
1138 1023
1139bool 1024bool
1140bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1025bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1141{ 1026{
1142 bool ret = false; 1027 bool ret = false;
1143#if XFT 1028#if XRENDER
1144 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1029 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1145 double *kernel = (double *)malloc (size * sizeof (double)); 1030 double *kernel = (double *)malloc (size * sizeof (double));
1146 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1031 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1147 1032
1148 Display *dpy = target->dpy; 1033 Display *dpy = target->dpy;
1149 XRenderPictureAttributes pa; 1034 XRenderPictureAttributes pa;
1150 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, target->visual); 1035 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1151 1036
1152 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1037 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1153 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1038 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1154 1039
1155 if (kernel && params && src && dst) 1040 if (kernel && params && src && dst)
… …
1225 XFreeGC (dpy, gc); 1110 XFreeGC (dpy, gc);
1226 } 1111 }
1227 } 1112 }
1228 else 1113 else
1229 { 1114 {
1230# if XFT 1115# if XRENDER
1231 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1116 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1232 1117
1233 if (flags & tintSet) 1118 if (flags & tintSet)
1234 tint.get (c); 1119 tint.get (c);
1235 1120
… …
1265 1150
1266 if (mask_pic && overlay_pic && back_pic) 1151 if (mask_pic && overlay_pic && back_pic)
1267 { 1152 {
1268 XRenderColor mask_c; 1153 XRenderColor mask_c;
1269 1154
1270 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); 1155 mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0;
1271 mask_c.alpha = 0xffff; 1156 mask_c.alpha = 0xffff;
1272 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1157 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1273 1158
1274 mask_c.alpha = 0; 1159 mask_c.alpha = 0;
1275 mask_c.red = 0xffff - c.r; 1160 mask_c.red = 0xffff - c.r;
… …
1281 } 1166 }
1282 1167
1283 XRenderFreePicture (dpy, mask_pic); 1168 XRenderFreePicture (dpy, mask_pic);
1284 XRenderFreePicture (dpy, overlay_pic); 1169 XRenderFreePicture (dpy, overlay_pic);
1285 XRenderFreePicture (dpy, back_pic); 1170 XRenderFreePicture (dpy, back_pic);
1286# if DO_TIMING_TEST
1287 XSync (dpy, False);
1288# endif
1289# endif 1171# endif
1290 } 1172 }
1291 1173
1292 return ret; 1174 return ret;
1293} 1175}
1294 1176
1295/* make_transparency_pixmap() 1177/* make_transparency_pixmap()
1296 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1178 * 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 1179 * the tiled portion of the root pixmap that is supposed to be covered by
1298 * our window. 1180 * our window.
1299 */ 1181 */
1300unsigned long 1182unsigned long
1301bgPixmap_t::make_transparency_pixmap () 1183bgPixmap_t::make_transparency_pixmap ()
1302{ 1184{
… …
1306 return 0; 1188 return 0;
1307 1189
1308 /* root dimensions may change from call to call - but Display structure should 1190 /* root dimensions may change from call to call - but Display structure should
1309 * be always up-to-date, so let's use it : 1191 * be always up-to-date, so let's use it :
1310 */ 1192 */
1311 Window root = target->display->root;
1312 int screen = target->display->screen; 1193 int screen = target->display->screen;
1313 Display *dpy = target->dpy; 1194 Display *dpy = target->dpy;
1195 int root_depth = DefaultDepth (dpy, screen);
1314 int root_width = DisplayWidth (dpy, screen); 1196 int root_width = DisplayWidth (dpy, screen);
1315 int root_height = DisplayHeight (dpy, screen); 1197 int root_height = DisplayHeight (dpy, screen);
1316 unsigned int root_pmap_width, root_pmap_height; 1198 unsigned int root_pmap_width, root_pmap_height;
1317 int window_width = target->szHint.width; 1199 int window_width = target->szHint.width;
1318 int window_height = target->szHint.height; 1200 int window_height = target->szHint.height;
1319 int sx, sy; 1201 int sx, sy;
1320 XGCValues gcv; 1202 XGCValues gcv;
1321 GC gc; 1203 GC gc;
1322 1204
1323 TIMING_TEST_START (tp);
1324 target->get_window_origin (sx, sy); 1205 target->get_window_origin (sx, sy);
1325 1206
1326 /* check if we are outside of the visible part of the virtual screen : */ 1207 /* check if we are outside of the visible part of the virtual screen : */
1327 if (sx + window_width <= 0 || sy + window_height <= 0 1208 if (sx + window_width <= 0 || sy + window_height <= 0
1328 || sx >= root_width || sy >= root_height) 1209 || sx >= root_width || sy >= root_height)
1329 return 0; 1210 return 0;
1330 1211
1212 // validate root pixmap and get its size
1331 if (root_pixmap != None) 1213 if (root_pixmap != None)
1332 { 1214 {
1333 /* we want to validate the pixmap and get its size at the same time : */ 1215 Window wdummy;
1334 int junk; 1216 int idummy;
1335 unsigned int ujunk; 1217 unsigned int udummy;
1336 /* root pixmap may be bad - allow a error */ 1218
1337 target->allowedxerror = -1; 1219 target->allowedxerror = -1;
1338 1220
1339 if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk)) 1221 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy))
1340 root_pixmap = None; 1222 root_pixmap = None;
1341 1223
1342 target->allowedxerror = 0; 1224 target->allowedxerror = 0;
1225 }
1226
1227 Pixmap recoded_root_pmap = root_pixmap;
1228
1229 if (root_pixmap != None && root_depth != target->depth)
1230 {
1231#if XRENDER
1232 if (flags & HAS_RENDER)
1233 {
1234 XRenderPictureAttributes pa;
1235
1236 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1237 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1238
1239 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
1240 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
1241 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1242
1243 if (src && dst)
1244 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1245 else
1246 {
1247 XFreePixmap (dpy, recoded_root_pmap);
1248 root_pixmap = None;
1249 }
1250
1251 XRenderFreePicture (dpy, src);
1252 XRenderFreePicture (dpy, dst);
1253 }
1254 else
1255#endif
1256 root_pixmap = None;
1343 } 1257 }
1344 1258
1345 if (root_pixmap == None) 1259 if (root_pixmap == None)
1346 return 0; 1260 return 0;
1347 1261
1348 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1262 Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth);
1349 1263
1350 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1264 if (tiled_root_pmap == None) /* something really bad happened - abort */
1351 return 0; 1265 return 0;
1352 1266
1353 /* straightforward pixmap copy */ 1267 /* straightforward pixmap copy */
1354 gcv.tile = root_pixmap; 1268 gcv.tile = recoded_root_pmap;
1355 gcv.fill_style = FillTiled; 1269 gcv.fill_style = FillTiled;
1356 1270
1357 while (sx < 0) sx += (int)root_width; 1271 while (sx < 0) sx += (int)root_width;
1358 while (sy < 0) sy += (int)root_height; 1272 while (sy < 0) sy += (int)root_height;
1359 1273
1360 gcv.ts_x_origin = -sx; 1274 gcv.ts_x_origin = -sx;
1361 gcv.ts_y_origin = -sy; 1275 gcv.ts_y_origin = -sy;
1362 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1276 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1363 1277
1364 if (gc) 1278 if (gc)
1365 { 1279 {
1366 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1280 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1367 result |= transpPmapTiled; 1281 result |= transpPmapTiled;
1368 XFreeGC (dpy, gc); 1282 XFreeGC (dpy, gc);
1369 }
1370 TIMING_TEST_PRINT_RESULT (tp);
1371 1283
1372 if (tiled_root_pmap != None)
1373 {
1374 if (!need_client_side_rendering ()) 1284 if (!need_client_side_rendering ())
1375 { 1285 {
1376 if ((flags & blurNeeded)) 1286 if ((flags & blurNeeded)
1287 && (flags & HAS_RENDER_CONV))
1377 { 1288 {
1378 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height)) 1289 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1379 result |= transpPmapBlurred; 1290 result |= transpPmapBlurred;
1380 } 1291 }
1381 if ((flags & tintNeeded)) 1292 if ((flags & tintNeeded)
1293 && (flags & (tintWholesome | HAS_RENDER)))
1382 { 1294 {
1383 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height)) 1295 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1384 result |= transpPmapTinted; 1296 result |= transpPmapTinted;
1385 } 1297 }
1386 } /* server side rendering completed */ 1298 } /* server side rendering completed */
1387 1299
1388 if (pixmap) 1300 if (pixmap)
1389 XFreePixmap (dpy, pixmap); 1301 XFreePixmap (dpy, pixmap);
1390 1302
1391 pixmap = tiled_root_pmap; 1303 pixmap = tiled_root_pmap;
1392 pmap_width = window_width; 1304 pmap_width = window_width;
1393 pmap_height = window_height; 1305 pmap_height = window_height;
1394 pmap_depth = root_depth; 1306 pmap_depth = target->depth;
1395 } 1307 }
1308 else
1309 XFreePixmap (dpy, tiled_root_pmap);
1396 1310
1397 TIMING_TEST_PRINT_RESULT (tp); 1311 if (recoded_root_pmap != root_pixmap)
1312 XFreePixmap (dpy, recoded_root_pmap);
1398 1313
1399 return result; 1314 return result;
1400} 1315}
1401 1316
1402bool 1317void
1403bgPixmap_t::set_root_pixmap () 1318bgPixmap_t::set_root_pixmap ()
1404{ 1319{
1405 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1320 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1406 if (new_root_pixmap == None) 1321 if (new_root_pixmap == None)
1407 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1322 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1408 1323
1409 if (new_root_pixmap != root_pixmap)
1410 {
1411 root_pixmap = new_root_pixmap; 1324 root_pixmap = new_root_pixmap;
1412 return true;
1413 }
1414
1415 return false;
1416} 1325}
1417# endif /* ENABLE_TRANSPARENCY */ 1326# endif /* ENABLE_TRANSPARENCY */
1418 1327
1419# ifndef HAVE_AFTERIMAGE 1328#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1420static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm); 1329static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c);
1421# endif 1330# endif
1422 1331
1423bool 1332bool
1424bgPixmap_t::render () 1333bgPixmap_t::render ()
1425{ 1334{
1426 unsigned long background_flags = 0; 1335 unsigned long background_flags = 0;
1427 1336
1428 if (target == NULL) 1337 if (target == NULL)
1429 return false; 1338 return false;
1430
1431 TIMING_TEST_START (tp);
1432 1339
1433 invalidate (); 1340 invalidate ();
1434# ifdef ENABLE_TRANSPARENCY 1341# ifdef ENABLE_TRANSPARENCY
1435 if (flags & isTransparent) 1342 if (flags & isTransparent)
1436 { 1343 {
1437 /* we need to re-generate transparency pixmap in that case ! */ 1344 /* we need to re-generate transparency pixmap in that case ! */
1438 background_flags = make_transparency_pixmap (); 1345 background_flags = make_transparency_pixmap ();
1439 if (background_flags == 0) 1346 if (background_flags == 0)
1440 return false; 1347 return false;
1441 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1348 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1442 && pmap_depth == target->depth)
1443 flags = flags & ~isInvalid; 1349 flags = flags & ~isInvalid;
1444 } 1350 }
1445# endif 1351# endif
1446 1352
1447# ifdef BG_IMAGE_FROM_FILE 1353# ifdef BG_IMAGE_FROM_FILE
… …
1451 if (render_image (background_flags)) 1357 if (render_image (background_flags))
1452 flags = flags & ~isInvalid; 1358 flags = flags & ~isInvalid;
1453 } 1359 }
1454# endif 1360# endif
1455 1361
1362# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1456 XImage *result = NULL; 1363 XImage *result = NULL;
1457 1364
1458 if (background_flags && (flags & isInvalid)) 1365 if (background_flags && (flags & isInvalid))
1459 { 1366 {
1460 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1367 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1461 } 1368 }
1462 1369
1463 if (result) 1370 if (result)
1464 { 1371 {
1465# if !defined(HAVE_AFTERIMAGE) && !XFT
1466 /* our own client-side tinting */ 1372 /* 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)) 1373 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1470 { 1374 {
1471 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1375 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1472 if (flags & tintSet) 1376 if (flags & tintSet)
1473 tint.get (c); 1377 tint.get (c);
1474 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1378 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1475 } 1379 }
1476# endif
1477 1380
1478 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1381 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1479 1382
1480 if (gc) 1383 if (gc)
1481 { 1384 {
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); 1385 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1511 1386
1512 XFreeGC (target->dpy, gc); 1387 XFreeGC (target->dpy, gc);
1513 flags = flags & ~isInvalid; 1388 flags = flags & ~isInvalid;
1514 } 1389 }
1515 1390
1516 XDestroyImage (result); 1391 XDestroyImage (result);
1517 } 1392 }
1393# endif
1518 1394
1519 if (flags & isInvalid) 1395 if (flags & isInvalid)
1520 { 1396 {
1521 if (pixmap != None) 1397 if (pixmap != None)
1522 { 1398 {
… …
1525 } 1401 }
1526 } 1402 }
1527 1403
1528 apply (); 1404 apply ();
1529 1405
1530 XSync (target->dpy, False);
1531 valid_since = ev::now (); 1406 valid_since = ev::now ();
1532 1407
1533 TIMING_TEST_PRINT_RESULT (tp);
1534
1535 return true; 1408 return true;
1536} 1409}
1537 1410
1538bool 1411void
1539bgPixmap_t::set_target (rxvt_term *new_target) 1412bgPixmap_t::set_target (rxvt_term *new_target)
1540{ 1413{
1541 if (new_target)
1542 if (target != new_target)
1543 {
1544 target = new_target; 1414 target = new_target;
1545# ifdef ENABLE_TRANSPARENCY 1415
1546 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1416 flags &= ~(HAS_RENDER | HAS_RENDER_CONV);
1417#if XRENDER
1418 int major, minor;
1419 if (XRenderQueryVersion (target->dpy, &major, &minor))
1420 flags |= HAS_RENDER;
1421 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1422 if (filters)
1423 {
1424 for (int i = 0; i < filters->nfilter; i++)
1425 if (!strcmp (filters->filter[i], FilterConvolution))
1426 flags |= HAS_RENDER_CONV;
1427
1428 XFree (filters);
1429 }
1547# endif 1430#endif
1548 return true;
1549 }
1550
1551 return false;
1552} 1431}
1553 1432
1554void 1433void
1555bgPixmap_t::apply () 1434bgPixmap_t::apply ()
1556{ 1435{
1557 if (target) 1436 if (target == NULL)
1558 { 1437 return;
1559 flags &= ~isVtOrigin;
1560 1438
1561 if (pixmap != None) 1439 if (pixmap != None)
1562 { 1440 {
1563 /* set target's background to pixmap */ 1441 /* set target's background to pixmap */
1564# ifdef ENABLE_TRANSPARENCY 1442# ifdef ENABLE_TRANSPARENCY
1565 if (flags & isTransparent) 1443 if (flags & isTransparent)
1566 { 1444 {
1567 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1445 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1568 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1446 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1569 1447
1570 if (target->scrollBar.win) 1448 if (target->scrollBar.win)
1571 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1449 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1572 } 1450 }
1573 else 1451 else
1574# endif 1452# endif
1575 { 1453 {
1576 flags |= isVtOrigin;
1577 /* force old pixmap dereference in case it was transparent before :*/ 1454 /* 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]); 1455 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1590 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1456 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1591 /* do we also need to set scrollbar's background here ? */ 1457 /* do we also need to set scrollbar's background here ? */
1458
1592 if (target->scrollBar.win) 1459 if (target->scrollBar.win)
1593 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1460 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1594 } 1461 }
1462 }
1463 else
1464 {
1465 /* set target background to a pixel */
1466 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1467 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1468 /* do we also need to set scrollbar's background here ? */
1469 if (target->scrollBar.win)
1470 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1471 }
1595 1472
1596 /* don't want Expose on the parent or vt. It is better to use 1473 /* 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: */ 1474 scr_touch or we get a great deal of flicker otherwise: */
1598 XClearWindow (target->dpy, target->parent[0]); 1475 XClearWindow (target->dpy, target->parent[0]);
1599 1476
1600 if (target->scrollBar.state && target->scrollBar.win) 1477 if (target->scrollBar.state && target->scrollBar.win)
1601 { 1478 {
1602 target->scrollBar.state = STATE_IDLE; 1479 target->scrollBar.state = STATE_IDLE;
1603 target->scrollBar.show (0); 1480 target->scrollBar.show (0);
1604 } 1481 }
1605 1482
1606 target->want_refresh = 1; 1483 target->want_refresh = 1;
1607 flags |= hasChanged; 1484 flags |= hasChanged;
1608 }
1609} 1485}
1610 1486
1611#endif /* HAVE_BG_PIXMAP */ 1487#endif /* HAVE_BG_PIXMAP */
1612 1488
1613#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1489#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1614/* taken from aterm-0.4.2 */ 1490/* taken from aterm-0.4.2 */
1615 1491
1616typedef uint32_t RUINT32T;
1617
1618static void 1492static void
1619ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm) 1493ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c)
1620{ 1494{
1621 int sh_r, sh_g, sh_b; 1495 int sh_r, sh_g, sh_b;
1622 RUINT32T mask_r, mask_g, mask_b; 1496 uint32_t mask_r, mask_g, mask_b;
1623 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1497 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1624 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1498 rgba low;
1625 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1499 rgba high;
1626 int i; 1500 int i;
1501 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1627 1502
1628 Visual *visual = term->visual;
1629
1630 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1503 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1631 1504
1632 /* for convenience */ 1505 /* for convenience */
1633 mask_r = visual->red_mask; 1506 mask_r = visual->red_mask;
1634 mask_g = visual->green_mask; 1507 mask_g = visual->green_mask;
1635 mask_b = visual->blue_mask; 1508 mask_b = visual->blue_mask;
1636 1509
1637 /* boring lookup table pre-initialization */ 1510 /* boring lookup table pre-initialization */
1638 switch (srcImage->bits_per_pixel) { 1511 switch (srcImage->depth)
1512 {
1639 case 15: 1513 case 15:
1640 if ((mask_r != 0x7c00) || 1514 if ((mask_r != 0x7c00) ||
1641 (mask_g != 0x03e0) || 1515 (mask_g != 0x03e0) ||
1642 (mask_b != 0x001f)) 1516 (mask_b != 0x001f))
1643 return; 1517 return;
1644 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1518 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32));
1645 lookup_r = lookup; 1519 lookup_r = lookup;
1646 lookup_g = lookup+32; 1520 lookup_g = lookup+32;
1647 lookup_b = lookup+32+32; 1521 lookup_b = lookup+32+32;
1648 sh_r = 10; 1522 sh_r = 10;
1649 sh_g = 5; 1523 sh_g = 5;
1650 sh_b = 0; 1524 sh_b = 0;
1651 break; 1525 break;
1652 case 16: 1526 case 16:
1653 if ((mask_r != 0xf800) || 1527 if ((mask_r != 0xf800) ||
1654 (mask_g != 0x07e0) || 1528 (mask_g != 0x07e0) ||
1655 (mask_b != 0x001f)) 1529 (mask_b != 0x001f))
1656 return; 1530 return;
1657 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1531 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1658 lookup_r = lookup; 1532 lookup_r = lookup;
1659 lookup_g = lookup+32; 1533 lookup_g = lookup+32;
1660 lookup_b = lookup+32+64; 1534 lookup_b = lookup+32+64;
1661 sh_r = 11; 1535 sh_r = 11;
1662 sh_g = 5; 1536 sh_g = 5;
1663 sh_b = 0; 1537 sh_b = 0;
1664 break; 1538 break;
1665 case 24: 1539 case 24:
1666 if ((mask_r != 0xff0000) || 1540 if ((mask_r != 0xff0000) ||
1667 (mask_g != 0x00ff00) || 1541 (mask_g != 0x00ff00) ||
1668 (mask_b != 0x0000ff)) 1542 (mask_b != 0x0000ff))
1669 return; 1543 return;
1670 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1544 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1671 lookup_r = lookup; 1545 lookup_r = lookup;
1672 lookup_g = lookup+256; 1546 lookup_g = lookup+256;
1673 lookup_b = lookup+256+256; 1547 lookup_b = lookup+256+256;
1674 sh_r = 16; 1548 sh_r = 16;
1675 sh_g = 8; 1549 sh_g = 8;
1676 sh_b = 0; 1550 sh_b = 0;
1677 break; 1551 break;
1678 case 32: 1552 case 32:
1679 if ((mask_r != 0xff0000) || 1553 if ((mask_r != 0xff0000) ||
1680 (mask_g != 0x00ff00) || 1554 (mask_g != 0x00ff00) ||
1681 (mask_b != 0x0000ff)) 1555 (mask_b != 0x0000ff))
1682 return; 1556 return;
1683 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1557 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1684 lookup_r = lookup; 1558 lookup_r = lookup;
1685 lookup_g = lookup+256; 1559 lookup_g = lookup+256;
1686 lookup_b = lookup+256+256; 1560 lookup_b = lookup+256+256;
1687 sh_r = 16; 1561 sh_r = 16;
1688 sh_g = 8; 1562 sh_g = 8;
1689 sh_b = 0; 1563 sh_b = 0;
1690 break; 1564 break;
1691 default: 1565 default:
1692 return; /* we do not support this color depth */ 1566 return; /* we do not support this color depth */
1693 } 1567 }
1694 1568
1695 /* prepare limits for color transformation (each channel is handled separately) */ 1569 /* prepare limits for color transformation (each channel is handled separately) */
1696 if (shade > 100) { 1570 if (shade > 100)
1571 {
1697 shade = 200 - shade; 1572 shade = 200 - shade;
1698 1573
1699 lower_lim_r = 65535-rm; 1574 high.r = (65535 - c.r) * shade / 100;
1700 lower_lim_g = 65535-gm; 1575 high.g = (65535 - c.g) * shade / 100;
1701 lower_lim_b = 65535-bm; 1576 high.b = (65535 - c.b) * shade / 100;
1702 1577
1703 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1578 low.r = 65535 - high.r;
1704 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1579 low.g = 65535 - high.g;
1705 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1580 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 } 1581 }
1716 1582 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 { 1583 {
1720 unsigned int tmp; 1584 high.r = c.r * shade / 100;
1585 high.g = c.g * shade / 100;
1586 high.b = c.b * shade / 100;
1721 1587
1722 tmp = lower_lim_r; 1588 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 } 1589 }
1730 1590
1731 /* fill our lookup tables */ 1591 /* fill our lookup tables */
1732 for (i = 0; i <= mask_r>>sh_r; i++) 1592 for (i = 0; i <= mask_r>>sh_r; i++)
1733 { 1593 {
1734 RUINT32T tmp; 1594 uint32_t tmp;
1735 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1595 tmp = i * high.r;
1736 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1596 tmp += (mask_r>>sh_r) * low.r;
1737 lookup_r[i] = (tmp/65535)<<sh_r; 1597 lookup_r[i] = (tmp/65535)<<sh_r;
1738 } 1598 }
1739 for (i = 0; i <= mask_g>>sh_g; i++) 1599 for (i = 0; i <= mask_g>>sh_g; i++)
1740 { 1600 {
1741 RUINT32T tmp; 1601 uint32_t tmp;
1742 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1602 tmp = i * high.g;
1743 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1603 tmp += (mask_g>>sh_g) * low.g;
1744 lookup_g[i] = (tmp/65535)<<sh_g; 1604 lookup_g[i] = (tmp/65535)<<sh_g;
1745 } 1605 }
1746 for (i = 0; i <= mask_b>>sh_b; i++) 1606 for (i = 0; i <= mask_b>>sh_b; i++)
1747 { 1607 {
1748 RUINT32T tmp; 1608 uint32_t tmp;
1749 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1609 tmp = i * high.b;
1750 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1610 tmp += (mask_b>>sh_b) * low.b;
1751 lookup_b[i] = (tmp/65535)<<sh_b; 1611 lookup_b[i] = (tmp/65535)<<sh_b;
1752 } 1612 }
1753 1613
1754 /* apply table to input image (replacing colors by newly calculated ones) */ 1614 /* apply table to input image (replacing colors by newly calculated ones) */
1755 switch (srcImage->bits_per_pixel) 1615 if (srcImage->bits_per_pixel == 32
1616 && (srcImage->depth == 24 || srcImage->depth == 32)
1617 && srcImage->byte_order == host_byte_order)
1756 { 1618 {
1757 case 15:
1758 {
1759 unsigned short *p1, *pf, *p, *pl; 1619 uint32_t *p1, *pf, *p, *pl;
1760 p1 = (unsigned short *) srcImage->data; 1620 p1 = (uint32_t *) srcImage->data;
1761 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1621 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1622
1762 while (p1 < pf) 1623 while (p1 < pf)
1763 { 1624 {
1764 p = p1; 1625 p = p1;
1765 pl = p1 + srcImage->width; 1626 pl = p1 + srcImage->width;
1766 for (; p < pl; p++) 1627 for (; p < pl; p++)
1767 { 1628 {
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] | 1629 *p = lookup_r[(*p & 0xff0000) >> 16] |
1827 lookup_g[(*p & 0x00ff00)>> 8] | 1630 lookup_g[(*p & 0x00ff00) >> 8] |
1828 lookup_b[(*p & 0x0000ff)] | 1631 lookup_b[(*p & 0x0000ff)] |
1829 (*p & ~0xffffff); 1632 (*p & 0xff000000);
1633 }
1634 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line);
1635 }
1636 }
1637 else
1638 {
1639 for (int y = 0; y < srcImage->height; y++)
1640 for (int x = 0; x < srcImage->width; x++)
1641 {
1642 unsigned long pixel = XGetPixel (srcImage, x, y);
1643 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1644 lookup_g[(pixel & mask_g) >> sh_g] |
1645 lookup_b[(pixel & mask_b) >> sh_b];
1646 XPutPixel (srcImage, x, y, pixel);
1830 } 1647 }
1831 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1832 } 1648 }
1833 break;
1834 }
1835 }
1836 1649
1837 free (lookup); 1650 free (lookup);
1838} 1651}
1839#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1652#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */

Diff Legend

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