ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/background.C
(Generate patch)

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.96 by sf-exg, Fri Oct 22 16:49:26 2010 UTC vs.
Revision 1.117 by sf-exg, Fri Nov 12 22:00:05 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>
… …
168 return true; 172 return true;
169 } 173 }
170# endif 174# endif
171 175
172 return false; 176 return false;
173}; 177}
174 178
175bool bgPixmap_t::need_client_side_rendering () 179bool bgPixmap_t::need_client_side_rendering ()
176{ 180{
177# ifdef HAVE_AFTERIMAGE 181# ifdef HAVE_AFTERIMAGE
178 if (original_asim) 182 if (original_asim)
… …
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 !XFT
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 }
… …
856 dst_width, dst_height, 848 dst_width, dst_height,
857 XLIB_RGB_DITHER_NONE, 849 XLIB_RGB_DITHER_NONE,
858 0, 0); 850 0, 0);
859 } 851 }
860 852
861#if XFT 853#if XRENDER
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 XFT
1006 XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root);
1007 if (filters)
1008 {
1009 for (int i = 0; i < filters->nfilter; i++)
1010 if (!strcmp (filters->filter[i], FilterConvolution))
1011 flags |= bgPixmap_t::blurServerSide;
1012
1013 XFree (filters);
1014 }
1015#endif
1016
1017 return (changed > 0); 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{
… …
1044 { 1022 {
1045 flags |= bgPixmap_t::tintNeeded; 1023 flags |= bgPixmap_t::tintNeeded;
1046 } 1024 }
1047 } 1025 }
1048 1026
1049 if (flags & bgPixmap_t::tintNeeded)
1050 {
1051 if (flags & bgPixmap_t::tintWholesome)
1052 flags |= bgPixmap_t::tintServerSide;
1053 else
1054 {
1055#if XFT
1056 flags |= bgPixmap_t::tintServerSide;
1057#endif
1058 }
1059 }
1060
1061 return flags; 1027 return flags;
1062} 1028}
1063 1029
1064bool 1030bool
1065bgPixmap_t::set_tint (rxvt_color &new_tint) 1031bgPixmap_t::set_tint (rxvt_color &new_tint)
… …
1107 } 1073 }
1108 1074
1109 return false; 1075 return false;
1110} 1076}
1111 1077
1112#if XFT 1078#if XRENDER
1113static void 1079static void
1114get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 1080get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1115{ 1081{
1116 double sigma = radius / 2.0; 1082 double sigma = radius / 2.0;
1117 double scale = sqrt (2.0 * M_PI) * sigma; 1083 double scale = sqrt (2.0 * M_PI) * sigma;
… …
1134 1100
1135bool 1101bool
1136bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1102bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1137{ 1103{
1138 bool ret = false; 1104 bool ret = false;
1139#if XFT 1105#if XRENDER
1140 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1106 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1141 double *kernel = (double *)malloc (size * sizeof (double)); 1107 double *kernel = (double *)malloc (size * sizeof (double));
1142 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1108 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1143 1109
1144 Display *dpy = target->dpy; 1110 Display *dpy = target->dpy;
… …
1221 XFreeGC (dpy, gc); 1187 XFreeGC (dpy, gc);
1222 } 1188 }
1223 } 1189 }
1224 else 1190 else
1225 { 1191 {
1226# if XFT 1192# if XRENDER
1227 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1193 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1228 1194
1229 if (flags & tintSet) 1195 if (flags & tintSet)
1230 tint.get (c); 1196 tint.get (c);
1231 1197
… …
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;
… …
1284 1250
1285 return ret; 1251 return ret;
1286} 1252}
1287 1253
1288/* make_transparency_pixmap() 1254/* make_transparency_pixmap()
1289 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1255 * Builds a pixmap of the same size as the terminal window that contains
1290 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 1256 * the tiled portion of the root pixmap that is supposed to be covered by
1291 * our window. 1257 * our window.
1292 */ 1258 */
1293unsigned long 1259unsigned long
1294bgPixmap_t::make_transparency_pixmap () 1260bgPixmap_t::make_transparency_pixmap ()
1295{ 1261{
… …
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);
1309 unsigned int root_pmap_width, root_pmap_height; 1275 unsigned int root_pmap_width, root_pmap_height;
1310 int window_width = target->szHint.width; 1276 int window_width = target->szHint.width;
1311 int window_height = target->szHint.height; 1277 int window_height = target->szHint.height;
… …
1318 /* 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 : */
1319 if (sx + window_width <= 0 || sy + window_height <= 0 1285 if (sx + window_width <= 0 || sy + window_height <= 0
1320 || sx >= root_width || sy >= root_height) 1286 || sx >= root_width || sy >= root_height)
1321 return 0; 1287 return 0;
1322 1288
1289 // validate root pixmap and get its size
1323 if (root_pixmap != None) 1290 if (root_pixmap != None)
1324 { 1291 {
1325 /* we want to validate the pixmap and get its size at the same time : */ 1292 Window wdummy;
1326 int junk; 1293 int idummy;
1327 unsigned int ujunk; 1294 unsigned int udummy;
1328 /* root pixmap may be bad - allow a error */ 1295
1329 target->allowedxerror = -1; 1296 target->allowedxerror = -1;
1330 1297
1331 if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk)) 1298 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy))
1332 root_pixmap = None; 1299 root_pixmap = None;
1333 1300
1334 target->allowedxerror = 0; 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;
1335 } 1334 }
1336 1335
1337 if (root_pixmap == None) 1336 if (root_pixmap == None)
1338 return 0; 1337 return 0;
1339 1338
1340 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);
1341 1340
1342 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1341 if (tiled_root_pmap == None) /* something really bad happened - abort */
1343 return 0; 1342 return 0;
1344 1343
1345 /* straightforward pixmap copy */ 1344 /* straightforward pixmap copy */
1346 gcv.tile = root_pixmap; 1345 gcv.tile = recoded_root_pmap;
1347 gcv.fill_style = FillTiled; 1346 gcv.fill_style = FillTiled;
1348 1347
1349 while (sx < 0) sx += (int)root_width; 1348 while (sx < 0) sx += (int)root_width;
1350 while (sy < 0) sy += (int)root_height; 1349 while (sy < 0) sy += (int)root_height;
1351 1350
1352 gcv.ts_x_origin = -sx; 1351 gcv.ts_x_origin = -sx;
1353 gcv.ts_y_origin = -sy; 1352 gcv.ts_y_origin = -sy;
1354 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1353 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1355 1354
1356 if (gc) 1355 if (gc)
1357 { 1356 {
1358 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);
1359 result |= transpPmapTiled; 1358 result |= transpPmapTiled;
1360 XFreeGC (dpy, gc); 1359 XFreeGC (dpy, gc);
1361 }
1362 1360
1363 if (tiled_root_pmap != None)
1364 {
1365 if (!need_client_side_rendering ()) 1361 if (!need_client_side_rendering ())
1366 { 1362 {
1367 if (flags & (blurNeeded | blurServerSide)) 1363 if ((flags & blurNeeded)
1364 && (flags & HAS_RENDER_CONV))
1368 { 1365 {
1369 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))
1370 result |= transpPmapBlurred; 1367 result |= transpPmapBlurred;
1371 } 1368 }
1372 if (flags & (tintNeeded | tintServerSide)) 1369 if ((flags & tintNeeded)
1370 && (flags & (tintWholesome | HAS_RENDER)))
1373 { 1371 {
1374 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))
1375 result |= transpPmapTinted; 1373 result |= transpPmapTinted;
1376 } 1374 }
1377 } /* server side rendering completed */ 1375 } /* server side rendering completed */
1378 1376
1379 if (pixmap) 1377 if (pixmap)
1380 XFreePixmap (dpy, pixmap); 1378 XFreePixmap (dpy, pixmap);
1381 1379
1382 pixmap = tiled_root_pmap; 1380 pixmap = tiled_root_pmap;
1383 pmap_width = window_width; 1381 pmap_width = window_width;
1384 pmap_height = window_height; 1382 pmap_height = window_height;
1385 pmap_depth = root_depth; 1383 pmap_depth = target->depth;
1386 } 1384 }
1385 else
1386 XFreePixmap (dpy, tiled_root_pmap);
1387
1388 if (recoded_root_pmap != root_pixmap)
1389 XFreePixmap (dpy, recoded_root_pmap);
1387 1390
1388 return result; 1391 return result;
1389} 1392}
1390 1393
1391bool 1394void
1392bgPixmap_t::set_root_pixmap () 1395bgPixmap_t::set_root_pixmap ()
1393{ 1396{
1394 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1397 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1395 if (new_root_pixmap == None) 1398 if (new_root_pixmap == None)
1396 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1399 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1397 1400
1398 if (new_root_pixmap != root_pixmap)
1399 {
1400 root_pixmap = new_root_pixmap; 1401 root_pixmap = new_root_pixmap;
1401 return true;
1402 }
1403
1404 return false;
1405} 1402}
1406# endif /* ENABLE_TRANSPARENCY */ 1403# endif /* ENABLE_TRANSPARENCY */
1407 1404
1408# ifndef HAVE_AFTERIMAGE 1405#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1409static 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);
1410# endif 1407# endif
1411 1408
1412bool 1409bool
1413bgPixmap_t::render () 1410bgPixmap_t::render ()
1414{ 1411{
… …
1423 { 1420 {
1424 /* we need to re-generate transparency pixmap in that case ! */ 1421 /* we need to re-generate transparency pixmap in that case ! */
1425 background_flags = make_transparency_pixmap (); 1422 background_flags = make_transparency_pixmap ();
1426 if (background_flags == 0) 1423 if (background_flags == 0)
1427 return false; 1424 return false;
1428 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1425 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1429 && pmap_depth == target->depth)
1430 flags = flags & ~isInvalid; 1426 flags = flags & ~isInvalid;
1431 } 1427 }
1432# endif 1428# endif
1433 1429
1434# ifdef BG_IMAGE_FROM_FILE 1430# ifdef BG_IMAGE_FROM_FILE
… …
1438 if (render_image (background_flags)) 1434 if (render_image (background_flags))
1439 flags = flags & ~isInvalid; 1435 flags = flags & ~isInvalid;
1440 } 1436 }
1441# endif 1437# endif
1442 1438
1439# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1443 XImage *result = NULL; 1440 XImage *result = NULL;
1444 1441
1445 if (background_flags && (flags & isInvalid)) 1442 if (background_flags && (flags & isInvalid))
1446 { 1443 {
1447 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);
1448 } 1445 }
1449 1446
1450 if (result) 1447 if (result)
1451 { 1448 {
1452# if !defined(HAVE_AFTERIMAGE) && !XFT
1453 /* our own client-side tinting */ 1449 /* our own client-side tinting */
1454 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1455 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1456 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1450 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1457 { 1451 {
1458 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1452 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1459 if (flags & tintSet) 1453 if (flags & tintSet)
1460 tint.get (c); 1454 tint.get (c);
1461 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);
1462 } 1456 }
1463# endif
1464 1457
1465 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1458 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1466 1459
1467 if (gc) 1460 if (gc)
1468 { 1461 {
1469 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1470 {
1471 XFreePixmap (target->dpy, pixmap);
1472 pixmap = None;
1473 }
1474
1475 if (pixmap == None)
1476 {
1477 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1478 pmap_width = result->width;
1479 pmap_height = result->height;
1480 pmap_depth = target->depth;
1481 }
1482
1483 if (pmap_depth != result->depth)
1484 {
1485 /* Bad Match error will ensue ! stupid X !!!! */
1486 if (result->depth == 24 && pmap_depth == 32)
1487 result->depth = 32;
1488 else if (result->depth == 32 && pmap_depth == 24)
1489 result->depth = 24;
1490 else
1491 {
1492 /* TODO: implement image recoding */
1493 }
1494 }
1495
1496 if (pmap_depth == result->depth)
1497 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1462 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1498 1463
1499 XFreeGC (target->dpy, gc); 1464 XFreeGC (target->dpy, gc);
1500 flags = flags & ~isInvalid; 1465 flags = flags & ~isInvalid;
1501 } 1466 }
1502 1467
1503 XDestroyImage (result); 1468 XDestroyImage (result);
1504 } 1469 }
1470# endif
1505 1471
1506 if (flags & isInvalid) 1472 if (flags & isInvalid)
1507 { 1473 {
1508 if (pixmap != None) 1474 if (pixmap != None)
1509 { 1475 {
… …
1517 valid_since = ev::now (); 1483 valid_since = ev::now ();
1518 1484
1519 return true; 1485 return true;
1520} 1486}
1521 1487
1522bool 1488void
1523bgPixmap_t::set_target (rxvt_term *new_target) 1489bgPixmap_t::set_target (rxvt_term *new_target)
1524{ 1490{
1525 if (new_target)
1526 if (target != new_target)
1527 {
1528 target = new_target; 1491 target = new_target;
1529# ifdef ENABLE_TRANSPARENCY 1492
1530 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 }
1531# endif 1507#endif
1532 return true;
1533 }
1534
1535 return false;
1536} 1508}
1537 1509
1538void 1510void
1539bgPixmap_t::apply () 1511bgPixmap_t::apply ()
1540{ 1512{
1541 if (target) 1513 if (target == NULL)
1542 { 1514 return;
1543 flags &= ~isVtOrigin;
1544 1515
1545 if (pixmap != None) 1516 if (pixmap != None)
1546 { 1517 {
1547 /* set target's background to pixmap */ 1518 /* set target's background to pixmap */
1548# ifdef ENABLE_TRANSPARENCY 1519# ifdef ENABLE_TRANSPARENCY
1549 if (flags & isTransparent) 1520 if (flags & isTransparent)
1550 { 1521 {
1551 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1522 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1552 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1523 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1553 1524
1554 if (target->scrollBar.win) 1525 if (target->scrollBar.win)
1555 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1526 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1556 } 1527 }
1557 else 1528 else
1558# endif 1529# endif
1559 { 1530 {
1560 flags |= isVtOrigin;
1561 /* force old pixmap dereference in case it was transparent before :*/ 1531 /* force old pixmap dereference in case it was transparent before :*/
1562 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1563 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1564 /* do we also need to set scrollbar's background here ? */
1565
1566 if (target->scrollBar.win)
1567 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1568 }
1569 }
1570 else
1571 {
1572 /* set target background to a pixel */
1573 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1532 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1574 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1533 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1575 /* do we also need to set scrollbar's background here ? */ 1534 /* do we also need to set scrollbar's background here ? */
1535
1576 if (target->scrollBar.win) 1536 if (target->scrollBar.win)
1577 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1537 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1578 } 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 }
1579 1549
1580 /* 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
1581 scr_touch or we get a great deal of flicker otherwise: */ 1551 scr_touch or we get a great deal of flicker otherwise: */
1582 XClearWindow (target->dpy, target->parent[0]); 1552 XClearWindow (target->dpy, target->parent[0]);
1583 1553
1584 if (target->scrollBar.state && target->scrollBar.win) 1554 if (target->scrollBar.state && target->scrollBar.win)
1585 { 1555 {
1586 target->scrollBar.state = STATE_IDLE; 1556 target->scrollBar.state = STATE_IDLE;
1587 target->scrollBar.show (0); 1557 target->scrollBar.show (0);
1588 } 1558 }
1589 1559
1590 target->want_refresh = 1; 1560 target->want_refresh = 1;
1591 flags |= hasChanged; 1561 flags |= hasChanged;
1592 }
1593} 1562}
1594 1563
1595#endif /* HAVE_BG_PIXMAP */ 1564#endif /* HAVE_BG_PIXMAP */
1596 1565
1597#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1566#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1598/* taken from aterm-0.4.2 */ 1567/* taken from aterm-0.4.2 */
1599 1568
1600static void 1569static void
1601ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm) 1570ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c)
1602{ 1571{
1603 int sh_r, sh_g, sh_b; 1572 int sh_r, sh_g, sh_b;
1604 uint32_t mask_r, mask_g, mask_b; 1573 uint32_t mask_r, mask_g, mask_b;
1605 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1574 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1606 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1575 rgba low;
1607 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1576 rgba high;
1608 int i; 1577 int i;
1609 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; 1578 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1610 1579
1611 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; 1580 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1612 1581
… …
1677 /* prepare limits for color transformation (each channel is handled separately) */ 1646 /* prepare limits for color transformation (each channel is handled separately) */
1678 if (shade > 100) 1647 if (shade > 100)
1679 { 1648 {
1680 shade = 200 - shade; 1649 shade = 200 - shade;
1681 1650
1682 lower_lim_r = 65535-rm; 1651 high.r = (65535 - c.r) * shade / 100;
1683 lower_lim_g = 65535-gm; 1652 high.g = (65535 - c.g) * shade / 100;
1684 lower_lim_b = 65535-bm; 1653 high.b = (65535 - c.b) * shade / 100;
1685 1654
1686 lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100); 1655 low.r = 65535 - high.r;
1687 lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100); 1656 low.g = 65535 - high.g;
1688 lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100); 1657 low.b = 65535 - high.b;
1689
1690 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1691 } 1658 }
1692 else 1659 else
1693 { 1660 {
1661 high.r = c.r * shade / 100;
1662 high.g = c.g * shade / 100;
1663 high.b = c.b * shade / 100;
1694 1664
1695 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1665 low.r = low.g = low.b = 0;
1696
1697 upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1698 upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1699 upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1700 } 1666 }
1701 1667
1702 /* fill our lookup tables */ 1668 /* fill our lookup tables */
1703 for (i = 0; i <= mask_r>>sh_r; i++) 1669 for (i = 0; i <= mask_r>>sh_r; i++)
1704 { 1670 {
1705 uint32_t tmp; 1671 uint32_t tmp;
1706 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r)); 1672 tmp = i * high.r;
1707 tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r); 1673 tmp += (mask_r>>sh_r) * low.r;
1708 lookup_r[i] = (tmp/65535)<<sh_r; 1674 lookup_r[i] = (tmp/65535)<<sh_r;
1709 } 1675 }
1710 for (i = 0; i <= mask_g>>sh_g; i++) 1676 for (i = 0; i <= mask_g>>sh_g; i++)
1711 { 1677 {
1712 uint32_t tmp; 1678 uint32_t tmp;
1713 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g)); 1679 tmp = i * high.g;
1714 tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g); 1680 tmp += (mask_g>>sh_g) * low.g;
1715 lookup_g[i] = (tmp/65535)<<sh_g; 1681 lookup_g[i] = (tmp/65535)<<sh_g;
1716 } 1682 }
1717 for (i = 0; i <= mask_b>>sh_b; i++) 1683 for (i = 0; i <= mask_b>>sh_b; i++)
1718 { 1684 {
1719 uint32_t tmp; 1685 uint32_t tmp;
1720 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b)); 1686 tmp = i * high.b;
1721 tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b); 1687 tmp += (mask_b>>sh_b) * low.b;
1722 lookup_b[i] = (tmp/65535)<<sh_b; 1688 lookup_b[i] = (tmp/65535)<<sh_b;
1723 } 1689 }
1724 1690
1725 /* apply table to input image (replacing colors by newly calculated ones) */ 1691 /* apply table to input image (replacing colors by newly calculated ones) */
1726 if (srcImage->bits_per_pixel == 32 1692 if (srcImage->bits_per_pixel == 32

Diff Legend

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