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.96 by sf-exg, Fri Oct 22 16:49:26 2010 UTC vs.
Revision 1.122 by sf-exg, Sat Nov 20 11:30:58 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 return (changed > 0); 376 return changed;
434} 377}
435 378
436void 379void
437bgPixmap_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)
438{ 381{
… …
455 if (!w) w = image_width; 398 if (!w) w = image_width;
456 if (!h) h = image_height; 399 if (!h) h = image_height;
457 400
458 if (flags & rootAlign) 401 if (flags & rootAlign)
459 { 402 {
460 target->get_window_origin (x, y);
461 x = -x; 403 x = -target_x;
462 y = -y; 404 y = -target_y;
463 } 405 }
464 else 406 else
465 { 407 {
466 x = make_align_position (h_align, target_width, w); 408 x = make_align_position (h_align, target_width, w);
467 y = make_align_position (v_align, target_height, h); 409 y = make_align_position (v_align, target_height, h);
… …
661 if (result) 603 if (result)
662 { 604 {
663 XGCValues gcv; 605 XGCValues gcv;
664 GC gc; 606 GC gc;
665 607
666 if (pixmap)
667 {
668 if (pmap_width != new_pmap_width
669 || pmap_height != new_pmap_height
670 || pmap_depth != target->depth)
671 {
672 XFreePixmap (target->dpy, pixmap);
673 pixmap = None;
674 }
675 }
676
677 /* create Pixmap */ 608 /* create Pixmap */
678 if (pixmap == None) 609 if (pixmap == None
610 || pmap_width != new_pmap_width
611 || pmap_height != new_pmap_height
612 || pmap_depth != target->depth)
679 { 613 {
614 if (pixmap)
615 XFreePixmap (target->dpy, pixmap);
680 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);
681 pmap_width = new_pmap_width; 617 pmap_width = new_pmap_width;
682 pmap_height = new_pmap_height; 618 pmap_height = new_pmap_height;
683 pmap_depth = target->depth; 619 pmap_depth = target->depth;
684 } 620 }
… …
729 return false; 665 return false;
730 666
731 if (!pixbuf) 667 if (!pixbuf)
732 return false; 668 return false;
733 669
734#if !XFT
735 if (background_flags) 670 if (background_flags
671 && !(flags & HAS_RENDER))
736 return false; 672 return false;
737#endif
738 673
739 GdkPixbuf *result; 674 GdkPixbuf *result;
740 675
741 int image_width = gdk_pixbuf_get_width (pixbuf); 676 int image_width = gdk_pixbuf_get_width (pixbuf);
742 int image_height = gdk_pixbuf_get_height (pixbuf); 677 int image_height = gdk_pixbuf_get_height (pixbuf);
… …
793 new_pmap_width = min (image_width, target_width); 728 new_pmap_width = min (image_width, target_width);
794 new_pmap_height = min (image_height, target_height); 729 new_pmap_height = min (image_height, target_height);
795 } 730 }
796 } 731 }
797 732
798 if (pixmap)
799 {
800 if (pmap_width != new_pmap_width
801 || pmap_height != new_pmap_height
802 || pmap_depth != target->depth)
803 {
804 XFreePixmap (target->dpy, pixmap);
805 pixmap = None;
806 }
807 }
808
809 if (pixmap == None) 733 if (pixmap == None
734 || pmap_width != new_pmap_width
735 || pmap_height != new_pmap_height
736 || pmap_depth != target->depth)
810 { 737 {
738 if (pixmap)
739 XFreePixmap (target->dpy, pixmap);
811 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);
812 pmap_width = new_pmap_width; 741 pmap_width = new_pmap_width;
813 pmap_height = new_pmap_height; 742 pmap_height = new_pmap_height;
814 pmap_depth = target->depth; 743 pmap_depth = target->depth;
815 } 744 }
… …
856 dst_width, dst_height, 785 dst_width, dst_height,
857 XLIB_RGB_DITHER_NONE, 786 XLIB_RGB_DITHER_NONE,
858 0, 0); 787 0, 0);
859 } 788 }
860 789
861#if XFT 790#if XRENDER
862 if (background_flags) 791 if (background_flags)
863 { 792 {
864 Display *dpy = target->dpy; 793 Display *dpy = target->dpy;
865 XRenderPictureAttributes pa; 794 XRenderPictureAttributes pa;
866 795
867 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen)); 796 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, target->visual);
868 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 797 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
869 798
870 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); 799 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
871 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa); 800 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
872 801
… …
909# endif /* HAVE_PIXBUF */ 838# endif /* HAVE_PIXBUF */
910 839
911bool 840bool
912bgPixmap_t::set_file (const char *file) 841bgPixmap_t::set_file (const char *file)
913{ 842{
914 assert (file); 843 if (!file || !*file)
844 return false;
915 845
916 if (*file)
917 {
918 if (const char *p = strchr (file, ';')) 846 if (const char *p = strchr (file, ';'))
919 { 847 {
920 size_t len = p - file; 848 size_t len = p - file;
921 char *f = rxvt_temp_buf<char> (len + 1); 849 char *f = rxvt_temp_buf<char> (len + 1);
922 memcpy (f, file, len); 850 memcpy (f, file, len);
923 f[len] = '\0'; 851 f[len] = '\0';
924 file = f; 852 file = f;
925 } 853 }
926 854
927# ifdef HAVE_AFTERIMAGE 855# ifdef HAVE_AFTERIMAGE
928 if (!target->asimman) 856 if (!target->asimman)
929 target->asimman = create_generic_imageman (target->rs[Rs_path]); 857 target->asimman = create_generic_imageman (target->rs[Rs_path]);
930 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 858 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
931 if (image) 859 if (image)
932 { 860 {
933 if (original_asim) 861 if (original_asim)
934 safe_asimage_destroy (original_asim); 862 safe_asimage_destroy (original_asim);
935 original_asim = image; 863 original_asim = image;
936 have_image = true; 864 have_image = true;
937 return true; 865 return true;
938 } 866 }
939# endif 867# endif
940 868
941# ifdef HAVE_PIXBUF 869# ifdef HAVE_PIXBUF
942 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 870 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
943 if (image) 871 if (image)
944 { 872 {
945 if (pixbuf) 873 if (pixbuf)
946 g_object_unref (pixbuf); 874 g_object_unref (pixbuf);
947 pixbuf = image; 875 pixbuf = image;
948 have_image = true; 876 have_image = true;
949 return true; 877 return true;
950 } 878 }
951# endif 879# endif
952 }
953 880
954 return false; 881 return false;
955} 882}
956 883
957# endif /* BG_IMAGE_FROM_FILE */ 884# endif /* BG_IMAGE_FROM_FILE */
… …
970} 897}
971 898
972bool 899bool
973bgPixmap_t::set_blur_radius (const char *geom) 900bgPixmap_t::set_blur_radius (const char *geom)
974{ 901{
975 int changed = 0; 902 bool changed = false;
976 unsigned int hr, vr; 903 unsigned int hr, vr;
977 int junk; 904 int junk;
978 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 905 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
979 906
980 if (!(geom_flags & WidthValue)) 907 if (!(geom_flags & WidthValue))
… …
985 min_it (hr, 128); 912 min_it (hr, 128);
986 min_it (vr, 128); 913 min_it (vr, 128);
987 914
988 if (h_blurRadius != hr) 915 if (h_blurRadius != hr)
989 { 916 {
990 ++changed; 917 changed = true;
991 h_blurRadius = hr; 918 h_blurRadius = hr;
992 } 919 }
993 920
994 if (v_blurRadius != vr) 921 if (v_blurRadius != vr)
995 { 922 {
996 ++changed; 923 changed = true;
997 v_blurRadius = vr; 924 v_blurRadius = vr;
998 } 925 }
999 926
1000 if (v_blurRadius == 0 && h_blurRadius == 0) 927 if (v_blurRadius == 0 && h_blurRadius == 0)
1001 flags &= ~blurNeeded; 928 flags &= ~blurNeeded;
1002 else 929 else
1003 flags |= blurNeeded; 930 flags |= blurNeeded;
1004 931
1005#if XFT
1006 XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root);
1007 if (filters)
1008 {
1009 for (int i = 0; i < filters->nfilter; i++)
1010 if (!strcmp (filters->filter[i], FilterConvolution))
1011 flags |= bgPixmap_t::blurServerSide;
1012
1013 XFree (filters);
1014 }
1015#endif
1016
1017 return (changed > 0); 932 return changed;
1018} 933}
1019 934
1020static inline unsigned long 935static inline unsigned long
1021compute_tint_shade_flags (rxvt_color *tint, int shade) 936compute_tint_shade_flags (rxvt_color *tint, int shade)
1022{ 937{
… …
1026 941
1027 if (tint) 942 if (tint)
1028 { 943 {
1029 tint->get (c); 944 tint->get (c);
1030# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 945# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
946 if (!has_shade
1031 if (!has_shade && IS_COMPONENT_WHOLESOME (c.r) 947 && IS_COMPONENT_WHOLESOME (c.r)
1032 && IS_COMPONENT_WHOLESOME (c.g) 948 && IS_COMPONENT_WHOLESOME (c.g)
1033 && IS_COMPONENT_WHOLESOME (c.b)) 949 && IS_COMPONENT_WHOLESOME (c.b))
1034 flags |= bgPixmap_t::tintWholesome; 950 flags |= bgPixmap_t::tintWholesome;
1035# undef IS_COMPONENT_WHOLESOME 951# undef IS_COMPONENT_WHOLESOME
1036 } 952 }
… …
1044 { 960 {
1045 flags |= bgPixmap_t::tintNeeded; 961 flags |= bgPixmap_t::tintNeeded;
1046 } 962 }
1047 } 963 }
1048 964
1049 if (flags & bgPixmap_t::tintNeeded)
1050 {
1051 if (flags & bgPixmap_t::tintWholesome)
1052 flags |= bgPixmap_t::tintServerSide;
1053 else
1054 {
1055#if XFT
1056 flags |= bgPixmap_t::tintServerSide;
1057#endif
1058 }
1059 }
1060
1061 return flags; 965 return flags;
1062} 966}
1063 967
1064bool 968bool
1065bgPixmap_t::set_tint (rxvt_color &new_tint) 969bgPixmap_t::set_tint (rxvt_color &new_tint)
… …
1107 } 1011 }
1108 1012
1109 return false; 1013 return false;
1110} 1014}
1111 1015
1112#if XFT 1016#if XRENDER
1113static void 1017static void
1114get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 1018get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1115{ 1019{
1116 double sigma = radius / 2.0; 1020 double sigma = radius / 2.0;
1117 double scale = sqrt (2.0 * M_PI) * sigma; 1021 double scale = sqrt (2.0 * M_PI) * sigma;
… …
1134 1038
1135bool 1039bool
1136bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1040bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1137{ 1041{
1138 bool ret = false; 1042 bool ret = false;
1139#if XFT 1043#if XRENDER
1140 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1044 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1141 double *kernel = (double *)malloc (size * sizeof (double)); 1045 double *kernel = (double *)malloc (size * sizeof (double));
1142 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1046 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1143 1047
1144 Display *dpy = target->dpy; 1048 Display *dpy = target->dpy;
… …
1221 XFreeGC (dpy, gc); 1125 XFreeGC (dpy, gc);
1222 } 1126 }
1223 } 1127 }
1224 else 1128 else
1225 { 1129 {
1226# if XFT 1130# if XRENDER
1227 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1131 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1228 1132
1229 if (flags & tintSet) 1133 if (flags & tintSet)
1230 tint.get (c); 1134 tint.get (c);
1231 1135
… …
1261 1165
1262 if (mask_pic && overlay_pic && back_pic) 1166 if (mask_pic && overlay_pic && back_pic)
1263 { 1167 {
1264 XRenderColor mask_c; 1168 XRenderColor mask_c;
1265 1169
1266 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); 1170 mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0;
1267 mask_c.alpha = 0xffff; 1171 mask_c.alpha = 0xffff;
1268 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1172 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1269 1173
1270 mask_c.alpha = 0; 1174 mask_c.alpha = 0;
1271 mask_c.red = 0xffff - c.r; 1175 mask_c.red = 0xffff - c.r;
… …
1284 1188
1285 return ret; 1189 return ret;
1286} 1190}
1287 1191
1288/* make_transparency_pixmap() 1192/* make_transparency_pixmap()
1289 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1193 * Builds a pixmap of the same size as the terminal window that contains
1290 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 1194 * the tiled portion of the root pixmap that is supposed to be covered by
1291 * our window. 1195 * our window.
1292 */ 1196 */
1293unsigned long 1197unsigned long
1294bgPixmap_t::make_transparency_pixmap () 1198bgPixmap_t::make_transparency_pixmap ()
1295{ 1199{
… …
1299 return 0; 1203 return 0;
1300 1204
1301 /* root dimensions may change from call to call - but Display structure should 1205 /* root dimensions may change from call to call - but Display structure should
1302 * be always up-to-date, so let's use it : 1206 * be always up-to-date, so let's use it :
1303 */ 1207 */
1304 Window root = target->display->root;
1305 int screen = target->display->screen; 1208 int screen = target->display->screen;
1306 Display *dpy = target->dpy; 1209 Display *dpy = target->dpy;
1210 int root_depth = DefaultDepth (dpy, screen);
1307 int root_width = DisplayWidth (dpy, screen); 1211 int root_width = DisplayWidth (dpy, screen);
1308 int root_height = DisplayHeight (dpy, screen); 1212 int root_height = DisplayHeight (dpy, screen);
1309 unsigned int root_pmap_width, root_pmap_height; 1213 unsigned int root_pmap_width, root_pmap_height;
1310 int window_width = target->szHint.width; 1214 int window_width = target->szHint.width;
1311 int window_height = target->szHint.height; 1215 int window_height = target->szHint.height;
1312 int sx, sy; 1216 int sx, sy;
1313 XGCValues gcv; 1217 XGCValues gcv;
1314 GC gc; 1218 GC gc;
1315 1219
1316 target->get_window_origin (sx, sy); 1220 sx = target_x;
1221 sy = target_y;
1317 1222
1318 /* check if we are outside of the visible part of the virtual screen : */ 1223 /* check if we are outside of the visible part of the virtual screen : */
1319 if (sx + window_width <= 0 || sy + window_height <= 0 1224 if (sx + window_width <= 0 || sy + window_height <= 0
1320 || sx >= root_width || sy >= root_height) 1225 || sx >= root_width || sy >= root_height)
1321 return 0; 1226 return 0;
1322 1227
1228 // validate root pixmap and get its size
1323 if (root_pixmap != None) 1229 if (root_pixmap != None)
1324 { 1230 {
1325 /* we want to validate the pixmap and get its size at the same time : */ 1231 Window wdummy;
1326 int junk; 1232 int idummy;
1327 unsigned int ujunk; 1233 unsigned int udummy;
1328 /* root pixmap may be bad - allow a error */ 1234
1329 target->allowedxerror = -1; 1235 target->allowedxerror = -1;
1330 1236
1331 if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk)) 1237 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy))
1332 root_pixmap = None; 1238 root_pixmap = None;
1333 1239
1334 target->allowedxerror = 0; 1240 target->allowedxerror = 0;
1241 }
1242
1243 Pixmap recoded_root_pmap = root_pixmap;
1244
1245 if (root_pixmap != None && root_depth != target->depth)
1246 {
1247#if XRENDER
1248 if (flags & HAS_RENDER)
1249 {
1250 XRenderPictureAttributes pa;
1251
1252 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1253 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1254
1255 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
1256 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
1257 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1258
1259 if (src && dst)
1260 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1261 else
1262 {
1263 XFreePixmap (dpy, recoded_root_pmap);
1264 root_pixmap = None;
1265 }
1266
1267 XRenderFreePicture (dpy, src);
1268 XRenderFreePicture (dpy, dst);
1269 }
1270 else
1271#endif
1272 root_pixmap = None;
1335 } 1273 }
1336 1274
1337 if (root_pixmap == None) 1275 if (root_pixmap == None)
1338 return 0; 1276 return 0;
1339 1277
1340 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1278 Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth);
1341 1279
1342 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1280 if (tiled_root_pmap == None) /* something really bad happened - abort */
1343 return 0; 1281 return 0;
1344 1282
1345 /* straightforward pixmap copy */ 1283 /* straightforward pixmap copy */
1346 gcv.tile = root_pixmap;
1347 gcv.fill_style = FillTiled;
1348
1349 while (sx < 0) sx += (int)root_width; 1284 while (sx < 0) sx += (int)root_width;
1350 while (sy < 0) sy += (int)root_height; 1285 while (sy < 0) sy += (int)root_height;
1351 1286
1287 gcv.tile = recoded_root_pmap;
1288 gcv.fill_style = FillTiled;
1352 gcv.ts_x_origin = -sx; 1289 gcv.ts_x_origin = -sx;
1353 gcv.ts_y_origin = -sy; 1290 gcv.ts_y_origin = -sy;
1354 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1291 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1355 1292
1356 if (gc) 1293 if (gc)
1357 { 1294 {
1358 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1295 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1359 result |= transpPmapTiled; 1296 result |= transpPmapTiled;
1360 XFreeGC (dpy, gc); 1297 XFreeGC (dpy, gc);
1361 }
1362 1298
1363 if (tiled_root_pmap != None)
1364 {
1365 if (!need_client_side_rendering ()) 1299 if (!need_client_side_rendering ())
1366 { 1300 {
1367 if (flags & (blurNeeded | blurServerSide)) 1301 if ((flags & blurNeeded)
1302 && (flags & HAS_RENDER_CONV))
1368 { 1303 {
1369 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height)) 1304 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1370 result |= transpPmapBlurred; 1305 result |= transpPmapBlurred;
1371 } 1306 }
1372 if (flags & (tintNeeded | tintServerSide)) 1307 if ((flags & tintNeeded)
1308 && (flags & (tintWholesome | HAS_RENDER)))
1373 { 1309 {
1374 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height)) 1310 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1375 result |= transpPmapTinted; 1311 result |= transpPmapTinted;
1376 } 1312 }
1377 } /* server side rendering completed */ 1313 } /* server side rendering completed */
1378 1314
1379 if (pixmap) 1315 if (pixmap)
1380 XFreePixmap (dpy, pixmap); 1316 XFreePixmap (dpy, pixmap);
1381 1317
1382 pixmap = tiled_root_pmap; 1318 pixmap = tiled_root_pmap;
1383 pmap_width = window_width; 1319 pmap_width = window_width;
1384 pmap_height = window_height; 1320 pmap_height = window_height;
1385 pmap_depth = root_depth; 1321 pmap_depth = target->depth;
1386 } 1322 }
1323 else
1324 XFreePixmap (dpy, tiled_root_pmap);
1325
1326 if (recoded_root_pmap != root_pixmap)
1327 XFreePixmap (dpy, recoded_root_pmap);
1387 1328
1388 return result; 1329 return result;
1389} 1330}
1390 1331
1391bool 1332void
1392bgPixmap_t::set_root_pixmap () 1333bgPixmap_t::set_root_pixmap ()
1393{ 1334{
1394 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1335 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1395 if (new_root_pixmap == None) 1336 if (new_root_pixmap == None)
1396 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1337 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1397 1338
1398 if (new_root_pixmap != root_pixmap)
1399 {
1400 root_pixmap = new_root_pixmap; 1339 root_pixmap = new_root_pixmap;
1401 return true;
1402 }
1403
1404 return false;
1405} 1340}
1406# endif /* ENABLE_TRANSPARENCY */ 1341# endif /* ENABLE_TRANSPARENCY */
1407 1342
1408# ifndef HAVE_AFTERIMAGE 1343#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1409static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm); 1344static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c);
1410# endif 1345# endif
1411 1346
1412bool 1347bool
1413bgPixmap_t::render () 1348bgPixmap_t::render ()
1414{ 1349{
… …
1423 { 1358 {
1424 /* we need to re-generate transparency pixmap in that case ! */ 1359 /* we need to re-generate transparency pixmap in that case ! */
1425 background_flags = make_transparency_pixmap (); 1360 background_flags = make_transparency_pixmap ();
1426 if (background_flags == 0) 1361 if (background_flags == 0)
1427 return false; 1362 return false;
1428 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1363 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1429 && pmap_depth == target->depth)
1430 flags = flags & ~isInvalid; 1364 flags &= ~isInvalid;
1431 } 1365 }
1432# endif 1366# endif
1433 1367
1434# ifdef BG_IMAGE_FROM_FILE 1368# ifdef BG_IMAGE_FROM_FILE
1435 if (have_image 1369 if (have_image
1436 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1370 || (background_flags & transpTransformations) != (flags & transpTransformations))
1437 { 1371 {
1438 if (render_image (background_flags)) 1372 if (render_image (background_flags))
1439 flags = flags & ~isInvalid; 1373 flags &= ~isInvalid;
1440 } 1374 }
1441# endif 1375# endif
1442 1376
1377# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1443 XImage *result = NULL; 1378 XImage *result = NULL;
1444 1379
1445 if (background_flags && (flags & isInvalid)) 1380 if (background_flags && (flags & isInvalid))
1446 { 1381 {
1447 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1382 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1448 } 1383 }
1449 1384
1450 if (result) 1385 if (result)
1451 { 1386 {
1452# if !defined(HAVE_AFTERIMAGE) && !XFT
1453 /* our own client-side tinting */ 1387 /* our own client-side tinting */
1454 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1455 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1456 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1388 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1457 { 1389 {
1458 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1390 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1459 if (flags & tintSet) 1391 if (flags & tintSet)
1460 tint.get (c); 1392 tint.get (c);
1461 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b); 1393 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1462 } 1394 }
1463# endif
1464 1395
1465 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1396 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1466 1397
1467 if (gc) 1398 if (gc)
1468 { 1399 {
1469 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1470 {
1471 XFreePixmap (target->dpy, pixmap);
1472 pixmap = None;
1473 }
1474
1475 if (pixmap == None)
1476 {
1477 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1478 pmap_width = result->width;
1479 pmap_height = result->height;
1480 pmap_depth = target->depth;
1481 }
1482
1483 if (pmap_depth != result->depth)
1484 {
1485 /* Bad Match error will ensue ! stupid X !!!! */
1486 if (result->depth == 24 && pmap_depth == 32)
1487 result->depth = 32;
1488 else if (result->depth == 32 && pmap_depth == 24)
1489 result->depth = 24;
1490 else
1491 {
1492 /* TODO: implement image recoding */
1493 }
1494 }
1495
1496 if (pmap_depth == result->depth)
1497 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1400 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1498 1401
1499 XFreeGC (target->dpy, gc); 1402 XFreeGC (target->dpy, gc);
1500 flags = flags & ~isInvalid; 1403 flags &= ~isInvalid;
1501 } 1404 }
1502 1405
1503 XDestroyImage (result); 1406 XDestroyImage (result);
1504 } 1407 }
1408# endif
1505 1409
1506 if (flags & isInvalid) 1410 if (flags & isInvalid)
1507 { 1411 {
1508 if (pixmap != None) 1412 if (pixmap != None)
1509 { 1413 {
… …
1517 valid_since = ev::now (); 1421 valid_since = ev::now ();
1518 1422
1519 return true; 1423 return true;
1520} 1424}
1521 1425
1522bool 1426void
1523bgPixmap_t::set_target (rxvt_term *new_target) 1427bgPixmap_t::set_target (rxvt_term *new_target)
1524{ 1428{
1525 if (new_target)
1526 if (target != new_target)
1527 {
1528 target = new_target; 1429 target = new_target;
1529# ifdef ENABLE_TRANSPARENCY 1430
1530 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1431 flags &= ~(HAS_RENDER | HAS_RENDER_CONV);
1432#if XRENDER
1433 int major, minor;
1434 if (XRenderQueryVersion (target->dpy, &major, &minor))
1435 flags |= HAS_RENDER;
1436 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1437 if (filters)
1438 {
1439 for (int i = 0; i < filters->nfilter; i++)
1440 if (!strcmp (filters->filter[i], FilterConvolution))
1441 flags |= HAS_RENDER_CONV;
1442
1443 XFree (filters);
1444 }
1531# endif 1445#endif
1532 return true;
1533 }
1534
1535 return false;
1536} 1446}
1537 1447
1538void 1448void
1539bgPixmap_t::apply () 1449bgPixmap_t::apply ()
1540{ 1450{
1541 if (target) 1451 if (target == NULL)
1542 { 1452 return;
1543 flags &= ~isVtOrigin;
1544 1453
1545 if (pixmap != None) 1454 if (pixmap != None)
1546 { 1455 {
1547 /* set target's background to pixmap */ 1456 /* set target's background to pixmap */
1548# ifdef ENABLE_TRANSPARENCY 1457# ifdef ENABLE_TRANSPARENCY
1549 if (flags & isTransparent) 1458 if (flags & isTransparent)
1550 { 1459 {
1551 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1460 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1552 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1461 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1553 1462
1554 if (target->scrollBar.win) 1463 if (target->scrollBar.win)
1555 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1464 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1556 } 1465 }
1557 else 1466 else
1558# endif 1467# endif
1559 { 1468 {
1560 flags |= isVtOrigin;
1561 /* force old pixmap dereference in case it was transparent before :*/ 1469 /* force old pixmap dereference in case it was transparent before :*/
1562 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1563 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1564 /* do we also need to set scrollbar's background here ? */
1565
1566 if (target->scrollBar.win)
1567 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1568 }
1569 }
1570 else
1571 {
1572 /* set target background to a pixel */
1573 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1470 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1574 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1471 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1575 /* do we also need to set scrollbar's background here ? */ 1472 /* do we also need to set scrollbar's background here ? */
1473
1576 if (target->scrollBar.win) 1474 if (target->scrollBar.win)
1577 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1475 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1578 } 1476 }
1477 }
1478 else
1479 {
1480 /* set target background to a pixel */
1481 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1482 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1483 /* do we also need to set scrollbar's background here ? */
1484 if (target->scrollBar.win)
1485 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1486 }
1579 1487
1580 /* don't want Expose on the parent or vt. It is better to use 1488 /* don't want Expose on the parent or vt. It is better to use
1581 scr_touch or we get a great deal of flicker otherwise: */ 1489 scr_touch or we get a great deal of flicker otherwise: */
1582 XClearWindow (target->dpy, target->parent[0]); 1490 XClearWindow (target->dpy, target->parent[0]);
1583 1491
1584 if (target->scrollBar.state && target->scrollBar.win) 1492 if (target->scrollBar.state && target->scrollBar.win)
1585 { 1493 {
1586 target->scrollBar.state = STATE_IDLE; 1494 target->scrollBar.state = STATE_IDLE;
1587 target->scrollBar.show (0); 1495 target->scrollBar.show (0);
1588 } 1496 }
1589 1497
1590 target->want_refresh = 1; 1498 target->want_refresh = 1;
1591 flags |= hasChanged; 1499 flags |= hasChanged;
1592 }
1593} 1500}
1594 1501
1595#endif /* HAVE_BG_PIXMAP */ 1502#endif /* HAVE_BG_PIXMAP */
1596 1503
1597#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1504#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1598/* taken from aterm-0.4.2 */ 1505/* taken from aterm-0.4.2 */
1599 1506
1600static void 1507static void
1601ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm) 1508ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c)
1602{ 1509{
1603 int sh_r, sh_g, sh_b; 1510 int sh_r, sh_g, sh_b;
1604 uint32_t mask_r, mask_g, mask_b; 1511 uint32_t mask_r, mask_g, mask_b;
1605 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1512 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1606 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1513 rgba low;
1607 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1514 rgba high;
1608 int i; 1515 int i;
1609 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; 1516 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1610 1517
1611 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; 1518 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1612 1519
… …
1677 /* prepare limits for color transformation (each channel is handled separately) */ 1584 /* prepare limits for color transformation (each channel is handled separately) */
1678 if (shade > 100) 1585 if (shade > 100)
1679 { 1586 {
1680 shade = 200 - shade; 1587 shade = 200 - shade;
1681 1588
1682 lower_lim_r = 65535-rm; 1589 high.r = (65535 - c.r) * shade / 100;
1683 lower_lim_g = 65535-gm; 1590 high.g = (65535 - c.g) * shade / 100;
1684 lower_lim_b = 65535-bm; 1591 high.b = (65535 - c.b) * shade / 100;
1685 1592
1686 lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100); 1593 low.r = 65535 - high.r;
1687 lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100); 1594 low.g = 65535 - high.g;
1688 lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100); 1595 low.b = 65535 - high.b;
1689
1690 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1691 } 1596 }
1692 else 1597 else
1693 { 1598 {
1599 high.r = c.r * shade / 100;
1600 high.g = c.g * shade / 100;
1601 high.b = c.b * shade / 100;
1694 1602
1695 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1603 low.r = low.g = low.b = 0;
1696
1697 upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1698 upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1699 upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1700 } 1604 }
1701 1605
1702 /* fill our lookup tables */ 1606 /* fill our lookup tables */
1703 for (i = 0; i <= mask_r>>sh_r; i++) 1607 for (i = 0; i <= mask_r>>sh_r; i++)
1704 { 1608 {
1705 uint32_t tmp; 1609 uint32_t tmp;
1706 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r)); 1610 tmp = i * high.r;
1707 tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r); 1611 tmp += (mask_r>>sh_r) * low.r;
1708 lookup_r[i] = (tmp/65535)<<sh_r; 1612 lookup_r[i] = (tmp/65535)<<sh_r;
1709 } 1613 }
1710 for (i = 0; i <= mask_g>>sh_g; i++) 1614 for (i = 0; i <= mask_g>>sh_g; i++)
1711 { 1615 {
1712 uint32_t tmp; 1616 uint32_t tmp;
1713 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g)); 1617 tmp = i * high.g;
1714 tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g); 1618 tmp += (mask_g>>sh_g) * low.g;
1715 lookup_g[i] = (tmp/65535)<<sh_g; 1619 lookup_g[i] = (tmp/65535)<<sh_g;
1716 } 1620 }
1717 for (i = 0; i <= mask_b>>sh_b; i++) 1621 for (i = 0; i <= mask_b>>sh_b; i++)
1718 { 1622 {
1719 uint32_t tmp; 1623 uint32_t tmp;
1720 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b)); 1624 tmp = i * high.b;
1721 tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b); 1625 tmp += (mask_b>>sh_b) * low.b;
1722 lookup_b[i] = (tmp/65535)<<sh_b; 1626 lookup_b[i] = (tmp/65535)<<sh_b;
1723 } 1627 }
1724 1628
1725 /* apply table to input image (replacing colors by newly calculated ones) */ 1629 /* apply table to input image (replacing colors by newly calculated ones) */
1726 if (srcImage->bits_per_pixel == 32 1630 if (srcImage->bits_per_pixel == 32

Diff Legend

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