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.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{
… …
663 if (result) 589 if (result)
664 { 590 {
665 XGCValues gcv; 591 XGCValues gcv;
666 GC gc; 592 GC gc;
667 593
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 */ 594 /* create Pixmap */
680 if (pixmap == None) 595 if (pixmap == None
596 || pmap_width != new_pmap_width
597 || pmap_height != new_pmap_height
598 || pmap_depth != target->depth)
681 { 599 {
600 if (pixmap)
601 XFreePixmap (target->dpy, pixmap);
682 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);
683 pmap_width = new_pmap_width; 603 pmap_width = new_pmap_width;
684 pmap_height = new_pmap_height; 604 pmap_height = new_pmap_height;
685 pmap_depth = target->depth; 605 pmap_depth = target->depth;
686 } 606 }
… …
731 return false; 651 return false;
732 652
733 if (!pixbuf) 653 if (!pixbuf)
734 return false; 654 return false;
735 655
736#if !XFT
737 if (background_flags) 656 if (background_flags
657 && !(flags & HAS_RENDER))
738 return false; 658 return false;
739#endif
740 659
741 GdkPixbuf *result; 660 GdkPixbuf *result;
742 661
743 int image_width = gdk_pixbuf_get_width (pixbuf); 662 int image_width = gdk_pixbuf_get_width (pixbuf);
744 int image_height = gdk_pixbuf_get_height (pixbuf); 663 int image_height = gdk_pixbuf_get_height (pixbuf);
… …
795 new_pmap_width = min (image_width, target_width); 714 new_pmap_width = min (image_width, target_width);
796 new_pmap_height = min (image_height, target_height); 715 new_pmap_height = min (image_height, target_height);
797 } 716 }
798 } 717 }
799 718
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) 719 if (pixmap == None
720 || pmap_width != new_pmap_width
721 || pmap_height != new_pmap_height
722 || pmap_depth != target->depth)
812 { 723 {
724 if (pixmap)
725 XFreePixmap (target->dpy, pixmap);
813 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);
814 pmap_width = new_pmap_width; 727 pmap_width = new_pmap_width;
815 pmap_height = new_pmap_height; 728 pmap_height = new_pmap_height;
816 pmap_depth = target->depth; 729 pmap_depth = target->depth;
817 } 730 }
… …
858 dst_width, dst_height, 771 dst_width, dst_height,
859 XLIB_RGB_DITHER_NONE, 772 XLIB_RGB_DITHER_NONE,
860 0, 0); 773 0, 0);
861 } 774 }
862 775
863#if XFT 776#if XRENDER
864 if (background_flags) 777 if (background_flags)
865 { 778 {
866 Display *dpy = target->dpy; 779 Display *dpy = target->dpy;
867 XRenderPictureAttributes pa; 780 XRenderPictureAttributes pa;
868 781
869 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen)); 782 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, target->visual);
870 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 783 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
871 784
872 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); 785 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
873 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa); 786 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
874 787
… …
911# endif /* HAVE_PIXBUF */ 824# endif /* HAVE_PIXBUF */
912 825
913bool 826bool
914bgPixmap_t::set_file (const char *file) 827bgPixmap_t::set_file (const char *file)
915{ 828{
916 assert (file); 829 if (!file || !*file)
830 return false;
917 831
918 if (*file)
919 {
920 if (const char *p = strchr (file, ';')) 832 if (const char *p = strchr (file, ';'))
921 { 833 {
922 size_t len = p - file; 834 size_t len = p - file;
923 char *f = rxvt_temp_buf<char> (len + 1); 835 char *f = rxvt_temp_buf<char> (len + 1);
924 memcpy (f, file, len); 836 memcpy (f, file, len);
925 f[len] = '\0'; 837 f[len] = '\0';
926 file = f; 838 file = f;
927 } 839 }
928 840
929# ifdef HAVE_AFTERIMAGE 841# ifdef HAVE_AFTERIMAGE
930 if (!target->asimman) 842 if (!target->asimman)
931 target->asimman = create_generic_imageman (target->rs[Rs_path]); 843 target->asimman = create_generic_imageman (target->rs[Rs_path]);
932 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 844 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
933 if (image) 845 if (image)
934 { 846 {
935 if (original_asim) 847 if (original_asim)
936 safe_asimage_destroy (original_asim); 848 safe_asimage_destroy (original_asim);
937 original_asim = image; 849 original_asim = image;
938 have_image = true; 850 have_image = true;
939 return true; 851 return true;
940 } 852 }
941# endif 853# endif
942 854
943# ifdef HAVE_PIXBUF 855# ifdef HAVE_PIXBUF
944 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 856 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
945 if (image) 857 if (image)
946 { 858 {
947 if (pixbuf) 859 if (pixbuf)
948 g_object_unref (pixbuf); 860 g_object_unref (pixbuf);
949 pixbuf = image; 861 pixbuf = image;
950 have_image = true; 862 have_image = true;
951 return true; 863 return true;
952 } 864 }
953# endif 865# endif
954 }
955 866
956 return false; 867 return false;
957} 868}
958 869
959# endif /* BG_IMAGE_FROM_FILE */ 870# endif /* BG_IMAGE_FROM_FILE */
… …
972} 883}
973 884
974bool 885bool
975bgPixmap_t::set_blur_radius (const char *geom) 886bgPixmap_t::set_blur_radius (const char *geom)
976{ 887{
977 int changed = 0; 888 bool changed = false;
978 unsigned int hr, vr; 889 unsigned int hr, vr;
979 int junk; 890 int junk;
980 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 891 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
981 892
982 if (!(geom_flags & WidthValue)) 893 if (!(geom_flags & WidthValue))
… …
987 min_it (hr, 128); 898 min_it (hr, 128);
988 min_it (vr, 128); 899 min_it (vr, 128);
989 900
990 if (h_blurRadius != hr) 901 if (h_blurRadius != hr)
991 { 902 {
992 ++changed; 903 changed = true;
993 h_blurRadius = hr; 904 h_blurRadius = hr;
994 } 905 }
995 906
996 if (v_blurRadius != vr) 907 if (v_blurRadius != vr)
997 { 908 {
998 ++changed; 909 changed = true;
999 v_blurRadius = vr; 910 v_blurRadius = vr;
1000 } 911 }
1001 912
1002 if (v_blurRadius == 0 && h_blurRadius == 0) 913 if (v_blurRadius == 0 && h_blurRadius == 0)
1003 flags &= ~blurNeeded; 914 flags &= ~blurNeeded;
1004 else 915 else
1005 flags |= blurNeeded; 916 flags |= blurNeeded;
1006 917
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); 918 return changed;
1020} 919}
1021 920
1022static inline unsigned long 921static inline unsigned long
1023compute_tint_shade_flags (rxvt_color *tint, int shade) 922compute_tint_shade_flags (rxvt_color *tint, int shade)
1024{ 923{
… …
1046 { 945 {
1047 flags |= bgPixmap_t::tintNeeded; 946 flags |= bgPixmap_t::tintNeeded;
1048 } 947 }
1049 } 948 }
1050 949
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
1063 return flags; 950 return flags;
1064} 951}
1065 952
1066bool 953bool
1067bgPixmap_t::set_tint (rxvt_color &new_tint) 954bgPixmap_t::set_tint (rxvt_color &new_tint)
… …
1109 } 996 }
1110 997
1111 return false; 998 return false;
1112} 999}
1113 1000
1114#if XFT 1001#if XRENDER
1115static void 1002static void
1116get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 1003get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1117{ 1004{
1118 double sigma = radius / 2.0; 1005 double sigma = radius / 2.0;
1119 double scale = sqrt (2.0 * M_PI) * sigma; 1006 double scale = sqrt (2.0 * M_PI) * sigma;
… …
1136 1023
1137bool 1024bool
1138bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1025bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1139{ 1026{
1140 bool ret = false; 1027 bool ret = false;
1141#if XFT 1028#if XRENDER
1142 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1029 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1143 double *kernel = (double *)malloc (size * sizeof (double)); 1030 double *kernel = (double *)malloc (size * sizeof (double));
1144 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1031 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1145 1032
1146 Display *dpy = target->dpy; 1033 Display *dpy = target->dpy;
… …
1223 XFreeGC (dpy, gc); 1110 XFreeGC (dpy, gc);
1224 } 1111 }
1225 } 1112 }
1226 else 1113 else
1227 { 1114 {
1228# if XFT 1115# if XRENDER
1229 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1116 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1230 1117
1231 if (flags & tintSet) 1118 if (flags & tintSet)
1232 tint.get (c); 1119 tint.get (c);
1233 1120
… …
1263 1150
1264 if (mask_pic && overlay_pic && back_pic) 1151 if (mask_pic && overlay_pic && back_pic)
1265 { 1152 {
1266 XRenderColor mask_c; 1153 XRenderColor mask_c;
1267 1154
1268 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); 1155 mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0;
1269 mask_c.alpha = 0xffff; 1156 mask_c.alpha = 0xffff;
1270 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1157 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1271 1158
1272 mask_c.alpha = 0; 1159 mask_c.alpha = 0;
1273 mask_c.red = 0xffff - c.r; 1160 mask_c.red = 0xffff - c.r;
… …
1286 1173
1287 return ret; 1174 return ret;
1288} 1175}
1289 1176
1290/* make_transparency_pixmap() 1177/* make_transparency_pixmap()
1291 * 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
1292 * 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
1293 * our window. 1180 * our window.
1294 */ 1181 */
1295unsigned long 1182unsigned long
1296bgPixmap_t::make_transparency_pixmap () 1183bgPixmap_t::make_transparency_pixmap ()
1297{ 1184{
… …
1301 return 0; 1188 return 0;
1302 1189
1303 /* 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
1304 * be always up-to-date, so let's use it : 1191 * be always up-to-date, so let's use it :
1305 */ 1192 */
1306 Window root = target->display->root;
1307 int screen = target->display->screen; 1193 int screen = target->display->screen;
1308 Display *dpy = target->dpy; 1194 Display *dpy = target->dpy;
1195 int root_depth = DefaultDepth (dpy, screen);
1309 int root_width = DisplayWidth (dpy, screen); 1196 int root_width = DisplayWidth (dpy, screen);
1310 int root_height = DisplayHeight (dpy, screen); 1197 int root_height = DisplayHeight (dpy, screen);
1311 unsigned int root_pmap_width, root_pmap_height; 1198 unsigned int root_pmap_width, root_pmap_height;
1312 int window_width = target->szHint.width; 1199 int window_width = target->szHint.width;
1313 int window_height = target->szHint.height; 1200 int window_height = target->szHint.height;
… …
1320 /* 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 : */
1321 if (sx + window_width <= 0 || sy + window_height <= 0 1208 if (sx + window_width <= 0 || sy + window_height <= 0
1322 || sx >= root_width || sy >= root_height) 1209 || sx >= root_width || sy >= root_height)
1323 return 0; 1210 return 0;
1324 1211
1212 // validate root pixmap and get its size
1325 if (root_pixmap != None) 1213 if (root_pixmap != None)
1326 { 1214 {
1327 /* we want to validate the pixmap and get its size at the same time : */ 1215 Window wdummy;
1328 int junk; 1216 int idummy;
1329 unsigned int ujunk; 1217 unsigned int udummy;
1330 /* root pixmap may be bad - allow a error */ 1218
1331 target->allowedxerror = -1; 1219 target->allowedxerror = -1;
1332 1220
1333 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))
1334 root_pixmap = None; 1222 root_pixmap = None;
1335 1223
1336 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;
1337 } 1257 }
1338 1258
1339 if (root_pixmap == None) 1259 if (root_pixmap == None)
1340 return 0; 1260 return 0;
1341 1261
1342 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);
1343 1263
1344 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1264 if (tiled_root_pmap == None) /* something really bad happened - abort */
1345 return 0; 1265 return 0;
1346 1266
1347 /* straightforward pixmap copy */ 1267 /* straightforward pixmap copy */
1348 gcv.tile = root_pixmap; 1268 gcv.tile = recoded_root_pmap;
1349 gcv.fill_style = FillTiled; 1269 gcv.fill_style = FillTiled;
1350 1270
1351 while (sx < 0) sx += (int)root_width; 1271 while (sx < 0) sx += (int)root_width;
1352 while (sy < 0) sy += (int)root_height; 1272 while (sy < 0) sy += (int)root_height;
1353 1273
1354 gcv.ts_x_origin = -sx; 1274 gcv.ts_x_origin = -sx;
1355 gcv.ts_y_origin = -sy; 1275 gcv.ts_y_origin = -sy;
1356 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1276 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1357 1277
1358 if (gc) 1278 if (gc)
1359 { 1279 {
1360 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);
1361 result |= transpPmapTiled; 1281 result |= transpPmapTiled;
1362 XFreeGC (dpy, gc); 1282 XFreeGC (dpy, gc);
1363 }
1364 1283
1365 if (tiled_root_pmap != None)
1366 {
1367 if (!need_client_side_rendering ()) 1284 if (!need_client_side_rendering ())
1368 { 1285 {
1369 if (flags & (blurNeeded | blurServerSide)) 1286 if ((flags & blurNeeded)
1287 && (flags & HAS_RENDER_CONV))
1370 { 1288 {
1371 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))
1372 result |= transpPmapBlurred; 1290 result |= transpPmapBlurred;
1373 } 1291 }
1374 if (flags & (tintNeeded | tintServerSide)) 1292 if ((flags & tintNeeded)
1293 && (flags & (tintWholesome | HAS_RENDER)))
1375 { 1294 {
1376 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))
1377 result |= transpPmapTinted; 1296 result |= transpPmapTinted;
1378 } 1297 }
1379 } /* server side rendering completed */ 1298 } /* server side rendering completed */
1380 1299
1381 if (pixmap) 1300 if (pixmap)
1382 XFreePixmap (dpy, pixmap); 1301 XFreePixmap (dpy, pixmap);
1383 1302
1384 pixmap = tiled_root_pmap; 1303 pixmap = tiled_root_pmap;
1385 pmap_width = window_width; 1304 pmap_width = window_width;
1386 pmap_height = window_height; 1305 pmap_height = window_height;
1387 pmap_depth = root_depth; 1306 pmap_depth = target->depth;
1388 } 1307 }
1308 else
1309 XFreePixmap (dpy, tiled_root_pmap);
1310
1311 if (recoded_root_pmap != root_pixmap)
1312 XFreePixmap (dpy, recoded_root_pmap);
1389 1313
1390 return result; 1314 return result;
1391} 1315}
1392 1316
1393bool 1317void
1394bgPixmap_t::set_root_pixmap () 1318bgPixmap_t::set_root_pixmap ()
1395{ 1319{
1396 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1320 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1397 if (new_root_pixmap == None) 1321 if (new_root_pixmap == None)
1398 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1322 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1399 1323
1400 if (new_root_pixmap != root_pixmap)
1401 {
1402 root_pixmap = new_root_pixmap; 1324 root_pixmap = new_root_pixmap;
1403 return true;
1404 }
1405
1406 return false;
1407} 1325}
1408# endif /* ENABLE_TRANSPARENCY */ 1326# endif /* ENABLE_TRANSPARENCY */
1409 1327
1410# ifndef HAVE_AFTERIMAGE 1328#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1411static 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);
1412# endif 1330# endif
1413 1331
1414bool 1332bool
1415bgPixmap_t::render () 1333bgPixmap_t::render ()
1416{ 1334{
… …
1425 { 1343 {
1426 /* we need to re-generate transparency pixmap in that case ! */ 1344 /* we need to re-generate transparency pixmap in that case ! */
1427 background_flags = make_transparency_pixmap (); 1345 background_flags = make_transparency_pixmap ();
1428 if (background_flags == 0) 1346 if (background_flags == 0)
1429 return false; 1347 return false;
1430 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1348 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1431 && pmap_depth == target->depth)
1432 flags = flags & ~isInvalid; 1349 flags = flags & ~isInvalid;
1433 } 1350 }
1434# endif 1351# endif
1435 1352
1436# ifdef BG_IMAGE_FROM_FILE 1353# ifdef BG_IMAGE_FROM_FILE
… …
1440 if (render_image (background_flags)) 1357 if (render_image (background_flags))
1441 flags = flags & ~isInvalid; 1358 flags = flags & ~isInvalid;
1442 } 1359 }
1443# endif 1360# endif
1444 1361
1362# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1445 XImage *result = NULL; 1363 XImage *result = NULL;
1446 1364
1447 if (background_flags && (flags & isInvalid)) 1365 if (background_flags && (flags & isInvalid))
1448 { 1366 {
1449 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);
1450 } 1368 }
1451 1369
1452 if (result) 1370 if (result)
1453 { 1371 {
1454# if !defined(HAVE_AFTERIMAGE) && !XFT
1455 /* our own client-side tinting */ 1372 /* 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)) 1373 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1459 { 1374 {
1460 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1375 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1461 if (flags & tintSet) 1376 if (flags & tintSet)
1462 tint.get (c); 1377 tint.get (c);
1463 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);
1464 } 1379 }
1465# endif
1466 1380
1467 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1381 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1468 1382
1469 if (gc) 1383 if (gc)
1470 { 1384 {
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); 1385 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1500 1386
1501 XFreeGC (target->dpy, gc); 1387 XFreeGC (target->dpy, gc);
1502 flags = flags & ~isInvalid; 1388 flags = flags & ~isInvalid;
1503 } 1389 }
1504 1390
1505 XDestroyImage (result); 1391 XDestroyImage (result);
1506 } 1392 }
1393# endif
1507 1394
1508 if (flags & isInvalid) 1395 if (flags & isInvalid)
1509 { 1396 {
1510 if (pixmap != None) 1397 if (pixmap != None)
1511 { 1398 {
… …
1519 valid_since = ev::now (); 1406 valid_since = ev::now ();
1520 1407
1521 return true; 1408 return true;
1522} 1409}
1523 1410
1524bool 1411void
1525bgPixmap_t::set_target (rxvt_term *new_target) 1412bgPixmap_t::set_target (rxvt_term *new_target)
1526{ 1413{
1527 if (new_target)
1528 if (target != new_target)
1529 {
1530 target = new_target; 1414 target = new_target;
1531# ifdef ENABLE_TRANSPARENCY 1415
1532 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 }
1533# endif 1430#endif
1534 return true;
1535 }
1536
1537 return false;
1538} 1431}
1539 1432
1540void 1433void
1541bgPixmap_t::apply () 1434bgPixmap_t::apply ()
1542{ 1435{
1543 if (target) 1436 if (target == NULL)
1544 { 1437 return;
1545 flags &= ~isVtOrigin;
1546 1438
1547 if (pixmap != None) 1439 if (pixmap != None)
1548 { 1440 {
1549 /* set target's background to pixmap */ 1441 /* set target's background to pixmap */
1550# ifdef ENABLE_TRANSPARENCY 1442# ifdef ENABLE_TRANSPARENCY
1551 if (flags & isTransparent) 1443 if (flags & isTransparent)
1552 { 1444 {
1553 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1445 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1554 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1446 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1555 1447
1556 if (target->scrollBar.win) 1448 if (target->scrollBar.win)
1557 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1449 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1558 } 1450 }
1559 else 1451 else
1560# endif 1452# endif
1561 { 1453 {
1562 flags |= isVtOrigin;
1563 /* force old pixmap dereference in case it was transparent before :*/ 1454 /* 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]); 1455 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1576 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1456 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1577 /* do we also need to set scrollbar's background here ? */ 1457 /* do we also need to set scrollbar's background here ? */
1458
1578 if (target->scrollBar.win) 1459 if (target->scrollBar.win)
1579 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1460 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1580 } 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 }
1581 1472
1582 /* 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
1583 scr_touch or we get a great deal of flicker otherwise: */ 1474 scr_touch or we get a great deal of flicker otherwise: */
1584 XClearWindow (target->dpy, target->parent[0]); 1475 XClearWindow (target->dpy, target->parent[0]);
1585 1476
1586 if (target->scrollBar.state && target->scrollBar.win) 1477 if (target->scrollBar.state && target->scrollBar.win)
1587 { 1478 {
1588 target->scrollBar.state = STATE_IDLE; 1479 target->scrollBar.state = STATE_IDLE;
1589 target->scrollBar.show (0); 1480 target->scrollBar.show (0);
1590 } 1481 }
1591 1482
1592 target->want_refresh = 1; 1483 target->want_refresh = 1;
1593 flags |= hasChanged; 1484 flags |= hasChanged;
1594 }
1595} 1485}
1596 1486
1597#endif /* HAVE_BG_PIXMAP */ 1487#endif /* HAVE_BG_PIXMAP */
1598 1488
1599#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1489#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1600/* taken from aterm-0.4.2 */ 1490/* taken from aterm-0.4.2 */
1601 1491
1602static void 1492static void
1603ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm) 1493ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c)
1604{ 1494{
1605 int sh_r, sh_g, sh_b; 1495 int sh_r, sh_g, sh_b;
1606 uint32_t mask_r, mask_g, mask_b; 1496 uint32_t mask_r, mask_g, mask_b;
1607 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1497 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1608 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1498 rgba low;
1609 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1499 rgba high;
1610 int i; 1500 int i;
1611 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; 1501 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1612 1502
1613 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; 1503 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1614 1504
… …
1679 /* prepare limits for color transformation (each channel is handled separately) */ 1569 /* prepare limits for color transformation (each channel is handled separately) */
1680 if (shade > 100) 1570 if (shade > 100)
1681 { 1571 {
1682 shade = 200 - shade; 1572 shade = 200 - shade;
1683 1573
1684 lower_lim_r = 65535-rm; 1574 high.r = (65535 - c.r) * shade / 100;
1685 lower_lim_g = 65535-gm; 1575 high.g = (65535 - c.g) * shade / 100;
1686 lower_lim_b = 65535-bm; 1576 high.b = (65535 - c.b) * shade / 100;
1687 1577
1688 lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100); 1578 low.r = 65535 - high.r;
1689 lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100); 1579 low.g = 65535 - high.g;
1690 lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100); 1580 low.b = 65535 - high.b;
1691
1692 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1693 } 1581 }
1694 else 1582 else
1695 { 1583 {
1584 high.r = c.r * shade / 100;
1585 high.g = c.g * shade / 100;
1586 high.b = c.b * shade / 100;
1696 1587
1697 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1588 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 } 1589 }
1703 1590
1704 /* fill our lookup tables */ 1591 /* fill our lookup tables */
1705 for (i = 0; i <= mask_r>>sh_r; i++) 1592 for (i = 0; i <= mask_r>>sh_r; i++)
1706 { 1593 {
1707 uint32_t tmp; 1594 uint32_t tmp;
1708 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r)); 1595 tmp = i * high.r;
1709 tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r); 1596 tmp += (mask_r>>sh_r) * low.r;
1710 lookup_r[i] = (tmp/65535)<<sh_r; 1597 lookup_r[i] = (tmp/65535)<<sh_r;
1711 } 1598 }
1712 for (i = 0; i <= mask_g>>sh_g; i++) 1599 for (i = 0; i <= mask_g>>sh_g; i++)
1713 { 1600 {
1714 uint32_t tmp; 1601 uint32_t tmp;
1715 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g)); 1602 tmp = i * high.g;
1716 tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g); 1603 tmp += (mask_g>>sh_g) * low.g;
1717 lookup_g[i] = (tmp/65535)<<sh_g; 1604 lookup_g[i] = (tmp/65535)<<sh_g;
1718 } 1605 }
1719 for (i = 0; i <= mask_b>>sh_b; i++) 1606 for (i = 0; i <= mask_b>>sh_b; i++)
1720 { 1607 {
1721 uint32_t tmp; 1608 uint32_t tmp;
1722 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b)); 1609 tmp = i * high.b;
1723 tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b); 1610 tmp += (mask_b>>sh_b) * low.b;
1724 lookup_b[i] = (tmp/65535)<<sh_b; 1611 lookup_b[i] = (tmp/65535)<<sh_b;
1725 } 1612 }
1726 1613
1727 /* apply table to input image (replacing colors by newly calculated ones) */ 1614 /* apply table to input image (replacing colors by newly calculated ones) */
1728 if (srcImage->bits_per_pixel == 32 1615 if (srcImage->bits_per_pixel == 32

Diff Legend

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