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.93 by sf-exg, Tue Oct 19 14:44:30 2010 UTC vs.
Revision 1.120 by sf-exg, Thu Nov 18 17:29:25 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
… …
168 return true; 158 return true;
169 } 159 }
170# endif 160# endif
171 161
172 return false; 162 return false;
173}; 163}
174 164
175bool bgPixmap_t::need_client_side_rendering () 165bool bgPixmap_t::need_client_side_rendering ()
176{ 166{
177# ifdef HAVE_AFTERIMAGE 167# ifdef HAVE_AFTERIMAGE
178 if (original_asim) 168 if (original_asim)
… …
248 dst_size = target_size - dst_pos; 238 dst_size = target_size - dst_pos;
249 return src_pos; 239 return src_pos;
250} 240}
251 241
252bool 242bool
253bgPixmap_t::set_geometry (const char *geom) 243bgPixmap_t::set_geometry (const char *geom, bool update)
254{ 244{
245 bool changed = false;
255 int geom_flags = 0, changed = 0; 246 int geom_flags = 0;
256 int x = 0, y = 0; 247 int x = 0, y = 0;
257 unsigned int w = 0, h = 0; 248 unsigned int w = 0, h = 0;
258 unsigned int n; 249 unsigned int n;
259 unsigned long new_flags = (flags & (~geometryFlags)); 250 unsigned long new_flags = (flags & (~geometryFlags));
260 const char *p; 251 const char *ops;
261# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */ 252# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
262 253
263 if (geom == NULL) 254 if (geom == NULL)
264 return false; 255 return false;
265 256
266 char str[MAXLEN_GEOM]; 257 char str[MAXLEN_GEOM];
267 258
268 while (isspace(*geom)) ++geom;
269 if ((p = strchr (geom, ';')) == NULL)
270 p = strchr (geom, '\0'); 259 ops = strchr (geom, ':');
271 260 if (ops == NULL)
261 n = strlen (geom);
262 else
272 n = (p - geom); 263 n = ops - geom;
264
273 if (n < MAXLEN_GEOM) 265 if (n < MAXLEN_GEOM)
274 { 266 {
275 char *ops;
276 new_flags |= geometrySet;
277
278 memcpy (str, geom, n); 267 memcpy (str, geom, n);
279 str[n] = '\0'; 268 str[n] = '\0';
269 rxvt_strtrim (str);
270
280 if (str[0] == ':') 271 if (str[0])
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
296 if (ops > str || ops == NULL)
297 { 272 {
298 /* 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 */
299 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 274 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 */ 275 } /* done parsing geometry string */
356 else if (!(flags & geometrySet)) 276
277 if (!update)
357 { 278 {
358 /* default geometry - scaled and centered */ 279 if (!(geom_flags & XValue))
359 x = y = defaultAlign; 280 x = y = defaultAlign;
281 else if (!(geom_flags & YValue))
282 y = x;
283
284 if (!(geom_flags & (WidthValue|HeightValue)))
360 w = h = defaultScale; 285 w = h = defaultScale;
361 } 286 else if (!(geom_flags & HeightValue))
287 h = w;
288 else if (!(geom_flags & WidthValue))
289 w = h;
362 290
363 if (!(flags & geometrySet))
364 geom_flags |= WidthValue|HeightValue|XValue|YValue; 291 geom_flags |= WidthValue|HeightValue|XValue|YValue;
292 }
365 293
366 if (ops) 294 if (ops)
367 { 295 {
368 while (*ops) 296 while (*ops)
369 { 297 {
… …
416 344
417 while (*ops != ':' && *ops != '\0') ++ops; 345 while (*ops != ':' && *ops != '\0') ++ops;
418 } /* done parsing ops */ 346 } /* done parsing ops */
419 } 347 }
420 348
421 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;
422 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;
423 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;
424 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;
425 } 353 }
426 354
427 if (new_flags != flags) 355 if (new_flags != flags)
428 { 356 {
429 flags = new_flags; 357 flags = new_flags;
430 changed++; 358 changed = true;
431 } 359 }
432 360
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); 361 return changed;
436} 362}
437 363
438void 364void
439bgPixmap_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)
440{ 366{
… …
529 455
530 int x = 0; 456 int x = 0;
531 int y = 0; 457 int y = 0;
532 int w = 0; 458 int w = 0;
533 int h = 0; 459 int h = 0;
534
535 TIMING_TEST_START (asim);
536 460
537 if (original_asim) 461 if (original_asim)
538 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);
539 463
540 if (!original_asim 464 if (!original_asim
… …
657 } 581 }
658 582
659 free (layers); 583 free (layers);
660 } 584 }
661 } 585 }
662 TIMING_TEST_PRINT_RESULT (asim);
663 586
664 bool ret = false; 587 bool ret = false;
665 588
666 if (result) 589 if (result)
667 { 590 {
668 XGCValues gcv; 591 XGCValues gcv;
669 GC gc; 592 GC gc;
670 593
671 if (pixmap)
672 {
673 if (pmap_width != new_pmap_width
674 || pmap_height != new_pmap_height
675 || pmap_depth != target->depth)
676 {
677 XFreePixmap (target->dpy, pixmap);
678 pixmap = None;
679 }
680 }
681
682 /* create Pixmap */ 594 /* create Pixmap */
683 if (pixmap == None) 595 if (pixmap == None
596 || pmap_width != new_pmap_width
597 || pmap_height != new_pmap_height
598 || pmap_depth != target->depth)
684 { 599 {
600 if (pixmap)
601 XFreePixmap (target->dpy, pixmap);
685 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);
686 pmap_width = new_pmap_width; 603 pmap_width = new_pmap_width;
687 pmap_height = new_pmap_height; 604 pmap_height = new_pmap_height;
688 pmap_depth = target->depth; 605 pmap_depth = target->depth;
689 } 606 }
… …
713 630
714 if (result != background && result != original_asim) 631 if (result != background && result != original_asim)
715 destroy_asimage (&result); 632 destroy_asimage (&result);
716 633
717 XFreeGC (target->dpy, gc); 634 XFreeGC (target->dpy, gc);
718 TIMING_TEST_PRINT_RESULT (asim);
719 635
720 ret = true; 636 ret = true;
721 } 637 }
722 638
723 if (background) 639 if (background)
… …
735 return false; 651 return false;
736 652
737 if (!pixbuf) 653 if (!pixbuf)
738 return false; 654 return false;
739 655
740#if !XFT
741 if (background_flags) 656 if (background_flags
657 && !(flags & HAS_RENDER))
742 return false; 658 return false;
743#endif
744 659
745 GdkPixbuf *result; 660 GdkPixbuf *result;
746 661
747 int image_width = gdk_pixbuf_get_width (pixbuf); 662 int image_width = gdk_pixbuf_get_width (pixbuf);
748 int image_height = gdk_pixbuf_get_height (pixbuf); 663 int image_height = gdk_pixbuf_get_height (pixbuf);
… …
799 new_pmap_width = min (image_width, target_width); 714 new_pmap_width = min (image_width, target_width);
800 new_pmap_height = min (image_height, target_height); 715 new_pmap_height = min (image_height, target_height);
801 } 716 }
802 } 717 }
803 718
804 if (pixmap)
805 {
806 if (pmap_width != new_pmap_width
807 || pmap_height != new_pmap_height
808 || pmap_depth != target->depth)
809 {
810 XFreePixmap (target->dpy, pixmap);
811 pixmap = None;
812 }
813 }
814
815 if (pixmap == None) 719 if (pixmap == None
720 || pmap_width != new_pmap_width
721 || pmap_height != new_pmap_height
722 || pmap_depth != target->depth)
816 { 723 {
724 if (pixmap)
725 XFreePixmap (target->dpy, pixmap);
817 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);
818 pmap_width = new_pmap_width; 727 pmap_width = new_pmap_width;
819 pmap_height = new_pmap_height; 728 pmap_height = new_pmap_height;
820 pmap_depth = target->depth; 729 pmap_depth = target->depth;
821 } 730 }
… …
862 dst_width, dst_height, 771 dst_width, dst_height,
863 XLIB_RGB_DITHER_NONE, 772 XLIB_RGB_DITHER_NONE,
864 0, 0); 773 0, 0);
865 } 774 }
866 775
867#if XFT 776#if XRENDER
868 if (background_flags) 777 if (background_flags)
869 { 778 {
870 Display *dpy = target->dpy; 779 Display *dpy = target->dpy;
871 XRenderPictureAttributes pa; 780 XRenderPictureAttributes pa;
872 781
873 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen)); 782 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, target->visual);
874 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 783 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
875 784
876 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); 785 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
877 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa); 786 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
878 787
… …
915# endif /* HAVE_PIXBUF */ 824# endif /* HAVE_PIXBUF */
916 825
917bool 826bool
918bgPixmap_t::set_file (const char *file) 827bgPixmap_t::set_file (const char *file)
919{ 828{
920 assert (file); 829 if (!file || !*file)
830 return false;
921 831
922 if (*file)
923 {
924 if (const char *p = strchr (file, ';')) 832 if (const char *p = strchr (file, ';'))
925 { 833 {
926 size_t len = p - file; 834 size_t len = p - file;
927 char *f = rxvt_temp_buf<char> (len + 1); 835 char *f = rxvt_temp_buf<char> (len + 1);
928 memcpy (f, file, len); 836 memcpy (f, file, len);
929 f[len] = '\0'; 837 f[len] = '\0';
930 file = f; 838 file = f;
931 } 839 }
932 840
933# ifdef HAVE_AFTERIMAGE 841# ifdef HAVE_AFTERIMAGE
934 if (!target->asimman) 842 if (!target->asimman)
935 target->asimman = create_generic_imageman (target->rs[Rs_path]); 843 target->asimman = create_generic_imageman (target->rs[Rs_path]);
936 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 844 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
937 if (image) 845 if (image)
938 { 846 {
939 if (original_asim) 847 if (original_asim)
940 safe_asimage_destroy (original_asim); 848 safe_asimage_destroy (original_asim);
941 original_asim = image; 849 original_asim = image;
942 have_image = true; 850 have_image = true;
943 return true; 851 return true;
944 } 852 }
945# endif 853# endif
946 854
947# ifdef HAVE_PIXBUF 855# ifdef HAVE_PIXBUF
948 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 856 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
949 if (image) 857 if (image)
950 { 858 {
951 if (pixbuf) 859 if (pixbuf)
952 g_object_unref (pixbuf); 860 g_object_unref (pixbuf);
953 pixbuf = image; 861 pixbuf = image;
954 have_image = true; 862 have_image = true;
955 return true; 863 return true;
956 } 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
1118#if XFT 1001#if XRENDER
1119static void 1002static void
1120get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 1003get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1121{ 1004{
1122 double sigma = radius / 2.0; 1005 double sigma = radius / 2.0;
1123 double scale = sqrt (2.0 * M_PI) * sigma; 1006 double scale = sqrt (2.0 * M_PI) * sigma;
… …
1140 1023
1141bool 1024bool
1142bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1025bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1143{ 1026{
1144 bool ret = false; 1027 bool ret = false;
1145#if XFT 1028#if XRENDER
1146 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1029 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1147 double *kernel = (double *)malloc (size * sizeof (double)); 1030 double *kernel = (double *)malloc (size * sizeof (double));
1148 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1031 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1149 1032
1150 Display *dpy = target->dpy; 1033 Display *dpy = target->dpy;
… …
1227 XFreeGC (dpy, gc); 1110 XFreeGC (dpy, gc);
1228 } 1111 }
1229 } 1112 }
1230 else 1113 else
1231 { 1114 {
1232# if XFT 1115# if XRENDER
1233 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1116 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1234 1117
1235 if (flags & tintSet) 1118 if (flags & tintSet)
1236 tint.get (c); 1119 tint.get (c);
1237 1120
… …
1267 1150
1268 if (mask_pic && overlay_pic && back_pic) 1151 if (mask_pic && overlay_pic && back_pic)
1269 { 1152 {
1270 XRenderColor mask_c; 1153 XRenderColor mask_c;
1271 1154
1272 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); 1155 mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0;
1273 mask_c.alpha = 0xffff; 1156 mask_c.alpha = 0xffff;
1274 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1157 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1275 1158
1276 mask_c.alpha = 0; 1159 mask_c.alpha = 0;
1277 mask_c.red = 0xffff - c.r; 1160 mask_c.red = 0xffff - c.r;
… …
1283 } 1166 }
1284 1167
1285 XRenderFreePicture (dpy, mask_pic); 1168 XRenderFreePicture (dpy, mask_pic);
1286 XRenderFreePicture (dpy, overlay_pic); 1169 XRenderFreePicture (dpy, overlay_pic);
1287 XRenderFreePicture (dpy, back_pic); 1170 XRenderFreePicture (dpy, back_pic);
1288# if DO_TIMING_TEST
1289 XSync (dpy, False);
1290# endif
1291# endif 1171# endif
1292 } 1172 }
1293 1173
1294 return ret; 1174 return ret;
1295} 1175}
1296 1176
1297/* make_transparency_pixmap() 1177/* make_transparency_pixmap()
1298 * 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
1299 * 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
1300 * our window. 1180 * our window.
1301 */ 1181 */
1302unsigned long 1182unsigned long
1303bgPixmap_t::make_transparency_pixmap () 1183bgPixmap_t::make_transparency_pixmap ()
1304{ 1184{
… …
1308 return 0; 1188 return 0;
1309 1189
1310 /* 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
1311 * be always up-to-date, so let's use it : 1191 * be always up-to-date, so let's use it :
1312 */ 1192 */
1313 Window root = target->display->root;
1314 int screen = target->display->screen; 1193 int screen = target->display->screen;
1315 Display *dpy = target->dpy; 1194 Display *dpy = target->dpy;
1195 int root_depth = DefaultDepth (dpy, screen);
1316 int root_width = DisplayWidth (dpy, screen); 1196 int root_width = DisplayWidth (dpy, screen);
1317 int root_height = DisplayHeight (dpy, screen); 1197 int root_height = DisplayHeight (dpy, screen);
1318 unsigned int root_pmap_width, root_pmap_height; 1198 unsigned int root_pmap_width, root_pmap_height;
1319 int window_width = target->szHint.width; 1199 int window_width = target->szHint.width;
1320 int window_height = target->szHint.height; 1200 int window_height = target->szHint.height;
1321 int sx, sy; 1201 int sx, sy;
1322 XGCValues gcv; 1202 XGCValues gcv;
1323 GC gc; 1203 GC gc;
1324 1204
1325 TIMING_TEST_START (tp);
1326 target->get_window_origin (sx, sy); 1205 target->get_window_origin (sx, sy);
1327 1206
1328 /* 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 : */
1329 if (sx + window_width <= 0 || sy + window_height <= 0 1208 if (sx + window_width <= 0 || sy + window_height <= 0
1330 || sx >= root_width || sy >= root_height) 1209 || sx >= root_width || sy >= root_height)
1331 return 0; 1210 return 0;
1332 1211
1212 // validate root pixmap and get its size
1333 if (root_pixmap != None) 1213 if (root_pixmap != None)
1334 { 1214 {
1335 /* we want to validate the pixmap and get its size at the same time : */ 1215 Window wdummy;
1336 int junk; 1216 int idummy;
1337 unsigned int ujunk; 1217 unsigned int udummy;
1338 /* root pixmap may be bad - allow a error */ 1218
1339 target->allowedxerror = -1; 1219 target->allowedxerror = -1;
1340 1220
1341 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))
1342 root_pixmap = None; 1222 root_pixmap = None;
1343 1223
1344 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;
1345 } 1257 }
1346 1258
1347 if (root_pixmap == None) 1259 if (root_pixmap == None)
1348 return 0; 1260 return 0;
1349 1261
1350 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);
1351 1263
1352 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1264 if (tiled_root_pmap == None) /* something really bad happened - abort */
1353 return 0; 1265 return 0;
1354 1266
1355 /* straightforward pixmap copy */ 1267 /* straightforward pixmap copy */
1356 gcv.tile = root_pixmap; 1268 gcv.tile = recoded_root_pmap;
1357 gcv.fill_style = FillTiled; 1269 gcv.fill_style = FillTiled;
1358 1270
1359 while (sx < 0) sx += (int)root_width; 1271 while (sx < 0) sx += (int)root_width;
1360 while (sy < 0) sy += (int)root_height; 1272 while (sy < 0) sy += (int)root_height;
1361 1273
1362 gcv.ts_x_origin = -sx; 1274 gcv.ts_x_origin = -sx;
1363 gcv.ts_y_origin = -sy; 1275 gcv.ts_y_origin = -sy;
1364 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1276 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1365 1277
1366 if (gc) 1278 if (gc)
1367 { 1279 {
1368 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);
1369 result |= transpPmapTiled; 1281 result |= transpPmapTiled;
1370 XFreeGC (dpy, gc); 1282 XFreeGC (dpy, gc);
1371 }
1372 TIMING_TEST_PRINT_RESULT (tp);
1373 1283
1374 if (tiled_root_pmap != None)
1375 {
1376 if (!need_client_side_rendering ()) 1284 if (!need_client_side_rendering ())
1377 { 1285 {
1378 if (flags & (blurNeeded | blurServerSide)) 1286 if ((flags & blurNeeded)
1287 && (flags & HAS_RENDER_CONV))
1379 { 1288 {
1380 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height)) 1289 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1381 result |= transpPmapBlurred; 1290 result |= transpPmapBlurred;
1382 } 1291 }
1383 if (flags & (tintNeeded | tintServerSide)) 1292 if ((flags & tintNeeded)
1293 && (flags & (tintWholesome | HAS_RENDER)))
1384 { 1294 {
1385 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height)) 1295 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1386 result |= transpPmapTinted; 1296 result |= transpPmapTinted;
1387 } 1297 }
1388 } /* server side rendering completed */ 1298 } /* server side rendering completed */
1389 1299
1390 if (pixmap) 1300 if (pixmap)
1391 XFreePixmap (dpy, pixmap); 1301 XFreePixmap (dpy, pixmap);
1392 1302
1393 pixmap = tiled_root_pmap; 1303 pixmap = tiled_root_pmap;
1394 pmap_width = window_width; 1304 pmap_width = window_width;
1395 pmap_height = window_height; 1305 pmap_height = window_height;
1396 pmap_depth = root_depth; 1306 pmap_depth = target->depth;
1397 } 1307 }
1308 else
1309 XFreePixmap (dpy, tiled_root_pmap);
1398 1310
1399 TIMING_TEST_PRINT_RESULT (tp); 1311 if (recoded_root_pmap != root_pixmap)
1312 XFreePixmap (dpy, recoded_root_pmap);
1400 1313
1401 return result; 1314 return result;
1402} 1315}
1403 1316
1404bool 1317void
1405bgPixmap_t::set_root_pixmap () 1318bgPixmap_t::set_root_pixmap ()
1406{ 1319{
1407 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1320 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1408 if (new_root_pixmap == None) 1321 if (new_root_pixmap == None)
1409 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1322 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1410 1323
1411 if (new_root_pixmap != root_pixmap)
1412 {
1413 root_pixmap = new_root_pixmap; 1324 root_pixmap = new_root_pixmap;
1414 return true;
1415 }
1416
1417 return false;
1418} 1325}
1419# endif /* ENABLE_TRANSPARENCY */ 1326# endif /* ENABLE_TRANSPARENCY */
1420 1327
1421# ifndef HAVE_AFTERIMAGE 1328#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1422static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm); 1329static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c);
1423# endif 1330# endif
1424 1331
1425bool 1332bool
1426bgPixmap_t::render () 1333bgPixmap_t::render ()
1427{ 1334{
1428 unsigned long background_flags = 0; 1335 unsigned long background_flags = 0;
1429 1336
1430 if (target == NULL) 1337 if (target == NULL)
1431 return false; 1338 return false;
1432
1433 TIMING_TEST_START (tp);
1434 1339
1435 invalidate (); 1340 invalidate ();
1436# ifdef ENABLE_TRANSPARENCY 1341# ifdef ENABLE_TRANSPARENCY
1437 if (flags & isTransparent) 1342 if (flags & isTransparent)
1438 { 1343 {
1439 /* we need to re-generate transparency pixmap in that case ! */ 1344 /* we need to re-generate transparency pixmap in that case ! */
1440 background_flags = make_transparency_pixmap (); 1345 background_flags = make_transparency_pixmap ();
1441 if (background_flags == 0) 1346 if (background_flags == 0)
1442 return false; 1347 return false;
1443 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1348 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1444 && pmap_depth == target->depth)
1445 flags = flags & ~isInvalid; 1349 flags = flags & ~isInvalid;
1446 } 1350 }
1447# endif 1351# endif
1448 1352
1449# ifdef BG_IMAGE_FROM_FILE 1353# ifdef BG_IMAGE_FROM_FILE
… …
1453 if (render_image (background_flags)) 1357 if (render_image (background_flags))
1454 flags = flags & ~isInvalid; 1358 flags = flags & ~isInvalid;
1455 } 1359 }
1456# endif 1360# endif
1457 1361
1362# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1458 XImage *result = NULL; 1363 XImage *result = NULL;
1459 1364
1460 if (background_flags && (flags & isInvalid)) 1365 if (background_flags && (flags & isInvalid))
1461 { 1366 {
1462 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);
1463 } 1368 }
1464 1369
1465 if (result) 1370 if (result)
1466 { 1371 {
1467# if !defined(HAVE_AFTERIMAGE) && !XFT
1468 /* our own client-side tinting */ 1372 /* our own client-side tinting */
1469 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1470 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1471 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1373 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1472 { 1374 {
1473 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1375 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1474 if (flags & tintSet) 1376 if (flags & tintSet)
1475 tint.get (c); 1377 tint.get (c);
1476 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b); 1378 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1477 } 1379 }
1478# endif
1479 1380
1480 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1381 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1481 1382
1482 if (gc) 1383 if (gc)
1483 { 1384 {
1484 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1485 {
1486 XFreePixmap (target->dpy, pixmap);
1487 pixmap = None;
1488 }
1489
1490 if (pixmap == None)
1491 {
1492 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1493 pmap_width = result->width;
1494 pmap_height = result->height;
1495 pmap_depth = target->depth;
1496 }
1497
1498 if (pmap_depth != result->depth)
1499 {
1500 /* Bad Match error will ensue ! stupid X !!!! */
1501 if (result->depth == 24 && pmap_depth == 32)
1502 result->depth = 32;
1503 else if (result->depth == 32 && pmap_depth == 24)
1504 result->depth = 24;
1505 else
1506 {
1507 /* TODO: implement image recoding */
1508 }
1509 }
1510
1511 if (pmap_depth == result->depth)
1512 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);
1513 1386
1514 XFreeGC (target->dpy, gc); 1387 XFreeGC (target->dpy, gc);
1515 flags = flags & ~isInvalid; 1388 flags = flags & ~isInvalid;
1516 } 1389 }
1517 1390
1518 XDestroyImage (result); 1391 XDestroyImage (result);
1519 } 1392 }
1393# endif
1520 1394
1521 if (flags & isInvalid) 1395 if (flags & isInvalid)
1522 { 1396 {
1523 if (pixmap != None) 1397 if (pixmap != None)
1524 { 1398 {
… …
1527 } 1401 }
1528 } 1402 }
1529 1403
1530 apply (); 1404 apply ();
1531 1405
1532 XSync (target->dpy, False);
1533 valid_since = ev::now (); 1406 valid_since = ev::now ();
1534 1407
1535 TIMING_TEST_PRINT_RESULT (tp);
1536
1537 return true; 1408 return true;
1538} 1409}
1539 1410
1540bool 1411void
1541bgPixmap_t::set_target (rxvt_term *new_target) 1412bgPixmap_t::set_target (rxvt_term *new_target)
1542{ 1413{
1543 if (new_target)
1544 if (target != new_target)
1545 {
1546 target = new_target; 1414 target = new_target;
1547# ifdef ENABLE_TRANSPARENCY 1415
1548 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 }
1549# endif 1430#endif
1550 return true;
1551 }
1552
1553 return false;
1554} 1431}
1555 1432
1556void 1433void
1557bgPixmap_t::apply () 1434bgPixmap_t::apply ()
1558{ 1435{
1559 if (target) 1436 if (target == NULL)
1560 { 1437 return;
1561 flags &= ~isVtOrigin;
1562 1438
1563 if (pixmap != None) 1439 if (pixmap != None)
1564 { 1440 {
1565 /* set target's background to pixmap */ 1441 /* set target's background to pixmap */
1566# ifdef ENABLE_TRANSPARENCY 1442# ifdef ENABLE_TRANSPARENCY
1567 if (flags & isTransparent) 1443 if (flags & isTransparent)
1568 { 1444 {
1569 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1445 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1570 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1446 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1571 1447
1572 if (target->scrollBar.win) 1448 if (target->scrollBar.win)
1573 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1449 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1574 } 1450 }
1575 else 1451 else
1576# endif 1452# endif
1577 { 1453 {
1578 flags |= isVtOrigin;
1579 /* force old pixmap dereference in case it was transparent before :*/ 1454 /* force old pixmap dereference in case it was transparent before :*/
1580 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1581 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1582 /* do we also need to set scrollbar's background here ? */
1583
1584 if (target->scrollBar.win)
1585 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1586 }
1587 }
1588 else
1589 {
1590 /* set target background to a pixel */
1591 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1455 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1592 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1456 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1593 /* do we also need to set scrollbar's background here ? */ 1457 /* do we also need to set scrollbar's background here ? */
1458
1594 if (target->scrollBar.win) 1459 if (target->scrollBar.win)
1595 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1460 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1596 } 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 }
1597 1472
1598 /* 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
1599 scr_touch or we get a great deal of flicker otherwise: */ 1474 scr_touch or we get a great deal of flicker otherwise: */
1600 XClearWindow (target->dpy, target->parent[0]); 1475 XClearWindow (target->dpy, target->parent[0]);
1601 1476
1602 if (target->scrollBar.state && target->scrollBar.win) 1477 if (target->scrollBar.state && target->scrollBar.win)
1603 { 1478 {
1604 target->scrollBar.state = STATE_IDLE; 1479 target->scrollBar.state = STATE_IDLE;
1605 target->scrollBar.show (0); 1480 target->scrollBar.show (0);
1606 } 1481 }
1607 1482
1608 target->want_refresh = 1; 1483 target->want_refresh = 1;
1609 flags |= hasChanged; 1484 flags |= hasChanged;
1610 }
1611} 1485}
1612 1486
1613#endif /* HAVE_BG_PIXMAP */ 1487#endif /* HAVE_BG_PIXMAP */
1614 1488
1615#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1489#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1616/* taken from aterm-0.4.2 */ 1490/* taken from aterm-0.4.2 */
1617 1491
1618typedef uint32_t RUINT32T;
1619
1620static void 1492static void
1621ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm) 1493ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c)
1622{ 1494{
1623 int sh_r, sh_g, sh_b; 1495 int sh_r, sh_g, sh_b;
1624 RUINT32T mask_r, mask_g, mask_b; 1496 uint32_t mask_r, mask_g, mask_b;
1625 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1497 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1626 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1498 rgba low;
1627 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1499 rgba high;
1628 int i; 1500 int i;
1629 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; 1501 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1630 1502
1631 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; 1503 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1632 1504
… …
1641 case 15: 1513 case 15:
1642 if ((mask_r != 0x7c00) || 1514 if ((mask_r != 0x7c00) ||
1643 (mask_g != 0x03e0) || 1515 (mask_g != 0x03e0) ||
1644 (mask_b != 0x001f)) 1516 (mask_b != 0x001f))
1645 return; 1517 return;
1646 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1518 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32));
1647 lookup_r = lookup; 1519 lookup_r = lookup;
1648 lookup_g = lookup+32; 1520 lookup_g = lookup+32;
1649 lookup_b = lookup+32+32; 1521 lookup_b = lookup+32+32;
1650 sh_r = 10; 1522 sh_r = 10;
1651 sh_g = 5; 1523 sh_g = 5;
… …
1654 case 16: 1526 case 16:
1655 if ((mask_r != 0xf800) || 1527 if ((mask_r != 0xf800) ||
1656 (mask_g != 0x07e0) || 1528 (mask_g != 0x07e0) ||
1657 (mask_b != 0x001f)) 1529 (mask_b != 0x001f))
1658 return; 1530 return;
1659 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1531 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1660 lookup_r = lookup; 1532 lookup_r = lookup;
1661 lookup_g = lookup+32; 1533 lookup_g = lookup+32;
1662 lookup_b = lookup+32+64; 1534 lookup_b = lookup+32+64;
1663 sh_r = 11; 1535 sh_r = 11;
1664 sh_g = 5; 1536 sh_g = 5;
… …
1667 case 24: 1539 case 24:
1668 if ((mask_r != 0xff0000) || 1540 if ((mask_r != 0xff0000) ||
1669 (mask_g != 0x00ff00) || 1541 (mask_g != 0x00ff00) ||
1670 (mask_b != 0x0000ff)) 1542 (mask_b != 0x0000ff))
1671 return; 1543 return;
1672 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1544 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1673 lookup_r = lookup; 1545 lookup_r = lookup;
1674 lookup_g = lookup+256; 1546 lookup_g = lookup+256;
1675 lookup_b = lookup+256+256; 1547 lookup_b = lookup+256+256;
1676 sh_r = 16; 1548 sh_r = 16;
1677 sh_g = 8; 1549 sh_g = 8;
… …
1680 case 32: 1552 case 32:
1681 if ((mask_r != 0xff0000) || 1553 if ((mask_r != 0xff0000) ||
1682 (mask_g != 0x00ff00) || 1554 (mask_g != 0x00ff00) ||
1683 (mask_b != 0x0000ff)) 1555 (mask_b != 0x0000ff))
1684 return; 1556 return;
1685 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1557 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1686 lookup_r = lookup; 1558 lookup_r = lookup;
1687 lookup_g = lookup+256; 1559 lookup_g = lookup+256;
1688 lookup_b = lookup+256+256; 1560 lookup_b = lookup+256+256;
1689 sh_r = 16; 1561 sh_r = 16;
1690 sh_g = 8; 1562 sh_g = 8;
… …
1697 /* prepare limits for color transformation (each channel is handled separately) */ 1569 /* prepare limits for color transformation (each channel is handled separately) */
1698 if (shade > 100) 1570 if (shade > 100)
1699 { 1571 {
1700 shade = 200 - shade; 1572 shade = 200 - shade;
1701 1573
1702 lower_lim_r = 65535-rm; 1574 high.r = (65535 - c.r) * shade / 100;
1703 lower_lim_g = 65535-gm; 1575 high.g = (65535 - c.g) * shade / 100;
1704 lower_lim_b = 65535-bm; 1576 high.b = (65535 - c.b) * shade / 100;
1705 1577
1706 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1578 low.r = 65535 - high.r;
1707 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1579 low.g = 65535 - high.g;
1708 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1580 low.b = 65535 - high.b;
1709
1710 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1711 } 1581 }
1712 else 1582 else
1713 { 1583 {
1584 high.r = c.r * shade / 100;
1585 high.g = c.g * shade / 100;
1586 high.b = c.b * shade / 100;
1714 1587
1715 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1588 low.r = low.g = low.b = 0;
1716
1717 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1718 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1719 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1720 } 1589 }
1721 1590
1722 /* fill our lookup tables */ 1591 /* fill our lookup tables */
1723 for (i = 0; i <= mask_r>>sh_r; i++) 1592 for (i = 0; i <= mask_r>>sh_r; i++)
1724 { 1593 {
1725 RUINT32T tmp; 1594 uint32_t tmp;
1726 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1595 tmp = i * high.r;
1727 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1596 tmp += (mask_r>>sh_r) * low.r;
1728 lookup_r[i] = (tmp/65535)<<sh_r; 1597 lookup_r[i] = (tmp/65535)<<sh_r;
1729 } 1598 }
1730 for (i = 0; i <= mask_g>>sh_g; i++) 1599 for (i = 0; i <= mask_g>>sh_g; i++)
1731 { 1600 {
1732 RUINT32T tmp; 1601 uint32_t tmp;
1733 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1602 tmp = i * high.g;
1734 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1603 tmp += (mask_g>>sh_g) * low.g;
1735 lookup_g[i] = (tmp/65535)<<sh_g; 1604 lookup_g[i] = (tmp/65535)<<sh_g;
1736 } 1605 }
1737 for (i = 0; i <= mask_b>>sh_b; i++) 1606 for (i = 0; i <= mask_b>>sh_b; i++)
1738 { 1607 {
1739 RUINT32T tmp; 1608 uint32_t tmp;
1740 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1609 tmp = i * high.b;
1741 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1610 tmp += (mask_b>>sh_b) * low.b;
1742 lookup_b[i] = (tmp/65535)<<sh_b; 1611 lookup_b[i] = (tmp/65535)<<sh_b;
1743 } 1612 }
1744 1613
1745 /* apply table to input image (replacing colors by newly calculated ones) */ 1614 /* apply table to input image (replacing colors by newly calculated ones) */
1746 if (srcImage->bits_per_pixel == 32 1615 if (srcImage->bits_per_pixel == 32
1747 && (srcImage->depth == 24 || srcImage->depth == 32) 1616 && (srcImage->depth == 24 || srcImage->depth == 32)
1748 && srcImage->byte_order == host_byte_order) 1617 && srcImage->byte_order == host_byte_order)
1749 { 1618 {
1750 RUINT32T *p1, *pf, *p, *pl; 1619 uint32_t *p1, *pf, *p, *pl;
1751 p1 = (RUINT32T *) srcImage->data; 1620 p1 = (uint32_t *) srcImage->data;
1752 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1621 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1753 1622
1754 while (p1 < pf) 1623 while (p1 < pf)
1755 { 1624 {
1756 p = p1; 1625 p = p1;
1757 pl = p1 + srcImage->width; 1626 pl = p1 + srcImage->width;
… …
1760 *p = lookup_r[(*p & 0xff0000) >> 16] | 1629 *p = lookup_r[(*p & 0xff0000) >> 16] |
1761 lookup_g[(*p & 0x00ff00) >> 8] | 1630 lookup_g[(*p & 0x00ff00) >> 8] |
1762 lookup_b[(*p & 0x0000ff)] | 1631 lookup_b[(*p & 0x0000ff)] |
1763 (*p & 0xff000000); 1632 (*p & 0xff000000);
1764 } 1633 }
1765 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line); 1634 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line);
1766 } 1635 }
1767 } 1636 }
1768 else 1637 else
1769 { 1638 {
1770 for (int y = 0; y < srcImage->height; y++) 1639 for (int y = 0; y < srcImage->height; y++)

Diff Legend

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