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.101 by sf-exg, Sun Oct 31 08:28:04 2010 UTC vs.
Revision 1.116 by sf-exg, Thu Nov 11 11:58:10 2010 UTC

… …
23 *---------------------------------------------------------------------*/ 23 *---------------------------------------------------------------------*/
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
29#if XRENDER
30# include <X11/extensions/Xrender.h>
31#endif
28 32
29#define DO_TIMING_TEST 0 33#define DO_TIMING_TEST 0
30 34
31#if DO_TIMING_TEST 35#if DO_TIMING_TEST
32# include <sys/time.h> 36# include <sys/time.h>
… …
250} 254}
251 255
252bool 256bool
253bgPixmap_t::set_geometry (const char *geom) 257bgPixmap_t::set_geometry (const char *geom)
254{ 258{
259 bool changed = false;
255 int geom_flags = 0, changed = 0; 260 int geom_flags = 0;
256 int x = 0, y = 0; 261 int x = 0, y = 0;
257 unsigned int w = 0, h = 0; 262 unsigned int w = 0, h = 0;
258 unsigned int n; 263 unsigned int n;
259 unsigned long new_flags = (flags & (~geometryFlags)); 264 unsigned long new_flags = (flags & (~geometryFlags));
260 const char *p; 265 const char *p;
… …
416 421
417 while (*ops != ':' && *ops != '\0') ++ops; 422 while (*ops != ':' && *ops != '\0') ++ops;
418 } /* done parsing ops */ 423 } /* done parsing ops */
419 } 424 }
420 425
421 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed; 426 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; 427 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; 428 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; 429 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
425 } 430 }
426 431
427 if (new_flags != flags) 432 if (new_flags != flags)
428 { 433 {
429 flags = new_flags; 434 flags = new_flags;
430 changed++; 435 changed = true;
431 } 436 }
432 437
433 return (changed > 0); 438 return changed;
434} 439}
435 440
436void 441void
437bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 442bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
438{ 443{
… …
661 if (result) 666 if (result)
662 { 667 {
663 XGCValues gcv; 668 XGCValues gcv;
664 GC gc; 669 GC gc;
665 670
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 */ 671 /* create Pixmap */
678 if (pixmap == None) 672 if (pixmap == None
673 || pmap_width != new_pmap_width
674 || pmap_height != new_pmap_height
675 || pmap_depth != target->depth)
679 { 676 {
677 if (pixmap)
678 XFreePixmap (target->dpy, pixmap);
680 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 679 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
681 pmap_width = new_pmap_width; 680 pmap_width = new_pmap_width;
682 pmap_height = new_pmap_height; 681 pmap_height = new_pmap_height;
683 pmap_depth = target->depth; 682 pmap_depth = target->depth;
684 } 683 }
… …
729 return false; 728 return false;
730 729
731 if (!pixbuf) 730 if (!pixbuf)
732 return false; 731 return false;
733 732
734#if !XRENDER
735 if (background_flags) 733 if (background_flags
734 && !(flags & HAS_RENDER))
736 return false; 735 return false;
737#endif
738 736
739 GdkPixbuf *result; 737 GdkPixbuf *result;
740 738
741 int image_width = gdk_pixbuf_get_width (pixbuf); 739 int image_width = gdk_pixbuf_get_width (pixbuf);
742 int image_height = gdk_pixbuf_get_height (pixbuf); 740 int image_height = gdk_pixbuf_get_height (pixbuf);
… …
793 new_pmap_width = min (image_width, target_width); 791 new_pmap_width = min (image_width, target_width);
794 new_pmap_height = min (image_height, target_height); 792 new_pmap_height = min (image_height, target_height);
795 } 793 }
796 } 794 }
797 795
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) 796 if (pixmap == None
797 || pmap_width != new_pmap_width
798 || pmap_height != new_pmap_height
799 || pmap_depth != target->depth)
810 { 800 {
801 if (pixmap)
802 XFreePixmap (target->dpy, pixmap);
811 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 803 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
812 pmap_width = new_pmap_width; 804 pmap_width = new_pmap_width;
813 pmap_height = new_pmap_height; 805 pmap_height = new_pmap_height;
814 pmap_depth = target->depth; 806 pmap_depth = target->depth;
815 } 807 }
… …
862 if (background_flags) 854 if (background_flags)
863 { 855 {
864 Display *dpy = target->dpy; 856 Display *dpy = target->dpy;
865 XRenderPictureAttributes pa; 857 XRenderPictureAttributes pa;
866 858
867 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen)); 859 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, target->visual);
868 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 860 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
869 861
870 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); 862 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
871 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa); 863 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
872 864
… …
909# endif /* HAVE_PIXBUF */ 901# endif /* HAVE_PIXBUF */
910 902
911bool 903bool
912bgPixmap_t::set_file (const char *file) 904bgPixmap_t::set_file (const char *file)
913{ 905{
914 assert (file); 906 if (!file || !*file)
907 return false;
915 908
916 if (*file)
917 {
918 if (const char *p = strchr (file, ';')) 909 if (const char *p = strchr (file, ';'))
919 { 910 {
920 size_t len = p - file; 911 size_t len = p - file;
921 char *f = rxvt_temp_buf<char> (len + 1); 912 char *f = rxvt_temp_buf<char> (len + 1);
922 memcpy (f, file, len); 913 memcpy (f, file, len);
923 f[len] = '\0'; 914 f[len] = '\0';
924 file = f; 915 file = f;
925 } 916 }
926 917
927# ifdef HAVE_AFTERIMAGE 918# ifdef HAVE_AFTERIMAGE
928 if (!target->asimman) 919 if (!target->asimman)
929 target->asimman = create_generic_imageman (target->rs[Rs_path]); 920 target->asimman = create_generic_imageman (target->rs[Rs_path]);
930 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 921 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
931 if (image) 922 if (image)
932 { 923 {
933 if (original_asim) 924 if (original_asim)
934 safe_asimage_destroy (original_asim); 925 safe_asimage_destroy (original_asim);
935 original_asim = image; 926 original_asim = image;
936 have_image = true; 927 have_image = true;
937 return true; 928 return true;
938 } 929 }
939# endif 930# endif
940 931
941# ifdef HAVE_PIXBUF 932# ifdef HAVE_PIXBUF
942 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 933 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
943 if (image) 934 if (image)
944 { 935 {
945 if (pixbuf) 936 if (pixbuf)
946 g_object_unref (pixbuf); 937 g_object_unref (pixbuf);
947 pixbuf = image; 938 pixbuf = image;
948 have_image = true; 939 have_image = true;
949 return true; 940 return true;
950 } 941 }
951# endif 942# endif
952 }
953 943
954 return false; 944 return false;
955} 945}
956 946
957# endif /* BG_IMAGE_FROM_FILE */ 947# endif /* BG_IMAGE_FROM_FILE */
… …
970} 960}
971 961
972bool 962bool
973bgPixmap_t::set_blur_radius (const char *geom) 963bgPixmap_t::set_blur_radius (const char *geom)
974{ 964{
975 int changed = 0; 965 bool changed = false;
976 unsigned int hr, vr; 966 unsigned int hr, vr;
977 int junk; 967 int junk;
978 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 968 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
979 969
980 if (!(geom_flags & WidthValue)) 970 if (!(geom_flags & WidthValue))
… …
985 min_it (hr, 128); 975 min_it (hr, 128);
986 min_it (vr, 128); 976 min_it (vr, 128);
987 977
988 if (h_blurRadius != hr) 978 if (h_blurRadius != hr)
989 { 979 {
990 ++changed; 980 changed = true;
991 h_blurRadius = hr; 981 h_blurRadius = hr;
992 } 982 }
993 983
994 if (v_blurRadius != vr) 984 if (v_blurRadius != vr)
995 { 985 {
996 ++changed; 986 changed = true;
997 v_blurRadius = vr; 987 v_blurRadius = vr;
998 } 988 }
999 989
1000 if (v_blurRadius == 0 && h_blurRadius == 0) 990 if (v_blurRadius == 0 && h_blurRadius == 0)
1001 flags &= ~blurNeeded; 991 flags &= ~blurNeeded;
1002 else 992 else
1003 flags |= blurNeeded; 993 flags |= blurNeeded;
1004 994
1005#if XRENDER
1006 XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root);
1007 if (filters)
1008 {
1009 for (int i = 0; i < filters->nfilter; i++)
1010 if (!strcmp (filters->filter[i], FilterConvolution))
1011 flags |= bgPixmap_t::blurServerSide;
1012
1013 XFree (filters);
1014 }
1015#endif
1016
1017 return (changed > 0); 995 return changed;
1018} 996}
1019 997
1020static inline unsigned long 998static inline unsigned long
1021compute_tint_shade_flags (rxvt_color *tint, int shade) 999compute_tint_shade_flags (rxvt_color *tint, int shade)
1022{ 1000{
… …
1041 { 1019 {
1042 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) 1020 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
1043 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 1021 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
1044 { 1022 {
1045 flags |= bgPixmap_t::tintNeeded; 1023 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 } 1024 }
1059 } 1025 }
1060 1026
1061 return flags; 1027 return flags;
1062} 1028}
… …
1261 1227
1262 if (mask_pic && overlay_pic && back_pic) 1228 if (mask_pic && overlay_pic && back_pic)
1263 { 1229 {
1264 XRenderColor mask_c; 1230 XRenderColor mask_c;
1265 1231
1266 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); 1232 mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0;
1267 mask_c.alpha = 0xffff; 1233 mask_c.alpha = 0xffff;
1268 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1234 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1269 1235
1270 mask_c.alpha = 0; 1236 mask_c.alpha = 0;
1271 mask_c.red = 0xffff - c.r; 1237 mask_c.red = 0xffff - c.r;
… …
1299 return 0; 1265 return 0;
1300 1266
1301 /* root dimensions may change from call to call - but Display structure should 1267 /* root dimensions may change from call to call - but Display structure should
1302 * be always up-to-date, so let's use it : 1268 * be always up-to-date, so let's use it :
1303 */ 1269 */
1304 Window root = target->display->root;
1305 int screen = target->display->screen; 1270 int screen = target->display->screen;
1306 Display *dpy = target->dpy; 1271 Display *dpy = target->dpy;
1272 int root_depth = DefaultDepth (dpy, screen);
1307 int root_width = DisplayWidth (dpy, screen); 1273 int root_width = DisplayWidth (dpy, screen);
1308 int root_height = DisplayHeight (dpy, screen); 1274 int root_height = DisplayHeight (dpy, screen);
1275 unsigned int root_pmap_width, root_pmap_height;
1309 int window_width = target->szHint.width; 1276 int window_width = target->szHint.width;
1310 int window_height = target->szHint.height; 1277 int window_height = target->szHint.height;
1311 int sx, sy; 1278 int sx, sy;
1312 XGCValues gcv; 1279 XGCValues gcv;
1313 GC gc; 1280 GC gc;
… …
1317 /* check if we are outside of the visible part of the virtual screen : */ 1284 /* check if we are outside of the visible part of the virtual screen : */
1318 if (sx + window_width <= 0 || sy + window_height <= 0 1285 if (sx + window_width <= 0 || sy + window_height <= 0
1319 || sx >= root_width || sy >= root_height) 1286 || sx >= root_width || sy >= root_height)
1320 return 0; 1287 return 0;
1321 1288
1289 // validate root pixmap and get its size
1290 if (root_pixmap != None)
1291 {
1292 Window wdummy;
1293 int idummy;
1294 unsigned int udummy;
1295
1296 target->allowedxerror = -1;
1297
1298 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy))
1299 root_pixmap = None;
1300
1301 target->allowedxerror = 0;
1302 }
1303
1304 Pixmap recoded_root_pmap = root_pixmap;
1305
1306 if (root_pixmap != None && root_depth != target->depth)
1307 {
1308#if XRENDER
1309 if (flags & HAS_RENDER)
1310 {
1311 XRenderPictureAttributes pa;
1312
1313 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1314 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1315
1316 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
1317 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
1318 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1319
1320 if (src && dst)
1321 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1322 else
1323 {
1324 XFreePixmap (dpy, recoded_root_pmap);
1325 root_pixmap = None;
1326 }
1327
1328 XRenderFreePicture (dpy, src);
1329 XRenderFreePicture (dpy, dst);
1330 }
1331 else
1332#endif
1333 root_pixmap = None;
1334 }
1335
1322 if (root_pixmap == None) 1336 if (root_pixmap == None)
1323 return 0; 1337 return 0;
1324 1338
1325 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1339 Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth);
1326 1340
1327 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1341 if (tiled_root_pmap == None) /* something really bad happened - abort */
1328 return 0; 1342 return 0;
1329 1343
1330 /* straightforward pixmap copy */ 1344 /* straightforward pixmap copy */
1331 gcv.tile = root_pixmap; 1345 gcv.tile = recoded_root_pmap;
1332 gcv.fill_style = FillTiled; 1346 gcv.fill_style = FillTiled;
1333 1347
1334 while (sx < 0) sx += (int)root_width; 1348 while (sx < 0) sx += (int)root_width;
1335 while (sy < 0) sy += (int)root_height; 1349 while (sy < 0) sy += (int)root_height;
1336 1350
1337 gcv.ts_x_origin = -sx; 1351 gcv.ts_x_origin = -sx;
1338 gcv.ts_y_origin = -sy; 1352 gcv.ts_y_origin = -sy;
1339 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1353 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1340 1354
1341 if (gc) 1355 if (gc)
1342 { 1356 {
1343 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1357 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1344 result |= transpPmapTiled; 1358 result |= transpPmapTiled;
1345 XFreeGC (dpy, gc); 1359 XFreeGC (dpy, gc);
1346 }
1347 1360
1348 if (tiled_root_pmap != None)
1349 {
1350 if (!need_client_side_rendering ()) 1361 if (!need_client_side_rendering ())
1351 { 1362 {
1352 if (flags & (blurNeeded | blurServerSide)) 1363 if ((flags & blurNeeded)
1364 && (flags & HAS_RENDER_CONV))
1353 { 1365 {
1354 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height)) 1366 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1355 result |= transpPmapBlurred; 1367 result |= transpPmapBlurred;
1356 } 1368 }
1357 if (flags & (tintNeeded | tintServerSide)) 1369 if ((flags & tintNeeded)
1370 && (flags & (tintWholesome | HAS_RENDER)))
1358 { 1371 {
1359 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height)) 1372 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1360 result |= transpPmapTinted; 1373 result |= transpPmapTinted;
1361 } 1374 }
1362 } /* server side rendering completed */ 1375 } /* server side rendering completed */
1363 1376
1364 if (pixmap) 1377 if (pixmap)
1365 XFreePixmap (dpy, pixmap); 1378 XFreePixmap (dpy, pixmap);
1366 1379
1367 pixmap = tiled_root_pmap; 1380 pixmap = tiled_root_pmap;
1368 pmap_width = window_width; 1381 pmap_width = window_width;
1369 pmap_height = window_height; 1382 pmap_height = window_height;
1370 pmap_depth = root_depth; 1383 pmap_depth = target->depth;
1371 } 1384 }
1385 else
1386 XFreePixmap (dpy, tiled_root_pmap);
1387
1388 if (recoded_root_pmap != root_pixmap)
1389 XFreePixmap (dpy, recoded_root_pmap);
1372 1390
1373 return result; 1391 return result;
1374} 1392}
1375 1393
1376void 1394void
… …
1379 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1397 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1380 if (new_root_pixmap == None) 1398 if (new_root_pixmap == None)
1381 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1399 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1382 1400
1383 root_pixmap = new_root_pixmap; 1401 root_pixmap = new_root_pixmap;
1384
1385 // validate root pixmap
1386 if (root_pixmap != None)
1387 {
1388 unsigned int width, height;
1389 Window wdummy;
1390 int idummy;
1391 unsigned int udummy;
1392
1393 target->allowedxerror = -1;
1394
1395 if (!XGetGeometry (target->dpy, root_pixmap, &wdummy, &idummy, &idummy, &width, &height, &udummy, &udummy))
1396 root_pixmap = None;
1397
1398 target->allowedxerror = 0;
1399 }
1400} 1402}
1401# endif /* ENABLE_TRANSPARENCY */ 1403# endif /* ENABLE_TRANSPARENCY */
1402 1404
1403# ifndef HAVE_AFTERIMAGE 1405#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1404static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm); 1406static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c);
1405# endif 1407# endif
1406 1408
1407bool 1409bool
1408bgPixmap_t::render () 1410bgPixmap_t::render ()
1409{ 1411{
… …
1418 { 1420 {
1419 /* we need to re-generate transparency pixmap in that case ! */ 1421 /* we need to re-generate transparency pixmap in that case ! */
1420 background_flags = make_transparency_pixmap (); 1422 background_flags = make_transparency_pixmap ();
1421 if (background_flags == 0) 1423 if (background_flags == 0)
1422 return false; 1424 return false;
1423 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1425 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1424 && pmap_depth == target->depth)
1425 flags = flags & ~isInvalid; 1426 flags = flags & ~isInvalid;
1426 } 1427 }
1427# endif 1428# endif
1428 1429
1429# ifdef BG_IMAGE_FROM_FILE 1430# ifdef BG_IMAGE_FROM_FILE
… …
1433 if (render_image (background_flags)) 1434 if (render_image (background_flags))
1434 flags = flags & ~isInvalid; 1435 flags = flags & ~isInvalid;
1435 } 1436 }
1436# endif 1437# endif
1437 1438
1439# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1438 XImage *result = NULL; 1440 XImage *result = NULL;
1439 1441
1440 if (background_flags && (flags & isInvalid)) 1442 if (background_flags && (flags & isInvalid))
1441 { 1443 {
1442 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1444 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1443 } 1445 }
1444 1446
1445 if (result) 1447 if (result)
1446 { 1448 {
1447# if !defined(HAVE_AFTERIMAGE) && !XRENDER
1448 /* our own client-side tinting */ 1449 /* our own client-side tinting */
1449 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1450 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1450 { 1451 {
1451 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1452 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1452 if (flags & tintSet) 1453 if (flags & tintSet)
1453 tint.get (c); 1454 tint.get (c);
1454 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b); 1455 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1455 } 1456 }
1456# endif
1457 1457
1458 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1458 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1459 1459
1460 if (gc) 1460 if (gc)
1461 { 1461 {
1462 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1463 {
1464 XFreePixmap (target->dpy, pixmap);
1465 pixmap = None;
1466 }
1467
1468 if (pixmap == None)
1469 {
1470 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1471 pmap_width = result->width;
1472 pmap_height = result->height;
1473 pmap_depth = target->depth;
1474 }
1475
1476 if (pmap_depth != result->depth)
1477 {
1478 /* Bad Match error will ensue ! stupid X !!!! */
1479 if (result->depth == 24 && pmap_depth == 32)
1480 result->depth = 32;
1481 else if (result->depth == 32 && pmap_depth == 24)
1482 result->depth = 24;
1483 else
1484 {
1485 /* TODO: implement image recoding */
1486 }
1487 }
1488
1489 if (pmap_depth == result->depth)
1490 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1462 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1491 1463
1492 XFreeGC (target->dpy, gc); 1464 XFreeGC (target->dpy, gc);
1493 flags = flags & ~isInvalid; 1465 flags = flags & ~isInvalid;
1494 } 1466 }
1495 1467
1496 XDestroyImage (result); 1468 XDestroyImage (result);
1497 } 1469 }
1470# endif
1498 1471
1499 if (flags & isInvalid) 1472 if (flags & isInvalid)
1500 { 1473 {
1501 if (pixmap != None) 1474 if (pixmap != None)
1502 { 1475 {
… …
1510 valid_since = ev::now (); 1483 valid_since = ev::now ();
1511 1484
1512 return true; 1485 return true;
1513} 1486}
1514 1487
1515bool 1488void
1516bgPixmap_t::set_target (rxvt_term *new_target) 1489bgPixmap_t::set_target (rxvt_term *new_target)
1517{ 1490{
1518 if (new_target)
1519 if (target != new_target)
1520 {
1521 target = new_target; 1491 target = new_target;
1522# ifdef ENABLE_TRANSPARENCY 1492
1523 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1493 flags &= ~(HAS_RENDER | HAS_RENDER_CONV);
1494#if XRENDER
1495 int major, minor;
1496 if (XRenderQueryVersion (target->dpy, &major, &minor))
1497 flags |= HAS_RENDER;
1498 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1499 if (filters)
1500 {
1501 for (int i = 0; i < filters->nfilter; i++)
1502 if (!strcmp (filters->filter[i], FilterConvolution))
1503 flags |= HAS_RENDER_CONV;
1504
1505 XFree (filters);
1506 }
1524# endif 1507#endif
1525 return true;
1526 }
1527
1528 return false;
1529} 1508}
1530 1509
1531void 1510void
1532bgPixmap_t::apply () 1511bgPixmap_t::apply ()
1533{ 1512{
1534 if (target) 1513 if (target == NULL)
1535 { 1514 return;
1515
1536 if (pixmap != None) 1516 if (pixmap != None)
1537 { 1517 {
1538 /* set target's background to pixmap */ 1518 /* set target's background to pixmap */
1539# ifdef ENABLE_TRANSPARENCY 1519# ifdef ENABLE_TRANSPARENCY
1540 if (flags & isTransparent) 1520 if (flags & isTransparent)
1541 { 1521 {
1542 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1522 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1543 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1523 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1544 1524
1545 if (target->scrollBar.win) 1525 if (target->scrollBar.win)
1546 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1526 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1547 } 1527 }
1548 else 1528 else
1549# endif 1529# endif
1550 { 1530 {
1551 /* force old pixmap dereference in case it was transparent before :*/ 1531 /* force old pixmap dereference in case it was transparent before :*/
1552 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1553 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1554 /* do we also need to set scrollbar's background here ? */
1555
1556 if (target->scrollBar.win)
1557 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1558 }
1559 }
1560 else
1561 {
1562 /* set target background to a pixel */
1563 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1532 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1564 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1533 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1565 /* do we also need to set scrollbar's background here ? */ 1534 /* do we also need to set scrollbar's background here ? */
1535
1566 if (target->scrollBar.win) 1536 if (target->scrollBar.win)
1567 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1537 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1568 } 1538 }
1539 }
1540 else
1541 {
1542 /* set target background to a pixel */
1543 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1544 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1545 /* do we also need to set scrollbar's background here ? */
1546 if (target->scrollBar.win)
1547 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1548 }
1569 1549
1570 /* don't want Expose on the parent or vt. It is better to use 1550 /* don't want Expose on the parent or vt. It is better to use
1571 scr_touch or we get a great deal of flicker otherwise: */ 1551 scr_touch or we get a great deal of flicker otherwise: */
1572 XClearWindow (target->dpy, target->parent[0]); 1552 XClearWindow (target->dpy, target->parent[0]);
1573 1553
1574 if (target->scrollBar.state && target->scrollBar.win) 1554 if (target->scrollBar.state && target->scrollBar.win)
1575 { 1555 {
1576 target->scrollBar.state = STATE_IDLE; 1556 target->scrollBar.state = STATE_IDLE;
1577 target->scrollBar.show (0); 1557 target->scrollBar.show (0);
1578 } 1558 }
1579 1559
1580 target->want_refresh = 1; 1560 target->want_refresh = 1;
1581 flags |= hasChanged; 1561 flags |= hasChanged;
1582 }
1583} 1562}
1584 1563
1585#endif /* HAVE_BG_PIXMAP */ 1564#endif /* HAVE_BG_PIXMAP */
1586 1565
1587#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XRENDER 1566#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1588/* taken from aterm-0.4.2 */ 1567/* taken from aterm-0.4.2 */
1589 1568
1590static void 1569static void
1591ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm) 1570ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c)
1592{ 1571{
1593 int sh_r, sh_g, sh_b; 1572 int sh_r, sh_g, sh_b;
1594 uint32_t mask_r, mask_g, mask_b; 1573 uint32_t mask_r, mask_g, mask_b;
1595 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1574 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1596 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1575 rgba low;
1597 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1576 rgba high;
1598 int i; 1577 int i;
1599 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; 1578 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1600 1579
1601 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; 1580 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1602 1581
… …
1667 /* prepare limits for color transformation (each channel is handled separately) */ 1646 /* prepare limits for color transformation (each channel is handled separately) */
1668 if (shade > 100) 1647 if (shade > 100)
1669 { 1648 {
1670 shade = 200 - shade; 1649 shade = 200 - shade;
1671 1650
1672 lower_lim_r = 65535-rm; 1651 high.r = (65535 - c.r) * shade / 100;
1673 lower_lim_g = 65535-gm; 1652 high.g = (65535 - c.g) * shade / 100;
1674 lower_lim_b = 65535-bm; 1653 high.b = (65535 - c.b) * shade / 100;
1675 1654
1676 lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100); 1655 low.r = 65535 - high.r;
1677 lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100); 1656 low.g = 65535 - high.g;
1678 lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100); 1657 low.b = 65535 - high.b;
1679
1680 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1681 } 1658 }
1682 else 1659 else
1683 { 1660 {
1661 high.r = c.r * shade / 100;
1662 high.g = c.g * shade / 100;
1663 high.b = c.b * shade / 100;
1684 1664
1685 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1665 low.r = low.g = low.b = 0;
1686
1687 upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1688 upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1689 upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1690 } 1666 }
1691 1667
1692 /* fill our lookup tables */ 1668 /* fill our lookup tables */
1693 for (i = 0; i <= mask_r>>sh_r; i++) 1669 for (i = 0; i <= mask_r>>sh_r; i++)
1694 { 1670 {
1695 uint32_t tmp; 1671 uint32_t tmp;
1696 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r)); 1672 tmp = i * high.r;
1697 tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r); 1673 tmp += (mask_r>>sh_r) * low.r;
1698 lookup_r[i] = (tmp/65535)<<sh_r; 1674 lookup_r[i] = (tmp/65535)<<sh_r;
1699 } 1675 }
1700 for (i = 0; i <= mask_g>>sh_g; i++) 1676 for (i = 0; i <= mask_g>>sh_g; i++)
1701 { 1677 {
1702 uint32_t tmp; 1678 uint32_t tmp;
1703 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g)); 1679 tmp = i * high.g;
1704 tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g); 1680 tmp += (mask_g>>sh_g) * low.g;
1705 lookup_g[i] = (tmp/65535)<<sh_g; 1681 lookup_g[i] = (tmp/65535)<<sh_g;
1706 } 1682 }
1707 for (i = 0; i <= mask_b>>sh_b; i++) 1683 for (i = 0; i <= mask_b>>sh_b; i++)
1708 { 1684 {
1709 uint32_t tmp; 1685 uint32_t tmp;
1710 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b)); 1686 tmp = i * high.b;
1711 tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b); 1687 tmp += (mask_b>>sh_b) * low.b;
1712 lookup_b[i] = (tmp/65535)<<sh_b; 1688 lookup_b[i] = (tmp/65535)<<sh_b;
1713 } 1689 }
1714 1690
1715 /* apply table to input image (replacing colors by newly calculated ones) */ 1691 /* apply table to input image (replacing colors by newly calculated ones) */
1716 if (srcImage->bits_per_pixel == 32 1692 if (srcImage->bits_per_pixel == 32

Diff Legend

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