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.103 by sf-exg, Sun Oct 31 11:15:29 2010 UTC vs.
Revision 1.119 by sf-exg, Thu Nov 18 17:28:12 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 *p;
… …
271 262
272 n = (p - geom); 263 n = (p - geom);
273 if (n < MAXLEN_GEOM) 264 if (n < MAXLEN_GEOM)
274 { 265 {
275 char *ops; 266 char *ops;
276 new_flags |= geometrySet;
277 267
278 memcpy (str, geom, n); 268 memcpy (str, geom, n);
279 str[n] = '\0'; 269 str[n] = '\0';
280 if (str[0] == ':') 270 if (str[0] == ':')
281 ops = &str[0]; 271 ops = &str[0];
… …
296 if (ops > str || ops == NULL) 286 if (ops > str || ops == NULL)
297 { 287 {
298 /* we have geometry string - let's handle it prior to applying ops */ 288 /* we have geometry string - let's handle it prior to applying ops */
299 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 289 geom_flags = XParseGeometry (str, &x, &y, &w, &h);
300 290
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 */ 291 if (!update) /* setting up geometry from scratch */
333 { 292 {
334 if (!(geom_flags & XValue)) 293 if (!(geom_flags & XValue))
335 { 294 {
336 /* use default geometry - centered */ 295 /* use default geometry - centered */
337 x = y = defaultAlign; 296 x = y = defaultAlign;
… …
351 } 310 }
352 else 311 else
353 w = h; 312 w = h;
354 } 313 }
355 } /* done parsing geometry string */ 314 } /* done parsing geometry string */
356 else if (!(flags & geometrySet)) 315 else if (!update)
357 { 316 {
358 /* default geometry - scaled and centered */ 317 /* default geometry - scaled and centered */
359 x = y = defaultAlign; 318 x = y = defaultAlign;
360 w = h = defaultScale; 319 w = h = defaultScale;
361 } 320 }
362 321
363 if (!(flags & geometrySet)) 322 if (!update)
364 geom_flags |= WidthValue|HeightValue|XValue|YValue; 323 geom_flags |= WidthValue|HeightValue|XValue|YValue;
365 324
366 if (ops) 325 if (ops)
367 { 326 {
368 while (*ops) 327 while (*ops)
… …
416 375
417 while (*ops != ':' && *ops != '\0') ++ops; 376 while (*ops != ':' && *ops != '\0') ++ops;
418 } /* done parsing ops */ 377 } /* done parsing ops */
419 } 378 }
420 379
421 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed; 380 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; 381 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; 382 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; 383 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
425 } 384 }
426 385
427 if (new_flags != flags) 386 if (new_flags != flags)
428 { 387 {
429 flags = new_flags; 388 flags = new_flags;
430 changed++; 389 changed = true;
431 } 390 }
432 391
433 return (changed > 0); 392 return changed;
434} 393}
435 394
436void 395void
437bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 396bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
438{ 397{
… …
661 if (result) 620 if (result)
662 { 621 {
663 XGCValues gcv; 622 XGCValues gcv;
664 GC gc; 623 GC gc;
665 624
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 */ 625 /* create Pixmap */
678 if (pixmap == None) 626 if (pixmap == None
627 || pmap_width != new_pmap_width
628 || pmap_height != new_pmap_height
629 || pmap_depth != target->depth)
679 { 630 {
631 if (pixmap)
632 XFreePixmap (target->dpy, pixmap);
680 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 633 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
681 pmap_width = new_pmap_width; 634 pmap_width = new_pmap_width;
682 pmap_height = new_pmap_height; 635 pmap_height = new_pmap_height;
683 pmap_depth = target->depth; 636 pmap_depth = target->depth;
684 } 637 }
… …
729 return false; 682 return false;
730 683
731 if (!pixbuf) 684 if (!pixbuf)
732 return false; 685 return false;
733 686
734#if !XRENDER
735 if (background_flags) 687 if (background_flags
688 && !(flags & HAS_RENDER))
736 return false; 689 return false;
737#endif
738 690
739 GdkPixbuf *result; 691 GdkPixbuf *result;
740 692
741 int image_width = gdk_pixbuf_get_width (pixbuf); 693 int image_width = gdk_pixbuf_get_width (pixbuf);
742 int image_height = gdk_pixbuf_get_height (pixbuf); 694 int image_height = gdk_pixbuf_get_height (pixbuf);
… …
793 new_pmap_width = min (image_width, target_width); 745 new_pmap_width = min (image_width, target_width);
794 new_pmap_height = min (image_height, target_height); 746 new_pmap_height = min (image_height, target_height);
795 } 747 }
796 } 748 }
797 749
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) 750 if (pixmap == None
751 || pmap_width != new_pmap_width
752 || pmap_height != new_pmap_height
753 || pmap_depth != target->depth)
810 { 754 {
755 if (pixmap)
756 XFreePixmap (target->dpy, pixmap);
811 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 757 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
812 pmap_width = new_pmap_width; 758 pmap_width = new_pmap_width;
813 pmap_height = new_pmap_height; 759 pmap_height = new_pmap_height;
814 pmap_depth = target->depth; 760 pmap_depth = target->depth;
815 } 761 }
… …
909# endif /* HAVE_PIXBUF */ 855# endif /* HAVE_PIXBUF */
910 856
911bool 857bool
912bgPixmap_t::set_file (const char *file) 858bgPixmap_t::set_file (const char *file)
913{ 859{
914 assert (file); 860 if (!file || !*file)
861 return false;
915 862
916 if (*file)
917 {
918 if (const char *p = strchr (file, ';')) 863 if (const char *p = strchr (file, ';'))
919 { 864 {
920 size_t len = p - file; 865 size_t len = p - file;
921 char *f = rxvt_temp_buf<char> (len + 1); 866 char *f = rxvt_temp_buf<char> (len + 1);
922 memcpy (f, file, len); 867 memcpy (f, file, len);
923 f[len] = '\0'; 868 f[len] = '\0';
924 file = f; 869 file = f;
925 } 870 }
926 871
927# ifdef HAVE_AFTERIMAGE 872# ifdef HAVE_AFTERIMAGE
928 if (!target->asimman) 873 if (!target->asimman)
929 target->asimman = create_generic_imageman (target->rs[Rs_path]); 874 target->asimman = create_generic_imageman (target->rs[Rs_path]);
930 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 875 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
931 if (image) 876 if (image)
932 { 877 {
933 if (original_asim) 878 if (original_asim)
934 safe_asimage_destroy (original_asim); 879 safe_asimage_destroy (original_asim);
935 original_asim = image; 880 original_asim = image;
936 have_image = true; 881 have_image = true;
937 return true; 882 return true;
938 } 883 }
939# endif 884# endif
940 885
941# ifdef HAVE_PIXBUF 886# ifdef HAVE_PIXBUF
942 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 887 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
943 if (image) 888 if (image)
944 { 889 {
945 if (pixbuf) 890 if (pixbuf)
946 g_object_unref (pixbuf); 891 g_object_unref (pixbuf);
947 pixbuf = image; 892 pixbuf = image;
948 have_image = true; 893 have_image = true;
949 return true; 894 return true;
950 } 895 }
951# endif 896# endif
952 }
953 897
954 return false; 898 return false;
955} 899}
956 900
957# endif /* BG_IMAGE_FROM_FILE */ 901# endif /* BG_IMAGE_FROM_FILE */
… …
970} 914}
971 915
972bool 916bool
973bgPixmap_t::set_blur_radius (const char *geom) 917bgPixmap_t::set_blur_radius (const char *geom)
974{ 918{
975 int changed = 0; 919 bool changed = false;
976 unsigned int hr, vr; 920 unsigned int hr, vr;
977 int junk; 921 int junk;
978 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 922 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
979 923
980 if (!(geom_flags & WidthValue)) 924 if (!(geom_flags & WidthValue))
… …
985 min_it (hr, 128); 929 min_it (hr, 128);
986 min_it (vr, 128); 930 min_it (vr, 128);
987 931
988 if (h_blurRadius != hr) 932 if (h_blurRadius != hr)
989 { 933 {
990 ++changed; 934 changed = true;
991 h_blurRadius = hr; 935 h_blurRadius = hr;
992 } 936 }
993 937
994 if (v_blurRadius != vr) 938 if (v_blurRadius != vr)
995 { 939 {
996 ++changed; 940 changed = true;
997 v_blurRadius = vr; 941 v_blurRadius = vr;
998 } 942 }
999 943
1000 if (v_blurRadius == 0 && h_blurRadius == 0) 944 if (v_blurRadius == 0 && h_blurRadius == 0)
1001 flags &= ~blurNeeded; 945 flags &= ~blurNeeded;
1002 else 946 else
1003 flags |= blurNeeded; 947 flags |= blurNeeded;
1004 948
1005#if XRENDER
1006 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
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); 949 return changed;
1018} 950}
1019 951
1020static inline unsigned long 952static inline unsigned long
1021compute_tint_shade_flags (rxvt_color *tint, int shade) 953compute_tint_shade_flags (rxvt_color *tint, int shade)
1022{ 954{
… …
1041 { 973 {
1042 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) 974 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
1043 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 975 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
1044 { 976 {
1045 flags |= bgPixmap_t::tintNeeded; 977 flags |= bgPixmap_t::tintNeeded;
1046 }
1047 }
1048
1049 if (flags & bgPixmap_t::tintNeeded)
1050 {
1051 if (flags & bgPixmap_t::tintWholesome)
1052 flags |= bgPixmap_t::tintServerSide;
1053 else
1054 {
1055#if XRENDER
1056 flags |= bgPixmap_t::tintServerSide;
1057#endif
1058 } 978 }
1059 } 979 }
1060 980
1061 return flags; 981 return flags;
1062} 982}
… …
1261 1181
1262 if (mask_pic && overlay_pic && back_pic) 1182 if (mask_pic && overlay_pic && back_pic)
1263 { 1183 {
1264 XRenderColor mask_c; 1184 XRenderColor mask_c;
1265 1185
1266 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); 1186 mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0;
1267 mask_c.alpha = 0xffff; 1187 mask_c.alpha = 0xffff;
1268 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1188 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1269 1189
1270 mask_c.alpha = 0; 1190 mask_c.alpha = 0;
1271 mask_c.red = 0xffff - c.r; 1191 mask_c.red = 0xffff - c.r;
… …
1338 Pixmap recoded_root_pmap = root_pixmap; 1258 Pixmap recoded_root_pmap = root_pixmap;
1339 1259
1340 if (root_pixmap != None && root_depth != target->depth) 1260 if (root_pixmap != None && root_depth != target->depth)
1341 { 1261 {
1342#if XRENDER 1262#if XRENDER
1263 if (flags & HAS_RENDER)
1264 {
1343 XRenderPictureAttributes pa; 1265 XRenderPictureAttributes pa;
1344 1266
1345 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen)); 1267 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1346 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa); 1268 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1347 1269
1348 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth); 1270 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
1349 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); 1271 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
1350 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa); 1272 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1351 1273
1352 if (src && dst) 1274 if (src && dst)
1353 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height); 1275 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1276 else
1277 {
1278 XFreePixmap (dpy, recoded_root_pmap);
1279 root_pixmap = None;
1280 }
1281
1282 XRenderFreePicture (dpy, src);
1283 XRenderFreePicture (dpy, dst);
1284 }
1354 else 1285 else
1355 root_pixmap = None; 1286#endif
1356
1357 XRenderFreePicture (dpy, src);
1358 XRenderFreePicture (dpy, dst);
1359#else
1360 root_pixmap = None; 1287 root_pixmap = None;
1361#endif
1362 } 1288 }
1363 1289
1364 if (root_pixmap == None) 1290 if (root_pixmap == None)
1365 return 0; 1291 return 0;
1366 1292
… …
1383 if (gc) 1309 if (gc)
1384 { 1310 {
1385 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1311 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1386 result |= transpPmapTiled; 1312 result |= transpPmapTiled;
1387 XFreeGC (dpy, gc); 1313 XFreeGC (dpy, gc);
1388 }
1389 1314
1390 if (tiled_root_pmap != None)
1391 {
1392 if (!need_client_side_rendering ()) 1315 if (!need_client_side_rendering ())
1393 { 1316 {
1394 if (flags & (blurNeeded | blurServerSide)) 1317 if ((flags & blurNeeded)
1318 && (flags & HAS_RENDER_CONV))
1395 { 1319 {
1396 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height)) 1320 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1397 result |= transpPmapBlurred; 1321 result |= transpPmapBlurred;
1398 } 1322 }
1399 if (flags & (tintNeeded | tintServerSide)) 1323 if ((flags & tintNeeded)
1324 && (flags & (tintWholesome | HAS_RENDER)))
1400 { 1325 {
1401 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height)) 1326 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1402 result |= transpPmapTinted; 1327 result |= transpPmapTinted;
1403 } 1328 }
1404 } /* server side rendering completed */ 1329 } /* server side rendering completed */
… …
1409 pixmap = tiled_root_pmap; 1334 pixmap = tiled_root_pmap;
1410 pmap_width = window_width; 1335 pmap_width = window_width;
1411 pmap_height = window_height; 1336 pmap_height = window_height;
1412 pmap_depth = target->depth; 1337 pmap_depth = target->depth;
1413 } 1338 }
1339 else
1340 XFreePixmap (dpy, tiled_root_pmap);
1414 1341
1415 if (recoded_root_pmap != root_pixmap) 1342 if (recoded_root_pmap != root_pixmap)
1416 XFreePixmap (dpy, recoded_root_pmap); 1343 XFreePixmap (dpy, recoded_root_pmap);
1417 1344
1418 return result; 1345 return result;
… …
1427 1354
1428 root_pixmap = new_root_pixmap; 1355 root_pixmap = new_root_pixmap;
1429} 1356}
1430# endif /* ENABLE_TRANSPARENCY */ 1357# endif /* ENABLE_TRANSPARENCY */
1431 1358
1432# ifndef HAVE_AFTERIMAGE 1359#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1433static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm); 1360static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c);
1434# endif 1361# endif
1435 1362
1436bool 1363bool
1437bgPixmap_t::render () 1364bgPixmap_t::render ()
1438{ 1365{
… …
1461 if (render_image (background_flags)) 1388 if (render_image (background_flags))
1462 flags = flags & ~isInvalid; 1389 flags = flags & ~isInvalid;
1463 } 1390 }
1464# endif 1391# endif
1465 1392
1393# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1466 XImage *result = NULL; 1394 XImage *result = NULL;
1467 1395
1468 if (background_flags && (flags & isInvalid)) 1396 if (background_flags && (flags & isInvalid))
1469 { 1397 {
1470 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1398 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1471 } 1399 }
1472 1400
1473 if (result) 1401 if (result)
1474 { 1402 {
1475# if !defined(HAVE_AFTERIMAGE) && !XRENDER
1476 /* our own client-side tinting */ 1403 /* our own client-side tinting */
1477 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1404 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1478 { 1405 {
1479 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1406 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1480 if (flags & tintSet) 1407 if (flags & tintSet)
1481 tint.get (c); 1408 tint.get (c);
1482 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b); 1409 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1483 } 1410 }
1484# endif
1485 1411
1486 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1412 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1487 1413
1488 if (gc) 1414 if (gc)
1489 { 1415 {
… …
1493 flags = flags & ~isInvalid; 1419 flags = flags & ~isInvalid;
1494 } 1420 }
1495 1421
1496 XDestroyImage (result); 1422 XDestroyImage (result);
1497 } 1423 }
1424# endif
1498 1425
1499 if (flags & isInvalid) 1426 if (flags & isInvalid)
1500 { 1427 {
1501 if (pixmap != None) 1428 if (pixmap != None)
1502 { 1429 {
… …
1510 valid_since = ev::now (); 1437 valid_since = ev::now ();
1511 1438
1512 return true; 1439 return true;
1513} 1440}
1514 1441
1515bool 1442void
1516bgPixmap_t::set_target (rxvt_term *new_target) 1443bgPixmap_t::set_target (rxvt_term *new_target)
1517{ 1444{
1518 if (new_target)
1519 if (target != new_target)
1520 {
1521 target = new_target; 1445 target = new_target;
1522 return true; 1446
1447 flags &= ~(HAS_RENDER | HAS_RENDER_CONV);
1448#if XRENDER
1449 int major, minor;
1450 if (XRenderQueryVersion (target->dpy, &major, &minor))
1451 flags |= HAS_RENDER;
1452 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1453 if (filters)
1454 {
1455 for (int i = 0; i < filters->nfilter; i++)
1456 if (!strcmp (filters->filter[i], FilterConvolution))
1457 flags |= HAS_RENDER_CONV;
1458
1459 XFree (filters);
1523 } 1460 }
1524 1461#endif
1525 return false;
1526} 1462}
1527 1463
1528void 1464void
1529bgPixmap_t::apply () 1465bgPixmap_t::apply ()
1530{ 1466{
1531 if (target) 1467 if (target == NULL)
1532 { 1468 return;
1469
1533 if (pixmap != None) 1470 if (pixmap != None)
1534 { 1471 {
1535 /* set target's background to pixmap */ 1472 /* set target's background to pixmap */
1536# ifdef ENABLE_TRANSPARENCY 1473# ifdef ENABLE_TRANSPARENCY
1537 if (flags & isTransparent) 1474 if (flags & isTransparent)
1538 { 1475 {
1539 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1476 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1540 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1477 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1541 1478
1542 if (target->scrollBar.win) 1479 if (target->scrollBar.win)
1543 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1480 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1544 } 1481 }
1545 else 1482 else
1546# endif 1483# endif
1547 { 1484 {
1548 /* force old pixmap dereference in case it was transparent before :*/ 1485 /* force old pixmap dereference in case it was transparent before :*/
1549 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1550 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1551 /* do we also need to set scrollbar's background here ? */
1552
1553 if (target->scrollBar.win)
1554 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1555 }
1556 }
1557 else
1558 {
1559 /* set target background to a pixel */
1560 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1486 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1561 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1487 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1562 /* do we also need to set scrollbar's background here ? */ 1488 /* do we also need to set scrollbar's background here ? */
1489
1563 if (target->scrollBar.win) 1490 if (target->scrollBar.win)
1564 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1491 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1565 } 1492 }
1493 }
1494 else
1495 {
1496 /* set target background to a pixel */
1497 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1498 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1499 /* do we also need to set scrollbar's background here ? */
1500 if (target->scrollBar.win)
1501 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1502 }
1566 1503
1567 /* don't want Expose on the parent or vt. It is better to use 1504 /* don't want Expose on the parent or vt. It is better to use
1568 scr_touch or we get a great deal of flicker otherwise: */ 1505 scr_touch or we get a great deal of flicker otherwise: */
1569 XClearWindow (target->dpy, target->parent[0]); 1506 XClearWindow (target->dpy, target->parent[0]);
1570 1507
1571 if (target->scrollBar.state && target->scrollBar.win) 1508 if (target->scrollBar.state && target->scrollBar.win)
1572 { 1509 {
1573 target->scrollBar.state = STATE_IDLE; 1510 target->scrollBar.state = STATE_IDLE;
1574 target->scrollBar.show (0); 1511 target->scrollBar.show (0);
1575 } 1512 }
1576 1513
1577 target->want_refresh = 1; 1514 target->want_refresh = 1;
1578 flags |= hasChanged; 1515 flags |= hasChanged;
1579 }
1580} 1516}
1581 1517
1582#endif /* HAVE_BG_PIXMAP */ 1518#endif /* HAVE_BG_PIXMAP */
1583 1519
1584#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XRENDER 1520#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1585/* taken from aterm-0.4.2 */ 1521/* taken from aterm-0.4.2 */
1586 1522
1587static void 1523static void
1588ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm) 1524ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c)
1589{ 1525{
1590 int sh_r, sh_g, sh_b; 1526 int sh_r, sh_g, sh_b;
1591 uint32_t mask_r, mask_g, mask_b; 1527 uint32_t mask_r, mask_g, mask_b;
1592 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1528 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1593 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1529 rgba low;
1594 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1530 rgba high;
1595 int i; 1531 int i;
1596 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; 1532 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1597 1533
1598 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; 1534 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1599 1535
… …
1664 /* prepare limits for color transformation (each channel is handled separately) */ 1600 /* prepare limits for color transformation (each channel is handled separately) */
1665 if (shade > 100) 1601 if (shade > 100)
1666 { 1602 {
1667 shade = 200 - shade; 1603 shade = 200 - shade;
1668 1604
1669 lower_lim_r = 65535-rm; 1605 high.r = (65535 - c.r) * shade / 100;
1670 lower_lim_g = 65535-gm; 1606 high.g = (65535 - c.g) * shade / 100;
1671 lower_lim_b = 65535-bm; 1607 high.b = (65535 - c.b) * shade / 100;
1672 1608
1673 lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100); 1609 low.r = 65535 - high.r;
1674 lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100); 1610 low.g = 65535 - high.g;
1675 lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100); 1611 low.b = 65535 - high.b;
1676
1677 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1678 } 1612 }
1679 else 1613 else
1680 { 1614 {
1615 high.r = c.r * shade / 100;
1616 high.g = c.g * shade / 100;
1617 high.b = c.b * shade / 100;
1681 1618
1682 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1619 low.r = low.g = low.b = 0;
1683
1684 upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1685 upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1686 upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1687 } 1620 }
1688 1621
1689 /* fill our lookup tables */ 1622 /* fill our lookup tables */
1690 for (i = 0; i <= mask_r>>sh_r; i++) 1623 for (i = 0; i <= mask_r>>sh_r; i++)
1691 { 1624 {
1692 uint32_t tmp; 1625 uint32_t tmp;
1693 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r)); 1626 tmp = i * high.r;
1694 tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r); 1627 tmp += (mask_r>>sh_r) * low.r;
1695 lookup_r[i] = (tmp/65535)<<sh_r; 1628 lookup_r[i] = (tmp/65535)<<sh_r;
1696 } 1629 }
1697 for (i = 0; i <= mask_g>>sh_g; i++) 1630 for (i = 0; i <= mask_g>>sh_g; i++)
1698 { 1631 {
1699 uint32_t tmp; 1632 uint32_t tmp;
1700 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g)); 1633 tmp = i * high.g;
1701 tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g); 1634 tmp += (mask_g>>sh_g) * low.g;
1702 lookup_g[i] = (tmp/65535)<<sh_g; 1635 lookup_g[i] = (tmp/65535)<<sh_g;
1703 } 1636 }
1704 for (i = 0; i <= mask_b>>sh_b; i++) 1637 for (i = 0; i <= mask_b>>sh_b; i++)
1705 { 1638 {
1706 uint32_t tmp; 1639 uint32_t tmp;
1707 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b)); 1640 tmp = i * high.b;
1708 tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b); 1641 tmp += (mask_b>>sh_b) * low.b;
1709 lookup_b[i] = (tmp/65535)<<sh_b; 1642 lookup_b[i] = (tmp/65535)<<sh_b;
1710 } 1643 }
1711 1644
1712 /* apply table to input image (replacing colors by newly calculated ones) */ 1645 /* apply table to input image (replacing colors by newly calculated ones) */
1713 if (srcImage->bits_per_pixel == 32 1646 if (srcImage->bits_per_pixel == 32

Diff Legend

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