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.95 by sf-exg, Fri Oct 22 16:21:05 2010 UTC vs.
Revision 1.124 by sf-exg, Tue Nov 23 16:37:36 2010 UTC

… …
24 24
25#include <cmath> 25#include <cmath>
26#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
27#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
28 28
29#if XRENDER
30# include <X11/extensions/Xrender.h>
31#endif
32
33#ifndef FilterConvolution
34#define FilterConvolution "convolution"
35#endif
36
29#define DO_TIMING_TEST 0 37#define DO_TIMING_TEST 0
30 38
31#if DO_TIMING_TEST 39#if DO_TIMING_TEST
32# include <sys/time.h> 40# include <sys/time.h>
33#define TIMING_TEST_START(id) \ 41#define TIMING_TEST_START(id) \
… …
58 * 66 *
59 * 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%.
60 * W and H are percentages of the terminal window size. 68 * W and H are percentages of the terminal window size.
61 * X and Y are also percentages; e.g., +50+50 centers 69 * X and Y are also percentages; e.g., +50+50 centers
62 * the image in the window. 70 * the image in the window.
63 * WxH+X Assumes Y == X
64 * WxH Assumes Y == X == 50 (centers the image)
65 * W+X+Y Assumes H == W
66 * W+X Assumes H == W and Y == X
67 * W Assumes H == W and Y == X == 50
68 *
69 * Adjusting position only :
70 * =+X+Y Set position to X% by Y% (absolute).
71 * =+X Set position to X% by X%.
72 * +X+Y Adjust position horizontally X% and vertically Y%
73 * from current position (relative).
74 * +X Adjust position horizontally X% and vertically X%
75 * from current position.
76 *
77 * Adjusting scale only :
78 * Wx0 Multiply horizontal scaling factor by W%
79 * 0xH Multiply vertical scaling factor by H%
80 * 0x0 No scaling (show image at normal size).
81 * 71 *
82 * Pixmap Operations : (should be prepended by a colon) 72 * Pixmap Operations : (should be prepended by a colon)
83 * tile Tile image. Scaling/position modifiers above will affect 73 * tile Tile image. Scaling/position modifiers above will affect
84 * the tile size and origin. 74 * the tile size and origin.
85 * propscale When scaling, scale proportionally. That is, maintain the 75 * propscale When scaling, scale proportionally. That is, maintain the
… …
113#endif 103#endif
114 flags = 0; 104 flags = 0;
115 pixmap = None; 105 pixmap = None;
116 valid_since = invalid_since = 0; 106 valid_since = invalid_since = 0;
117 target = 0; 107 target = 0;
108 target_x = target_y = 0;
118} 109}
119 110
120void 111void
121bgPixmap_t::destroy () 112bgPixmap_t::destroy ()
122{ 113{
… …
133 if (pixmap && target) 124 if (pixmap && target)
134 XFreePixmap (target->dpy, pixmap); 125 XFreePixmap (target->dpy, pixmap);
135} 126}
136 127
137bool 128bool
129bgPixmap_t::set_position (int x, int y)
130{
131
132 if (target_x != x
133 || target_y != y)
134 {
135 target_x = x;
136 target_y = y;
137 return true;
138 }
139 return false;
140}
141
142bool
138bgPixmap_t::window_size_sensitive () 143bgPixmap_t::window_size_sensitive ()
139{ 144{
140# ifdef ENABLE_TRANSPARENCY 145# ifdef ENABLE_TRANSPARENCY
141 if (flags & isTransparent) 146 if (flags & isTransparent)
142 return true; 147 return true;
… …
168 return true; 173 return true;
169 } 174 }
170# endif 175# endif
171 176
172 return false; 177 return false;
173}; 178}
174 179
175bool bgPixmap_t::need_client_side_rendering () 180bool bgPixmap_t::need_client_side_rendering ()
176{ 181{
177# ifdef HAVE_AFTERIMAGE 182# ifdef HAVE_AFTERIMAGE
178 if (original_asim) 183 if (original_asim)
… …
248 dst_size = target_size - dst_pos; 253 dst_size = target_size - dst_pos;
249 return src_pos; 254 return src_pos;
250} 255}
251 256
252bool 257bool
253bgPixmap_t::set_geometry (const char *geom) 258bgPixmap_t::set_geometry (const char *geom, bool update)
254{ 259{
260 bool changed = false;
255 int geom_flags = 0, changed = 0; 261 int geom_flags = 0;
256 int x = 0, y = 0; 262 int x = 0, y = 0;
257 unsigned int w = 0, h = 0; 263 unsigned int w = 0, h = 0;
258 unsigned int n; 264 unsigned int n;
259 unsigned long new_flags = (flags & (~geometryFlags)); 265 unsigned long new_flags = (flags & (~geometryFlags));
260 const char *p; 266 const char *ops;
261# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */ 267# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
262 268
263 if (geom == NULL) 269 if (geom == NULL)
264 return false; 270 return false;
265 271
266 char str[MAXLEN_GEOM]; 272 char str[MAXLEN_GEOM];
267 273
268 while (isspace(*geom)) ++geom;
269 if ((p = strchr (geom, ';')) == NULL)
270 p = strchr (geom, '\0'); 274 ops = strchr (geom, ':');
271 275 if (ops == NULL)
276 n = strlen (geom);
277 else
272 n = (p - geom); 278 n = ops - geom;
279
273 if (n < MAXLEN_GEOM) 280 if (n >= MAXLEN_GEOM)
274 { 281 return false;
275 char *ops;
276 new_flags |= geometrySet;
277 282
278 memcpy (str, geom, n); 283 memcpy (str, geom, n);
279 str[n] = '\0'; 284 str[n] = '\0';
280 if (str[0] == ':') 285 rxvt_strtrim (str);
281 ops = &str[0];
282 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
283 ops = &str[0];
284 else
285 {
286 char *tmp;
287 ops = strchr (str, ':');
288 if (ops != NULL)
289 {
290 for (tmp = ops-1; tmp >= str && isspace(*tmp); --tmp);
291 *(++tmp) = '\0';
292 if (ops == tmp) ++ops;
293 }
294 }
295 286
296 if (ops > str || ops == NULL) 287 if (str[0])
297 { 288 {
298 /* we have geometry string - let's handle it prior to applying ops */ 289 /* we have geometry string - let's handle it prior to applying ops */
299 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 290 geom_flags = XParseGeometry (str, &x, &y, &w, &h);
300
301 if ((geom_flags & XValue) && !(geom_flags & YValue))
302 {
303 y = x;
304 geom_flags |= YValue;
305 }
306
307 if (flags & geometrySet)
308 {
309 /* new geometry is an adjustment to the old one ! */
310 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
311 {
312 if (w == 0 && h != 0)
313 {
314 w = h_scale;
315 h = (v_scale * h) / 100;
316 }
317 else if (h == 0 && w != 0)
318 {
319 w = (h_scale * w) / 100;
320 h = v_scale;
321 }
322 }
323 if (geom_flags & XValue)
324 {
325 if (str[0] != '=')
326 {
327 y += v_align;
328 x += h_align;
329 }
330 }
331 }
332 else /* setting up geometry from scratch */
333 {
334 if (!(geom_flags & XValue))
335 {
336 /* use default geometry - centered */
337 x = y = defaultAlign;
338 }
339 else if (!(geom_flags & YValue))
340 y = x;
341
342 if ((geom_flags & (WidthValue|HeightValue)) == 0)
343 {
344 /* use default geometry - scaled */
345 w = h = defaultScale;
346 }
347 else if (geom_flags & WidthValue)
348 {
349 if (!(geom_flags & HeightValue))
350 h = w;
351 }
352 else
353 w = h;
354 }
355 } /* done parsing geometry string */ 291 } /* done parsing geometry string */
356 else if (!(flags & geometrySet)) 292
357 { 293 if (!update)
358 /* default geometry - scaled and centered */ 294 {
295 if (!(geom_flags & XValue))
359 x = y = defaultAlign; 296 x = y = defaultAlign;
297 else if (!(geom_flags & YValue))
298 y = x;
299
300 if (!(geom_flags & (WidthValue|HeightValue)))
360 w = h = defaultScale; 301 w = h = defaultScale;
361 } 302 else if (!(geom_flags & HeightValue))
303 h = w;
304 else if (!(geom_flags & WidthValue))
305 w = h;
362 306
363 if (!(flags & geometrySet))
364 geom_flags |= WidthValue|HeightValue|XValue|YValue; 307 geom_flags |= WidthValue|HeightValue|XValue|YValue;
308 }
365 309
366 if (ops) 310 if (ops)
367 { 311 {
368 while (*ops) 312 while (*ops)
369 { 313 {
370 while (*ops == ':' || isspace(*ops)) ++ops; 314 while (*ops == ':' || isspace(*ops)) ++ops;
371 315
372# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0) 316# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0)
373 if (CHECK_GEOM_OPS ("tile")) 317 if (CHECK_GEOM_OPS ("tile"))
374 { 318 {
375 w = h = noScale; 319 w = h = noScale;
376 geom_flags |= WidthValue|HeightValue; 320 geom_flags |= WidthValue|HeightValue;
377 } 321 }
378 else if (CHECK_GEOM_OPS ("propscale")) 322 else if (CHECK_GEOM_OPS ("propscale"))
379 { 323 {
380 new_flags |= propScale; 324 new_flags |= propScale;
381 } 325 }
382 else if (CHECK_GEOM_OPS ("hscale")) 326 else if (CHECK_GEOM_OPS ("hscale"))
383 { 327 {
384 if (w == 0) w = windowScale; 328 if (w == 0) w = windowScale;
385 329
386 h = noScale; 330 h = noScale;
387 geom_flags |= WidthValue|HeightValue; 331 geom_flags |= WidthValue|HeightValue;
388 } 332 }
389 else if (CHECK_GEOM_OPS ("vscale")) 333 else if (CHECK_GEOM_OPS ("vscale"))
390 { 334 {
391 if (h == 0) h = windowScale; 335 if (h == 0) h = windowScale;
392 336
393 w = noScale; 337 w = noScale;
394 geom_flags |= WidthValue|HeightValue; 338 geom_flags |= WidthValue|HeightValue;
395 } 339 }
396 else if (CHECK_GEOM_OPS ("scale")) 340 else if (CHECK_GEOM_OPS ("scale"))
397 { 341 {
398 if (h == 0) h = windowScale; 342 if (h == 0) h = windowScale;
399 if (w == 0) w = windowScale; 343 if (w == 0) w = windowScale;
400 344
401 geom_flags |= WidthValue|HeightValue; 345 geom_flags |= WidthValue|HeightValue;
402 } 346 }
403 else if (CHECK_GEOM_OPS ("auto")) 347 else if (CHECK_GEOM_OPS ("auto"))
404 { 348 {
405 w = h = windowScale; 349 w = h = windowScale;
406 x = y = centerAlign; 350 x = y = centerAlign;
407 geom_flags |= WidthValue|HeightValue|XValue|YValue; 351 geom_flags |= WidthValue|HeightValue|XValue|YValue;
408 } 352 }
409 else if (CHECK_GEOM_OPS ("root")) 353 else if (CHECK_GEOM_OPS ("root"))
410 { 354 {
411 new_flags |= rootAlign; 355 new_flags |= rootAlign;
412 w = h = noScale; 356 w = h = noScale;
413 geom_flags |= WidthValue|HeightValue; 357 geom_flags |= WidthValue|HeightValue;
414 } 358 }
415# undef CHECK_GEOM_OPS 359# undef CHECK_GEOM_OPS
416 360
417 while (*ops != ':' && *ops != '\0') ++ops; 361 while (*ops != ':' && *ops != '\0') ++ops;
418 } /* done parsing ops */ 362 } /* done parsing ops */
419 } 363 }
420 364
421 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed; 365 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
422 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed; 366 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
423 if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed; 367 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
424 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed; 368 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
425 }
426 369
427 if (new_flags != flags) 370 if (new_flags != flags)
428 { 371 {
429 flags = new_flags; 372 flags = new_flags;
430 changed++; 373 changed = true;
431 } 374 }
432 375
433 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
434 // flags, h_scale, v_scale, h_align, v_align);
435 return (changed > 0); 376 return changed;
436} 377}
437 378
438void 379void
439bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 380bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
440{ 381{
… …
457 if (!w) w = image_width; 398 if (!w) w = image_width;
458 if (!h) h = image_height; 399 if (!h) h = image_height;
459 400
460 if (flags & rootAlign) 401 if (flags & rootAlign)
461 { 402 {
462 target->get_window_origin (x, y);
463 x = -x; 403 x = -target_x;
464 y = -y; 404 y = -target_y;
465 } 405 }
466 else 406 else
467 { 407 {
468 x = make_align_position (h_align, target_width, w); 408 x = make_align_position (h_align, target_width, w);
469 y = make_align_position (v_align, target_height, h); 409 y = make_align_position (v_align, target_height, h);
… …
663 if (result) 603 if (result)
664 { 604 {
665 XGCValues gcv; 605 XGCValues gcv;
666 GC gc; 606 GC gc;
667 607
668 if (pixmap)
669 {
670 if (pmap_width != new_pmap_width
671 || pmap_height != new_pmap_height
672 || pmap_depth != target->depth)
673 {
674 XFreePixmap (target->dpy, pixmap);
675 pixmap = None;
676 }
677 }
678
679 /* create Pixmap */ 608 /* create Pixmap */
680 if (pixmap == None) 609 if (pixmap == None
610 || pmap_width != new_pmap_width
611 || pmap_height != new_pmap_height
612 || pmap_depth != target->depth)
681 { 613 {
614 if (pixmap)
615 XFreePixmap (target->dpy, pixmap);
682 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 616 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
683 pmap_width = new_pmap_width; 617 pmap_width = new_pmap_width;
684 pmap_height = new_pmap_height; 618 pmap_height = new_pmap_height;
685 pmap_depth = target->depth; 619 pmap_depth = target->depth;
686 } 620 }
… …
731 return false; 665 return false;
732 666
733 if (!pixbuf) 667 if (!pixbuf)
734 return false; 668 return false;
735 669
736#if !XFT
737 if (background_flags) 670 if (background_flags
671 && !(flags & HAS_RENDER))
738 return false; 672 return false;
739#endif
740 673
741 GdkPixbuf *result; 674 GdkPixbuf *result;
742 675
743 int image_width = gdk_pixbuf_get_width (pixbuf); 676 int image_width = gdk_pixbuf_get_width (pixbuf);
744 int image_height = gdk_pixbuf_get_height (pixbuf); 677 int image_height = gdk_pixbuf_get_height (pixbuf);
… …
795 new_pmap_width = min (image_width, target_width); 728 new_pmap_width = min (image_width, target_width);
796 new_pmap_height = min (image_height, target_height); 729 new_pmap_height = min (image_height, target_height);
797 } 730 }
798 } 731 }
799 732
800 if (pixmap)
801 {
802 if (pmap_width != new_pmap_width
803 || pmap_height != new_pmap_height
804 || pmap_depth != target->depth)
805 {
806 XFreePixmap (target->dpy, pixmap);
807 pixmap = None;
808 }
809 }
810
811 if (pixmap == None) 733 if (pixmap == None
734 || pmap_width != new_pmap_width
735 || pmap_height != new_pmap_height
736 || pmap_depth != target->depth)
812 { 737 {
738 if (pixmap)
739 XFreePixmap (target->dpy, pixmap);
813 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 740 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
814 pmap_width = new_pmap_width; 741 pmap_width = new_pmap_width;
815 pmap_height = new_pmap_height; 742 pmap_height = new_pmap_height;
816 pmap_depth = target->depth; 743 pmap_depth = target->depth;
817 } 744 }
… …
858 dst_width, dst_height, 785 dst_width, dst_height,
859 XLIB_RGB_DITHER_NONE, 786 XLIB_RGB_DITHER_NONE,
860 0, 0); 787 0, 0);
861 } 788 }
862 789
863#if XFT 790#if XRENDER
864 if (background_flags) 791 if (background_flags)
865 { 792 {
866 Display *dpy = target->dpy; 793 Display *dpy = target->dpy;
867 XRenderPictureAttributes pa; 794 XRenderPictureAttributes pa;
868 795
869 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen)); 796 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, target->visual);
870 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 797 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
871 798
872 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); 799 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
873 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa); 800 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
874 801
… …
911# endif /* HAVE_PIXBUF */ 838# endif /* HAVE_PIXBUF */
912 839
913bool 840bool
914bgPixmap_t::set_file (const char *file) 841bgPixmap_t::set_file (const char *file)
915{ 842{
916 assert (file); 843 if (!file || !*file)
844 return false;
917 845
918 if (*file)
919 {
920 if (const char *p = strchr (file, ';')) 846 if (const char *p = strchr (file, ';'))
921 { 847 {
922 size_t len = p - file; 848 size_t len = p - file;
923 char *f = rxvt_temp_buf<char> (len + 1); 849 char *f = rxvt_temp_buf<char> (len + 1);
924 memcpy (f, file, len); 850 memcpy (f, file, len);
925 f[len] = '\0'; 851 f[len] = '\0';
926 file = f; 852 file = f;
927 } 853 }
928 854
929# ifdef HAVE_AFTERIMAGE 855# ifdef HAVE_AFTERIMAGE
930 if (!target->asimman) 856 if (!target->asimman)
931 target->asimman = create_generic_imageman (target->rs[Rs_path]); 857 target->asimman = create_generic_imageman (target->rs[Rs_path]);
932 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 858 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
933 if (image) 859 if (image)
934 { 860 {
935 if (original_asim) 861 if (original_asim)
936 safe_asimage_destroy (original_asim); 862 safe_asimage_destroy (original_asim);
937 original_asim = image; 863 original_asim = image;
938 have_image = true; 864 have_image = true;
939 return true; 865 return true;
940 } 866 }
941# endif 867# endif
942 868
943# ifdef HAVE_PIXBUF 869# ifdef HAVE_PIXBUF
944 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 870 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
945 if (image) 871 if (image)
946 { 872 {
947 if (pixbuf) 873 if (pixbuf)
948 g_object_unref (pixbuf); 874 g_object_unref (pixbuf);
949 pixbuf = image; 875 pixbuf = image;
950 have_image = true; 876 have_image = true;
951 return true; 877 return true;
952 } 878 }
953# endif 879# endif
954 }
955 880
956 return false; 881 return false;
957} 882}
958 883
959# endif /* BG_IMAGE_FROM_FILE */ 884# endif /* BG_IMAGE_FROM_FILE */
… …
972} 897}
973 898
974bool 899bool
975bgPixmap_t::set_blur_radius (const char *geom) 900bgPixmap_t::set_blur_radius (const char *geom)
976{ 901{
977 int changed = 0; 902 bool changed = false;
978 unsigned int hr, vr; 903 unsigned int hr, vr;
979 int junk; 904 int junk;
980 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 905 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
981 906
982 if (!(geom_flags & WidthValue)) 907 if (!(geom_flags & WidthValue))
… …
987 min_it (hr, 128); 912 min_it (hr, 128);
988 min_it (vr, 128); 913 min_it (vr, 128);
989 914
990 if (h_blurRadius != hr) 915 if (h_blurRadius != hr)
991 { 916 {
992 ++changed; 917 changed = true;
993 h_blurRadius = hr; 918 h_blurRadius = hr;
994 } 919 }
995 920
996 if (v_blurRadius != vr) 921 if (v_blurRadius != vr)
997 { 922 {
998 ++changed; 923 changed = true;
999 v_blurRadius = vr; 924 v_blurRadius = vr;
1000 } 925 }
1001 926
1002 if (v_blurRadius == 0 && h_blurRadius == 0) 927 if (v_blurRadius == 0 && h_blurRadius == 0)
1003 flags &= ~blurNeeded; 928 flags &= ~blurNeeded;
1004 else 929 else
1005 flags |= blurNeeded; 930 flags |= blurNeeded;
1006 931
1007#if XFT
1008 XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root);
1009 if (filters)
1010 {
1011 for (int i = 0; i < filters->nfilter; i++)
1012 if (!strcmp (filters->filter[i], FilterConvolution))
1013 flags |= bgPixmap_t::blurServerSide;
1014
1015 XFree (filters);
1016 }
1017#endif
1018
1019 return (changed > 0); 932 return changed;
1020} 933}
1021 934
1022static inline unsigned long 935static inline unsigned long
1023compute_tint_shade_flags (rxvt_color *tint, int shade) 936compute_tint_shade_flags (rxvt_color *tint, int shade)
1024{ 937{
… …
1027 bool has_shade = shade != 100; 940 bool has_shade = shade != 100;
1028 941
1029 if (tint) 942 if (tint)
1030 { 943 {
1031 tint->get (c); 944 tint->get (c);
1032# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 945# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x00ff || (cmp) >= 0xff00)
946 if (!has_shade
1033 if (!has_shade && IS_COMPONENT_WHOLESOME (c.r) 947 && IS_COMPONENT_WHOLESOME (c.r)
1034 && IS_COMPONENT_WHOLESOME (c.g) 948 && IS_COMPONENT_WHOLESOME (c.g)
1035 && IS_COMPONENT_WHOLESOME (c.b)) 949 && IS_COMPONENT_WHOLESOME (c.b))
1036 flags |= bgPixmap_t::tintWholesome; 950 flags |= bgPixmap_t::tintWholesome;
1037# undef IS_COMPONENT_WHOLESOME 951# undef IS_COMPONENT_WHOLESOME
1038 } 952 }
1039 953
1040 if (has_shade) 954 if (has_shade || tint)
1041 flags |= bgPixmap_t::tintNeeded; 955 flags |= bgPixmap_t::tintNeeded;
1042 else if (tint)
1043 {
1044 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
1045 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
1046 {
1047 flags |= bgPixmap_t::tintNeeded;
1048 }
1049 }
1050
1051 if (flags & bgPixmap_t::tintNeeded)
1052 {
1053 if (flags & bgPixmap_t::tintWholesome)
1054 flags |= bgPixmap_t::tintServerSide;
1055 else
1056 {
1057#if XFT
1058 flags |= bgPixmap_t::tintServerSide;
1059#endif
1060 }
1061 }
1062 956
1063 return flags; 957 return flags;
1064} 958}
1065 959
1066bool 960bool
… …
1109 } 1003 }
1110 1004
1111 return false; 1005 return false;
1112} 1006}
1113 1007
1114#if XFT 1008#if XRENDER
1115static void 1009static void
1116get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 1010get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1117{ 1011{
1118 double sigma = radius / 2.0; 1012 double sigma = radius / 2.0;
1119 double scale = sqrt (2.0 * M_PI) * sigma; 1013 double scale = sqrt (2.0 * M_PI) * sigma;
… …
1136 1030
1137bool 1031bool
1138bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1032bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1139{ 1033{
1140 bool ret = false; 1034 bool ret = false;
1141#if XFT 1035#if XRENDER
1142 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1036 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1143 double *kernel = (double *)malloc (size * sizeof (double)); 1037 double *kernel = (double *)malloc (size * sizeof (double));
1144 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1038 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1145 1039
1146 Display *dpy = target->dpy; 1040 Display *dpy = target->dpy;
… …
1223 XFreeGC (dpy, gc); 1117 XFreeGC (dpy, gc);
1224 } 1118 }
1225 } 1119 }
1226 else 1120 else
1227 { 1121 {
1228# if XFT 1122# if XRENDER
1229 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1123 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1230 1124
1231 if (flags & tintSet) 1125 if (flags & tintSet)
1232 tint.get (c); 1126 tint.get (c);
1233 1127
… …
1263 1157
1264 if (mask_pic && overlay_pic && back_pic) 1158 if (mask_pic && overlay_pic && back_pic)
1265 { 1159 {
1266 XRenderColor mask_c; 1160 XRenderColor mask_c;
1267 1161
1268 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); 1162 mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0;
1269 mask_c.alpha = 0xffff; 1163 mask_c.alpha = 0xffff;
1270 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1164 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1271 1165
1272 mask_c.alpha = 0; 1166 mask_c.alpha = 0;
1273 mask_c.red = 0xffff - c.r; 1167 mask_c.red = 0xffff - c.r;
… …
1286 1180
1287 return ret; 1181 return ret;
1288} 1182}
1289 1183
1290/* make_transparency_pixmap() 1184/* make_transparency_pixmap()
1291 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1185 * Builds a pixmap of the same size as the terminal window that contains
1292 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 1186 * the tiled portion of the root pixmap that is supposed to be covered by
1293 * our window. 1187 * our window.
1294 */ 1188 */
1295unsigned long 1189unsigned long
1296bgPixmap_t::make_transparency_pixmap () 1190bgPixmap_t::make_transparency_pixmap ()
1297{ 1191{
… …
1301 return 0; 1195 return 0;
1302 1196
1303 /* root dimensions may change from call to call - but Display structure should 1197 /* root dimensions may change from call to call - but Display structure should
1304 * be always up-to-date, so let's use it : 1198 * be always up-to-date, so let's use it :
1305 */ 1199 */
1306 Window root = target->display->root;
1307 int screen = target->display->screen; 1200 int screen = target->display->screen;
1308 Display *dpy = target->dpy; 1201 Display *dpy = target->dpy;
1202 int root_depth = DefaultDepth (dpy, screen);
1309 int root_width = DisplayWidth (dpy, screen); 1203 int root_width = DisplayWidth (dpy, screen);
1310 int root_height = DisplayHeight (dpy, screen); 1204 int root_height = DisplayHeight (dpy, screen);
1311 unsigned int root_pmap_width, root_pmap_height; 1205 unsigned int root_pmap_width, root_pmap_height;
1312 int window_width = target->szHint.width; 1206 int window_width = target->szHint.width;
1313 int window_height = target->szHint.height; 1207 int window_height = target->szHint.height;
1314 int sx, sy; 1208 int sx, sy;
1315 XGCValues gcv; 1209 XGCValues gcv;
1316 GC gc; 1210 GC gc;
1317 1211
1318 target->get_window_origin (sx, sy); 1212 sx = target_x;
1213 sy = target_y;
1319 1214
1320 /* check if we are outside of the visible part of the virtual screen : */ 1215 /* check if we are outside of the visible part of the virtual screen : */
1321 if (sx + window_width <= 0 || sy + window_height <= 0 1216 if (sx + window_width <= 0 || sy + window_height <= 0
1322 || sx >= root_width || sy >= root_height) 1217 || sx >= root_width || sy >= root_height)
1323 return 0; 1218 return 0;
1324 1219
1220 // validate root pixmap and get its size
1325 if (root_pixmap != None) 1221 if (root_pixmap != None)
1326 { 1222 {
1327 /* we want to validate the pixmap and get its size at the same time : */ 1223 Window wdummy;
1328 int junk; 1224 int idummy;
1329 unsigned int ujunk; 1225 unsigned int udummy;
1330 /* root pixmap may be bad - allow a error */ 1226
1331 target->allowedxerror = -1; 1227 target->allowedxerror = -1;
1332 1228
1333 if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk)) 1229 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy))
1334 root_pixmap = None; 1230 root_pixmap = None;
1335 1231
1336 target->allowedxerror = 0; 1232 target->allowedxerror = 0;
1233 }
1234
1235 Pixmap recoded_root_pmap = root_pixmap;
1236
1237 if (root_pixmap != None && root_depth != target->depth)
1238 {
1239#if XRENDER
1240 if (flags & HAS_RENDER)
1241 {
1242 XRenderPictureAttributes pa;
1243
1244 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1245 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1246
1247 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
1248 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
1249 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1250
1251 if (src && dst)
1252 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1253 else
1254 {
1255 XFreePixmap (dpy, recoded_root_pmap);
1256 root_pixmap = None;
1257 }
1258
1259 XRenderFreePicture (dpy, src);
1260 XRenderFreePicture (dpy, dst);
1261 }
1262 else
1263#endif
1264 root_pixmap = None;
1337 } 1265 }
1338 1266
1339 if (root_pixmap == None) 1267 if (root_pixmap == None)
1340 return 0; 1268 return 0;
1341 1269
1342 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1270 Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth);
1343 1271
1344 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1272 if (tiled_root_pmap == None) /* something really bad happened - abort */
1345 return 0; 1273 return 0;
1346 1274
1347 /* straightforward pixmap copy */ 1275 /* straightforward pixmap copy */
1348 gcv.tile = root_pixmap;
1349 gcv.fill_style = FillTiled;
1350
1351 while (sx < 0) sx += (int)root_width; 1276 while (sx < 0) sx += (int)root_width;
1352 while (sy < 0) sy += (int)root_height; 1277 while (sy < 0) sy += (int)root_height;
1353 1278
1279 gcv.tile = recoded_root_pmap;
1280 gcv.fill_style = FillTiled;
1354 gcv.ts_x_origin = -sx; 1281 gcv.ts_x_origin = -sx;
1355 gcv.ts_y_origin = -sy; 1282 gcv.ts_y_origin = -sy;
1356 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1283 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1357 1284
1358 if (gc) 1285 if (gc)
1359 { 1286 {
1360 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1287 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1361 result |= transpPmapTiled; 1288 result |= transpPmapTiled;
1362 XFreeGC (dpy, gc); 1289 XFreeGC (dpy, gc);
1363 }
1364 1290
1365 if (tiled_root_pmap != None)
1366 {
1367 if (!need_client_side_rendering ()) 1291 if (!need_client_side_rendering ())
1368 { 1292 {
1369 if (flags & (blurNeeded | blurServerSide)) 1293 if ((flags & blurNeeded)
1294 && (flags & HAS_RENDER_CONV))
1370 { 1295 {
1371 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height)) 1296 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1372 result |= transpPmapBlurred; 1297 result |= transpPmapBlurred;
1373 } 1298 }
1374 if (flags & (tintNeeded | tintServerSide)) 1299 if ((flags & tintNeeded)
1300 && (flags & (tintWholesome | HAS_RENDER)))
1375 { 1301 {
1376 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height)) 1302 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1377 result |= transpPmapTinted; 1303 result |= transpPmapTinted;
1378 } 1304 }
1379 } /* server side rendering completed */ 1305 } /* server side rendering completed */
1380 1306
1381 if (pixmap) 1307 if (pixmap)
1382 XFreePixmap (dpy, pixmap); 1308 XFreePixmap (dpy, pixmap);
1383 1309
1384 pixmap = tiled_root_pmap; 1310 pixmap = tiled_root_pmap;
1385 pmap_width = window_width; 1311 pmap_width = window_width;
1386 pmap_height = window_height; 1312 pmap_height = window_height;
1387 pmap_depth = root_depth; 1313 pmap_depth = target->depth;
1388 } 1314 }
1315 else
1316 XFreePixmap (dpy, tiled_root_pmap);
1317
1318 if (recoded_root_pmap != root_pixmap)
1319 XFreePixmap (dpy, recoded_root_pmap);
1389 1320
1390 return result; 1321 return result;
1391} 1322}
1392 1323
1393bool 1324void
1394bgPixmap_t::set_root_pixmap () 1325bgPixmap_t::set_root_pixmap ()
1395{ 1326{
1396 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1327 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1397 if (new_root_pixmap == None) 1328 if (new_root_pixmap == None)
1398 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1329 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1399 1330
1400 if (new_root_pixmap != root_pixmap)
1401 {
1402 root_pixmap = new_root_pixmap; 1331 root_pixmap = new_root_pixmap;
1403 return true;
1404 }
1405
1406 return false;
1407} 1332}
1408# endif /* ENABLE_TRANSPARENCY */ 1333# endif /* ENABLE_TRANSPARENCY */
1409 1334
1410# ifndef HAVE_AFTERIMAGE 1335#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1411static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm); 1336static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c);
1412# endif 1337# endif
1413 1338
1414bool 1339bool
1415bgPixmap_t::render () 1340bgPixmap_t::render ()
1416{ 1341{
… …
1425 { 1350 {
1426 /* we need to re-generate transparency pixmap in that case ! */ 1351 /* we need to re-generate transparency pixmap in that case ! */
1427 background_flags = make_transparency_pixmap (); 1352 background_flags = make_transparency_pixmap ();
1428 if (background_flags == 0) 1353 if (background_flags == 0)
1429 return false; 1354 return false;
1430 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1355 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1431 && pmap_depth == target->depth)
1432 flags = flags & ~isInvalid; 1356 flags &= ~isInvalid;
1433 } 1357 }
1434# endif 1358# endif
1435 1359
1436# ifdef BG_IMAGE_FROM_FILE 1360# ifdef BG_IMAGE_FROM_FILE
1437 if (have_image 1361 if (have_image
1438 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1362 || (background_flags & transpTransformations) != (flags & transpTransformations))
1439 { 1363 {
1440 if (render_image (background_flags)) 1364 if (render_image (background_flags))
1441 flags = flags & ~isInvalid; 1365 flags &= ~isInvalid;
1442 } 1366 }
1443# endif 1367# endif
1444 1368
1369# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1445 XImage *result = NULL; 1370 XImage *result = NULL;
1446 1371
1447 if (background_flags && (flags & isInvalid)) 1372 if (background_flags && (flags & isInvalid))
1448 { 1373 {
1449 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1374 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1450 } 1375 }
1451 1376
1452 if (result) 1377 if (result)
1453 { 1378 {
1454# if !defined(HAVE_AFTERIMAGE) && !XFT
1455 /* our own client-side tinting */ 1379 /* our own client-side tinting */
1456 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1457 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1458 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1380 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1459 { 1381 {
1460 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1382 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1461 if (flags & tintSet) 1383 if (flags & tintSet)
1462 tint.get (c); 1384 tint.get (c);
1463 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b); 1385 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1464 } 1386 }
1465# endif
1466 1387
1467 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1388 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1468 1389
1469 if (gc) 1390 if (gc)
1470 { 1391 {
1471 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1472 {
1473 XFreePixmap (target->dpy, pixmap);
1474 pixmap = None;
1475 }
1476
1477 if (pixmap == None)
1478 {
1479 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1480 pmap_width = result->width;
1481 pmap_height = result->height;
1482 pmap_depth = target->depth;
1483 }
1484
1485 if (pmap_depth != result->depth)
1486 {
1487 /* Bad Match error will ensue ! stupid X !!!! */
1488 if (result->depth == 24 && pmap_depth == 32)
1489 result->depth = 32;
1490 else if (result->depth == 32 && pmap_depth == 24)
1491 result->depth = 24;
1492 else
1493 {
1494 /* TODO: implement image recoding */
1495 }
1496 }
1497
1498 if (pmap_depth == result->depth)
1499 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1392 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1500 1393
1501 XFreeGC (target->dpy, gc); 1394 XFreeGC (target->dpy, gc);
1502 flags = flags & ~isInvalid; 1395 flags &= ~isInvalid;
1503 } 1396 }
1504 1397
1505 XDestroyImage (result); 1398 XDestroyImage (result);
1506 } 1399 }
1400# endif
1507 1401
1508 if (flags & isInvalid) 1402 if (flags & isInvalid)
1509 { 1403 {
1510 if (pixmap != None) 1404 if (pixmap != None)
1511 { 1405 {
… …
1519 valid_since = ev::now (); 1413 valid_since = ev::now ();
1520 1414
1521 return true; 1415 return true;
1522} 1416}
1523 1417
1524bool 1418void
1525bgPixmap_t::set_target (rxvt_term *new_target) 1419bgPixmap_t::set_target (rxvt_term *new_target)
1526{ 1420{
1527 if (new_target)
1528 if (target != new_target)
1529 {
1530 target = new_target; 1421 target = new_target;
1531# ifdef ENABLE_TRANSPARENCY 1422
1532 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1423 flags &= ~(HAS_RENDER | HAS_RENDER_CONV);
1424#if XRENDER
1425 int major, minor;
1426 if (XRenderQueryVersion (target->dpy, &major, &minor))
1427 flags |= HAS_RENDER;
1428 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1429 if (filters)
1430 {
1431 for (int i = 0; i < filters->nfilter; i++)
1432 if (!strcmp (filters->filter[i], FilterConvolution))
1433 flags |= HAS_RENDER_CONV;
1434
1435 XFree (filters);
1436 }
1533# endif 1437#endif
1534 return true;
1535 }
1536
1537 return false;
1538} 1438}
1539 1439
1540void 1440void
1541bgPixmap_t::apply () 1441bgPixmap_t::apply ()
1542{ 1442{
1543 if (target) 1443 if (target == NULL)
1544 { 1444 return;
1545 flags &= ~isVtOrigin;
1546 1445
1547 if (pixmap != None) 1446 if (pixmap != None)
1548 { 1447 {
1549 /* set target's background to pixmap */ 1448 /* set target's background to pixmap */
1550# ifdef ENABLE_TRANSPARENCY 1449# ifdef ENABLE_TRANSPARENCY
1551 if (flags & isTransparent) 1450 if (flags & isTransparent)
1552 { 1451 {
1553 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1452 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1554 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1453 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1555 1454
1556 if (target->scrollBar.win) 1455 if (target->scrollBar.win)
1557 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1456 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1558 } 1457 }
1559 else 1458 else
1560# endif 1459# endif
1561 { 1460 {
1562 flags |= isVtOrigin;
1563 /* force old pixmap dereference in case it was transparent before :*/ 1461 /* force old pixmap dereference in case it was transparent before :*/
1564 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1565 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1566 /* do we also need to set scrollbar's background here ? */
1567
1568 if (target->scrollBar.win)
1569 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1570 }
1571 }
1572 else
1573 {
1574 /* set target background to a pixel */
1575 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1462 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1576 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1463 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1577 /* do we also need to set scrollbar's background here ? */ 1464 /* do we also need to set scrollbar's background here ? */
1465
1578 if (target->scrollBar.win) 1466 if (target->scrollBar.win)
1579 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1467 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1580 } 1468 }
1469 }
1470 else
1471 {
1472 /* set target background to a pixel */
1473 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1474 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1475 /* do we also need to set scrollbar's background here ? */
1476 if (target->scrollBar.win)
1477 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1478 }
1581 1479
1582 /* don't want Expose on the parent or vt. It is better to use 1480 /* don't want Expose on the parent or vt. It is better to use
1583 scr_touch or we get a great deal of flicker otherwise: */ 1481 scr_touch or we get a great deal of flicker otherwise: */
1584 XClearWindow (target->dpy, target->parent[0]); 1482 XClearWindow (target->dpy, target->parent[0]);
1585 1483
1586 if (target->scrollBar.state && target->scrollBar.win) 1484 if (target->scrollBar.state && target->scrollBar.win)
1587 { 1485 {
1588 target->scrollBar.state = STATE_IDLE; 1486 target->scrollBar.state = STATE_IDLE;
1589 target->scrollBar.show (0); 1487 target->scrollBar.show (0);
1590 } 1488 }
1591 1489
1592 target->want_refresh = 1; 1490 target->want_refresh = 1;
1593 flags |= hasChanged; 1491 flags |= hasChanged;
1594 }
1595} 1492}
1596 1493
1597#endif /* HAVE_BG_PIXMAP */ 1494#endif /* HAVE_BG_PIXMAP */
1598 1495
1599#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1496#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1600/* taken from aterm-0.4.2 */ 1497/* taken from aterm-0.4.2 */
1601 1498
1602static void 1499static void
1603ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm) 1500ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c)
1604{ 1501{
1605 int sh_r, sh_g, sh_b; 1502 int sh_r, sh_g, sh_b;
1606 uint32_t mask_r, mask_g, mask_b; 1503 uint32_t mask_r, mask_g, mask_b;
1607 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1504 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1608 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1505 rgba low;
1609 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1506 rgba high;
1610 int i; 1507 int i;
1611 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; 1508 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1612 1509
1613 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; 1510 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1614 1511
… …
1679 /* prepare limits for color transformation (each channel is handled separately) */ 1576 /* prepare limits for color transformation (each channel is handled separately) */
1680 if (shade > 100) 1577 if (shade > 100)
1681 { 1578 {
1682 shade = 200 - shade; 1579 shade = 200 - shade;
1683 1580
1684 lower_lim_r = 65535-rm; 1581 high.r = (65535 - c.r) * shade / 100;
1685 lower_lim_g = 65535-gm; 1582 high.g = (65535 - c.g) * shade / 100;
1686 lower_lim_b = 65535-bm; 1583 high.b = (65535 - c.b) * shade / 100;
1687 1584
1688 lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100); 1585 low.r = 65535 - high.r;
1689 lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100); 1586 low.g = 65535 - high.g;
1690 lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100); 1587 low.b = 65535 - high.b;
1691
1692 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1693 } 1588 }
1694 else 1589 else
1695 { 1590 {
1591 high.r = c.r * shade / 100;
1592 high.g = c.g * shade / 100;
1593 high.b = c.b * shade / 100;
1696 1594
1697 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1595 low.r = low.g = low.b = 0;
1698
1699 upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1700 upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1701 upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1702 } 1596 }
1703 1597
1704 /* fill our lookup tables */ 1598 /* fill our lookup tables */
1705 for (i = 0; i <= mask_r>>sh_r; i++) 1599 for (i = 0; i <= mask_r>>sh_r; i++)
1706 { 1600 {
1707 uint32_t tmp; 1601 uint32_t tmp;
1708 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r)); 1602 tmp = i * high.r;
1709 tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r); 1603 tmp += (mask_r>>sh_r) * low.r;
1710 lookup_r[i] = (tmp/65535)<<sh_r; 1604 lookup_r[i] = (tmp/65535)<<sh_r;
1711 } 1605 }
1712 for (i = 0; i <= mask_g>>sh_g; i++) 1606 for (i = 0; i <= mask_g>>sh_g; i++)
1713 { 1607 {
1714 uint32_t tmp; 1608 uint32_t tmp;
1715 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g)); 1609 tmp = i * high.g;
1716 tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g); 1610 tmp += (mask_g>>sh_g) * low.g;
1717 lookup_g[i] = (tmp/65535)<<sh_g; 1611 lookup_g[i] = (tmp/65535)<<sh_g;
1718 } 1612 }
1719 for (i = 0; i <= mask_b>>sh_b; i++) 1613 for (i = 0; i <= mask_b>>sh_b; i++)
1720 { 1614 {
1721 uint32_t tmp; 1615 uint32_t tmp;
1722 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b)); 1616 tmp = i * high.b;
1723 tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b); 1617 tmp += (mask_b>>sh_b) * low.b;
1724 lookup_b[i] = (tmp/65535)<<sh_b; 1618 lookup_b[i] = (tmp/65535)<<sh_b;
1725 } 1619 }
1726 1620
1727 /* apply table to input image (replacing colors by newly calculated ones) */ 1621 /* apply table to input image (replacing colors by newly calculated ones) */
1728 if (srcImage->bits_per_pixel == 32 1622 if (srcImage->bits_per_pixel == 32

Diff Legend

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