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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.95 by sf-exg, Fri Oct 22 16:21:05 2010 UTC vs.
Revision 1.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 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
434 // flags, h_scale, v_scale, h_align, v_align);
435 return (changed > 0); 438 return changed;
436} 439}
437 440
438void 441void
439bgPixmap_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)
440{ 443{
… …
663 if (result) 666 if (result)
664 { 667 {
665 XGCValues gcv; 668 XGCValues gcv;
666 GC gc; 669 GC gc;
667 670
668 if (pixmap)
669 {
670 if (pmap_width != new_pmap_width
671 || pmap_height != new_pmap_height
672 || pmap_depth != target->depth)
673 {
674 XFreePixmap (target->dpy, pixmap);
675 pixmap = None;
676 }
677 }
678
679 /* create Pixmap */ 671 /* create Pixmap */
680 if (pixmap == None) 672 if (pixmap == None
673 || pmap_width != new_pmap_width
674 || pmap_height != new_pmap_height
675 || pmap_depth != target->depth)
681 { 676 {
677 if (pixmap)
678 XFreePixmap (target->dpy, pixmap);
682 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);
683 pmap_width = new_pmap_width; 680 pmap_width = new_pmap_width;
684 pmap_height = new_pmap_height; 681 pmap_height = new_pmap_height;
685 pmap_depth = target->depth; 682 pmap_depth = target->depth;
686 } 683 }
… …
731 return false; 728 return false;
732 729
733 if (!pixbuf) 730 if (!pixbuf)
734 return false; 731 return false;
735 732
736#if !XFT
737 if (background_flags) 733 if (background_flags
734 && !(flags & HAS_RENDER))
738 return false; 735 return false;
739#endif
740 736
741 GdkPixbuf *result; 737 GdkPixbuf *result;
742 738
743 int image_width = gdk_pixbuf_get_width (pixbuf); 739 int image_width = gdk_pixbuf_get_width (pixbuf);
744 int image_height = gdk_pixbuf_get_height (pixbuf); 740 int image_height = gdk_pixbuf_get_height (pixbuf);
… …
795 new_pmap_width = min (image_width, target_width); 791 new_pmap_width = min (image_width, target_width);
796 new_pmap_height = min (image_height, target_height); 792 new_pmap_height = min (image_height, target_height);
797 } 793 }
798 } 794 }
799 795
800 if (pixmap)
801 {
802 if (pmap_width != new_pmap_width
803 || pmap_height != new_pmap_height
804 || pmap_depth != target->depth)
805 {
806 XFreePixmap (target->dpy, pixmap);
807 pixmap = None;
808 }
809 }
810
811 if (pixmap == None) 796 if (pixmap == None
797 || pmap_width != new_pmap_width
798 || pmap_height != new_pmap_height
799 || pmap_depth != target->depth)
812 { 800 {
801 if (pixmap)
802 XFreePixmap (target->dpy, pixmap);
813 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);
814 pmap_width = new_pmap_width; 804 pmap_width = new_pmap_width;
815 pmap_height = new_pmap_height; 805 pmap_height = new_pmap_height;
816 pmap_depth = target->depth; 806 pmap_depth = target->depth;
817 } 807 }
… …
858 dst_width, dst_height, 848 dst_width, dst_height,
859 XLIB_RGB_DITHER_NONE, 849 XLIB_RGB_DITHER_NONE,
860 0, 0); 850 0, 0);
861 } 851 }
862 852
863#if XFT 853#if XRENDER
864 if (background_flags) 854 if (background_flags)
865 { 855 {
866 Display *dpy = target->dpy; 856 Display *dpy = target->dpy;
867 XRenderPictureAttributes pa; 857 XRenderPictureAttributes pa;
868 858
869 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen)); 859 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, target->visual);
870 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 860 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
871 861
872 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); 862 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
873 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa); 863 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
874 864
… …
911# endif /* HAVE_PIXBUF */ 901# endif /* HAVE_PIXBUF */
912 902
913bool 903bool
914bgPixmap_t::set_file (const char *file) 904bgPixmap_t::set_file (const char *file)
915{ 905{
916 assert (file); 906 if (!file || !*file)
907 return false;
917 908
918 if (*file)
919 {
920 if (const char *p = strchr (file, ';')) 909 if (const char *p = strchr (file, ';'))
921 { 910 {
922 size_t len = p - file; 911 size_t len = p - file;
923 char *f = rxvt_temp_buf<char> (len + 1); 912 char *f = rxvt_temp_buf<char> (len + 1);
924 memcpy (f, file, len); 913 memcpy (f, file, len);
925 f[len] = '\0'; 914 f[len] = '\0';
926 file = f; 915 file = f;
927 } 916 }
928 917
929# ifdef HAVE_AFTERIMAGE 918# ifdef HAVE_AFTERIMAGE
930 if (!target->asimman) 919 if (!target->asimman)
931 target->asimman = create_generic_imageman (target->rs[Rs_path]); 920 target->asimman = create_generic_imageman (target->rs[Rs_path]);
932 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 921 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
933 if (image) 922 if (image)
934 { 923 {
935 if (original_asim) 924 if (original_asim)
936 safe_asimage_destroy (original_asim); 925 safe_asimage_destroy (original_asim);
937 original_asim = image; 926 original_asim = image;
938 have_image = true; 927 have_image = true;
939 return true; 928 return true;
940 } 929 }
941# endif 930# endif
942 931
943# ifdef HAVE_PIXBUF 932# ifdef HAVE_PIXBUF
944 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 933 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
945 if (image) 934 if (image)
946 { 935 {
947 if (pixbuf) 936 if (pixbuf)
948 g_object_unref (pixbuf); 937 g_object_unref (pixbuf);
949 pixbuf = image; 938 pixbuf = image;
950 have_image = true; 939 have_image = true;
951 return true; 940 return true;
952 } 941 }
953# endif 942# endif
954 }
955 943
956 return false; 944 return false;
957} 945}
958 946
959# endif /* BG_IMAGE_FROM_FILE */ 947# endif /* BG_IMAGE_FROM_FILE */
… …
972} 960}
973 961
974bool 962bool
975bgPixmap_t::set_blur_radius (const char *geom) 963bgPixmap_t::set_blur_radius (const char *geom)
976{ 964{
977 int changed = 0; 965 bool changed = false;
978 unsigned int hr, vr; 966 unsigned int hr, vr;
979 int junk; 967 int junk;
980 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 968 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
981 969
982 if (!(geom_flags & WidthValue)) 970 if (!(geom_flags & WidthValue))
… …
987 min_it (hr, 128); 975 min_it (hr, 128);
988 min_it (vr, 128); 976 min_it (vr, 128);
989 977
990 if (h_blurRadius != hr) 978 if (h_blurRadius != hr)
991 { 979 {
992 ++changed; 980 changed = true;
993 h_blurRadius = hr; 981 h_blurRadius = hr;
994 } 982 }
995 983
996 if (v_blurRadius != vr) 984 if (v_blurRadius != vr)
997 { 985 {
998 ++changed; 986 changed = true;
999 v_blurRadius = vr; 987 v_blurRadius = vr;
1000 } 988 }
1001 989
1002 if (v_blurRadius == 0 && h_blurRadius == 0) 990 if (v_blurRadius == 0 && h_blurRadius == 0)
1003 flags &= ~blurNeeded; 991 flags &= ~blurNeeded;
1004 else 992 else
1005 flags |= blurNeeded; 993 flags |= blurNeeded;
1006 994
1007#if XFT
1008 XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root);
1009 if (filters)
1010 {
1011 for (int i = 0; i < filters->nfilter; i++)
1012 if (!strcmp (filters->filter[i], FilterConvolution))
1013 flags |= bgPixmap_t::blurServerSide;
1014
1015 XFree (filters);
1016 }
1017#endif
1018
1019 return (changed > 0); 995 return changed;
1020} 996}
1021 997
1022static inline unsigned long 998static inline unsigned long
1023compute_tint_shade_flags (rxvt_color *tint, int shade) 999compute_tint_shade_flags (rxvt_color *tint, int shade)
1024{ 1000{
… …
1046 { 1022 {
1047 flags |= bgPixmap_t::tintNeeded; 1023 flags |= bgPixmap_t::tintNeeded;
1048 } 1024 }
1049 } 1025 }
1050 1026
1051 if (flags & bgPixmap_t::tintNeeded)
1052 {
1053 if (flags & bgPixmap_t::tintWholesome)
1054 flags |= bgPixmap_t::tintServerSide;
1055 else
1056 {
1057#if XFT
1058 flags |= bgPixmap_t::tintServerSide;
1059#endif
1060 }
1061 }
1062
1063 return flags; 1027 return flags;
1064} 1028}
1065 1029
1066bool 1030bool
1067bgPixmap_t::set_tint (rxvt_color &new_tint) 1031bgPixmap_t::set_tint (rxvt_color &new_tint)
… …
1109 } 1073 }
1110 1074
1111 return false; 1075 return false;
1112} 1076}
1113 1077
1114#if XFT 1078#if XRENDER
1115static void 1079static void
1116get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 1080get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1117{ 1081{
1118 double sigma = radius / 2.0; 1082 double sigma = radius / 2.0;
1119 double scale = sqrt (2.0 * M_PI) * sigma; 1083 double scale = sqrt (2.0 * M_PI) * sigma;
… …
1136 1100
1137bool 1101bool
1138bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1102bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1139{ 1103{
1140 bool ret = false; 1104 bool ret = false;
1141#if XFT 1105#if XRENDER
1142 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1106 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1143 double *kernel = (double *)malloc (size * sizeof (double)); 1107 double *kernel = (double *)malloc (size * sizeof (double));
1144 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1108 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1145 1109
1146 Display *dpy = target->dpy; 1110 Display *dpy = target->dpy;
… …
1223 XFreeGC (dpy, gc); 1187 XFreeGC (dpy, gc);
1224 } 1188 }
1225 } 1189 }
1226 else 1190 else
1227 { 1191 {
1228# if XFT 1192# if XRENDER
1229 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1193 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1230 1194
1231 if (flags & tintSet) 1195 if (flags & tintSet)
1232 tint.get (c); 1196 tint.get (c);
1233 1197
… …
1263 1227
1264 if (mask_pic && overlay_pic && back_pic) 1228 if (mask_pic && overlay_pic && back_pic)
1265 { 1229 {
1266 XRenderColor mask_c; 1230 XRenderColor mask_c;
1267 1231
1268 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); 1232 mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0;
1269 mask_c.alpha = 0xffff; 1233 mask_c.alpha = 0xffff;
1270 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1234 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1271 1235
1272 mask_c.alpha = 0; 1236 mask_c.alpha = 0;
1273 mask_c.red = 0xffff - c.r; 1237 mask_c.red = 0xffff - c.r;
… …
1286 1250
1287 return ret; 1251 return ret;
1288} 1252}
1289 1253
1290/* make_transparency_pixmap() 1254/* make_transparency_pixmap()
1291 * 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
1292 * 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
1293 * our window. 1257 * our window.
1294 */ 1258 */
1295unsigned long 1259unsigned long
1296bgPixmap_t::make_transparency_pixmap () 1260bgPixmap_t::make_transparency_pixmap ()
1297{ 1261{
… …
1301 return 0; 1265 return 0;
1302 1266
1303 /* 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
1304 * be always up-to-date, so let's use it : 1268 * be always up-to-date, so let's use it :
1305 */ 1269 */
1306 Window root = target->display->root;
1307 int screen = target->display->screen; 1270 int screen = target->display->screen;
1308 Display *dpy = target->dpy; 1271 Display *dpy = target->dpy;
1272 int root_depth = DefaultDepth (dpy, screen);
1309 int root_width = DisplayWidth (dpy, screen); 1273 int root_width = DisplayWidth (dpy, screen);
1310 int root_height = DisplayHeight (dpy, screen); 1274 int root_height = DisplayHeight (dpy, screen);
1311 unsigned int root_pmap_width, root_pmap_height; 1275 unsigned int root_pmap_width, root_pmap_height;
1312 int window_width = target->szHint.width; 1276 int window_width = target->szHint.width;
1313 int window_height = target->szHint.height; 1277 int window_height = target->szHint.height;
… …
1320 /* 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 : */
1321 if (sx + window_width <= 0 || sy + window_height <= 0 1285 if (sx + window_width <= 0 || sy + window_height <= 0
1322 || sx >= root_width || sy >= root_height) 1286 || sx >= root_width || sy >= root_height)
1323 return 0; 1287 return 0;
1324 1288
1289 // validate root pixmap and get its size
1325 if (root_pixmap != None) 1290 if (root_pixmap != None)
1326 { 1291 {
1327 /* we want to validate the pixmap and get its size at the same time : */ 1292 Window wdummy;
1328 int junk; 1293 int idummy;
1329 unsigned int ujunk; 1294 unsigned int udummy;
1330 /* root pixmap may be bad - allow a error */ 1295
1331 target->allowedxerror = -1; 1296 target->allowedxerror = -1;
1332 1297
1333 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))
1334 root_pixmap = None; 1299 root_pixmap = None;
1335 1300
1336 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;
1337 } 1334 }
1338 1335
1339 if (root_pixmap == None) 1336 if (root_pixmap == None)
1340 return 0; 1337 return 0;
1341 1338
1342 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);
1343 1340
1344 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1341 if (tiled_root_pmap == None) /* something really bad happened - abort */
1345 return 0; 1342 return 0;
1346 1343
1347 /* straightforward pixmap copy */ 1344 /* straightforward pixmap copy */
1348 gcv.tile = root_pixmap; 1345 gcv.tile = recoded_root_pmap;
1349 gcv.fill_style = FillTiled; 1346 gcv.fill_style = FillTiled;
1350 1347
1351 while (sx < 0) sx += (int)root_width; 1348 while (sx < 0) sx += (int)root_width;
1352 while (sy < 0) sy += (int)root_height; 1349 while (sy < 0) sy += (int)root_height;
1353 1350
1354 gcv.ts_x_origin = -sx; 1351 gcv.ts_x_origin = -sx;
1355 gcv.ts_y_origin = -sy; 1352 gcv.ts_y_origin = -sy;
1356 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1353 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1357 1354
1358 if (gc) 1355 if (gc)
1359 { 1356 {
1360 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);
1361 result |= transpPmapTiled; 1358 result |= transpPmapTiled;
1362 XFreeGC (dpy, gc); 1359 XFreeGC (dpy, gc);
1363 }
1364 1360
1365 if (tiled_root_pmap != None)
1366 {
1367 if (!need_client_side_rendering ()) 1361 if (!need_client_side_rendering ())
1368 { 1362 {
1369 if (flags & (blurNeeded | blurServerSide)) 1363 if ((flags & blurNeeded)
1364 && (flags & HAS_RENDER_CONV))
1370 { 1365 {
1371 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))
1372 result |= transpPmapBlurred; 1367 result |= transpPmapBlurred;
1373 } 1368 }
1374 if (flags & (tintNeeded | tintServerSide)) 1369 if ((flags & tintNeeded)
1370 && (flags & (tintWholesome | HAS_RENDER)))
1375 { 1371 {
1376 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))
1377 result |= transpPmapTinted; 1373 result |= transpPmapTinted;
1378 } 1374 }
1379 } /* server side rendering completed */ 1375 } /* server side rendering completed */
1380 1376
1381 if (pixmap) 1377 if (pixmap)
1382 XFreePixmap (dpy, pixmap); 1378 XFreePixmap (dpy, pixmap);
1383 1379
1384 pixmap = tiled_root_pmap; 1380 pixmap = tiled_root_pmap;
1385 pmap_width = window_width; 1381 pmap_width = window_width;
1386 pmap_height = window_height; 1382 pmap_height = window_height;
1387 pmap_depth = root_depth; 1383 pmap_depth = target->depth;
1388 } 1384 }
1385 else
1386 XFreePixmap (dpy, tiled_root_pmap);
1387
1388 if (recoded_root_pmap != root_pixmap)
1389 XFreePixmap (dpy, recoded_root_pmap);
1389 1390
1390 return result; 1391 return result;
1391} 1392}
1392 1393
1393bool 1394void
1394bgPixmap_t::set_root_pixmap () 1395bgPixmap_t::set_root_pixmap ()
1395{ 1396{
1396 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1397 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1397 if (new_root_pixmap == None) 1398 if (new_root_pixmap == None)
1398 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1399 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1399 1400
1400 if (new_root_pixmap != root_pixmap)
1401 {
1402 root_pixmap = new_root_pixmap; 1401 root_pixmap = new_root_pixmap;
1403 return true;
1404 }
1405
1406 return false;
1407} 1402}
1408# endif /* ENABLE_TRANSPARENCY */ 1403# endif /* ENABLE_TRANSPARENCY */
1409 1404
1410# ifndef HAVE_AFTERIMAGE 1405#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1411static 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);
1412# endif 1407# endif
1413 1408
1414bool 1409bool
1415bgPixmap_t::render () 1410bgPixmap_t::render ()
1416{ 1411{
… …
1425 { 1420 {
1426 /* we need to re-generate transparency pixmap in that case ! */ 1421 /* we need to re-generate transparency pixmap in that case ! */
1427 background_flags = make_transparency_pixmap (); 1422 background_flags = make_transparency_pixmap ();
1428 if (background_flags == 0) 1423 if (background_flags == 0)
1429 return false; 1424 return false;
1430 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1425 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1431 && pmap_depth == target->depth)
1432 flags = flags & ~isInvalid; 1426 flags = flags & ~isInvalid;
1433 } 1427 }
1434# endif 1428# endif
1435 1429
1436# ifdef BG_IMAGE_FROM_FILE 1430# ifdef BG_IMAGE_FROM_FILE
… …
1440 if (render_image (background_flags)) 1434 if (render_image (background_flags))
1441 flags = flags & ~isInvalid; 1435 flags = flags & ~isInvalid;
1442 } 1436 }
1443# endif 1437# endif
1444 1438
1439# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1445 XImage *result = NULL; 1440 XImage *result = NULL;
1446 1441
1447 if (background_flags && (flags & isInvalid)) 1442 if (background_flags && (flags & isInvalid))
1448 { 1443 {
1449 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);
1450 } 1445 }
1451 1446
1452 if (result) 1447 if (result)
1453 { 1448 {
1454# if !defined(HAVE_AFTERIMAGE) && !XFT
1455 /* our own client-side tinting */ 1449 /* our own client-side tinting */
1456 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1457 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1458 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1450 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1459 { 1451 {
1460 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1452 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1461 if (flags & tintSet) 1453 if (flags & tintSet)
1462 tint.get (c); 1454 tint.get (c);
1463 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);
1464 } 1456 }
1465# endif
1466 1457
1467 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1458 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1468 1459
1469 if (gc) 1460 if (gc)
1470 { 1461 {
1471 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1472 {
1473 XFreePixmap (target->dpy, pixmap);
1474 pixmap = None;
1475 }
1476
1477 if (pixmap == None)
1478 {
1479 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1480 pmap_width = result->width;
1481 pmap_height = result->height;
1482 pmap_depth = target->depth;
1483 }
1484
1485 if (pmap_depth != result->depth)
1486 {
1487 /* Bad Match error will ensue ! stupid X !!!! */
1488 if (result->depth == 24 && pmap_depth == 32)
1489 result->depth = 32;
1490 else if (result->depth == 32 && pmap_depth == 24)
1491 result->depth = 24;
1492 else
1493 {
1494 /* TODO: implement image recoding */
1495 }
1496 }
1497
1498 if (pmap_depth == result->depth)
1499 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1462 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1500 1463
1501 XFreeGC (target->dpy, gc); 1464 XFreeGC (target->dpy, gc);
1502 flags = flags & ~isInvalid; 1465 flags = flags & ~isInvalid;
1503 } 1466 }
1504 1467
1505 XDestroyImage (result); 1468 XDestroyImage (result);
1506 } 1469 }
1470# endif
1507 1471
1508 if (flags & isInvalid) 1472 if (flags & isInvalid)
1509 { 1473 {
1510 if (pixmap != None) 1474 if (pixmap != None)
1511 { 1475 {
… …
1519 valid_since = ev::now (); 1483 valid_since = ev::now ();
1520 1484
1521 return true; 1485 return true;
1522} 1486}
1523 1487
1524bool 1488void
1525bgPixmap_t::set_target (rxvt_term *new_target) 1489bgPixmap_t::set_target (rxvt_term *new_target)
1526{ 1490{
1527 if (new_target)
1528 if (target != new_target)
1529 {
1530 target = new_target; 1491 target = new_target;
1531# ifdef ENABLE_TRANSPARENCY 1492
1532 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 }
1533# endif 1507#endif
1534 return true;
1535 }
1536
1537 return false;
1538} 1508}
1539 1509
1540void 1510void
1541bgPixmap_t::apply () 1511bgPixmap_t::apply ()
1542{ 1512{
1543 if (target) 1513 if (target == NULL)
1544 { 1514 return;
1545 flags &= ~isVtOrigin;
1546 1515
1547 if (pixmap != None) 1516 if (pixmap != None)
1548 { 1517 {
1549 /* set target's background to pixmap */ 1518 /* set target's background to pixmap */
1550# ifdef ENABLE_TRANSPARENCY 1519# ifdef ENABLE_TRANSPARENCY
1551 if (flags & isTransparent) 1520 if (flags & isTransparent)
1552 { 1521 {
1553 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1522 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1554 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1523 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1555 1524
1556 if (target->scrollBar.win) 1525 if (target->scrollBar.win)
1557 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1526 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1558 } 1527 }
1559 else 1528 else
1560# endif 1529# endif
1561 { 1530 {
1562 flags |= isVtOrigin;
1563 /* force old pixmap dereference in case it was transparent before :*/ 1531 /* force old pixmap dereference in case it was transparent before :*/
1564 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1565 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1566 /* do we also need to set scrollbar's background here ? */
1567
1568 if (target->scrollBar.win)
1569 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1570 }
1571 }
1572 else
1573 {
1574 /* set target background to a pixel */
1575 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1532 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1576 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1533 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1577 /* do we also need to set scrollbar's background here ? */ 1534 /* do we also need to set scrollbar's background here ? */
1535
1578 if (target->scrollBar.win) 1536 if (target->scrollBar.win)
1579 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1537 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1580 } 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 }
1581 1549
1582 /* 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
1583 scr_touch or we get a great deal of flicker otherwise: */ 1551 scr_touch or we get a great deal of flicker otherwise: */
1584 XClearWindow (target->dpy, target->parent[0]); 1552 XClearWindow (target->dpy, target->parent[0]);
1585 1553
1586 if (target->scrollBar.state && target->scrollBar.win) 1554 if (target->scrollBar.state && target->scrollBar.win)
1587 { 1555 {
1588 target->scrollBar.state = STATE_IDLE; 1556 target->scrollBar.state = STATE_IDLE;
1589 target->scrollBar.show (0); 1557 target->scrollBar.show (0);
1590 } 1558 }
1591 1559
1592 target->want_refresh = 1; 1560 target->want_refresh = 1;
1593 flags |= hasChanged; 1561 flags |= hasChanged;
1594 }
1595} 1562}
1596 1563
1597#endif /* HAVE_BG_PIXMAP */ 1564#endif /* HAVE_BG_PIXMAP */
1598 1565
1599#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1566#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1600/* taken from aterm-0.4.2 */ 1567/* taken from aterm-0.4.2 */
1601 1568
1602static void 1569static void
1603ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm) 1570ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c)
1604{ 1571{
1605 int sh_r, sh_g, sh_b; 1572 int sh_r, sh_g, sh_b;
1606 uint32_t mask_r, mask_g, mask_b; 1573 uint32_t mask_r, mask_g, mask_b;
1607 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1574 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1608 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1575 rgba low;
1609 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1576 rgba high;
1610 int i; 1577 int i;
1611 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; 1578 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1612 1579
1613 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; 1580 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1614 1581
… …
1679 /* prepare limits for color transformation (each channel is handled separately) */ 1646 /* prepare limits for color transformation (each channel is handled separately) */
1680 if (shade > 100) 1647 if (shade > 100)
1681 { 1648 {
1682 shade = 200 - shade; 1649 shade = 200 - shade;
1683 1650
1684 lower_lim_r = 65535-rm; 1651 high.r = (65535 - c.r) * shade / 100;
1685 lower_lim_g = 65535-gm; 1652 high.g = (65535 - c.g) * shade / 100;
1686 lower_lim_b = 65535-bm; 1653 high.b = (65535 - c.b) * shade / 100;
1687 1654
1688 lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100); 1655 low.r = 65535 - high.r;
1689 lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100); 1656 low.g = 65535 - high.g;
1690 lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100); 1657 low.b = 65535 - high.b;
1691
1692 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1693 } 1658 }
1694 else 1659 else
1695 { 1660 {
1661 high.r = c.r * shade / 100;
1662 high.g = c.g * shade / 100;
1663 high.b = c.b * shade / 100;
1696 1664
1697 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1665 low.r = low.g = low.b = 0;
1698
1699 upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1700 upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1701 upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1702 } 1666 }
1703 1667
1704 /* fill our lookup tables */ 1668 /* fill our lookup tables */
1705 for (i = 0; i <= mask_r>>sh_r; i++) 1669 for (i = 0; i <= mask_r>>sh_r; i++)
1706 { 1670 {
1707 uint32_t tmp; 1671 uint32_t tmp;
1708 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r)); 1672 tmp = i * high.r;
1709 tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r); 1673 tmp += (mask_r>>sh_r) * low.r;
1710 lookup_r[i] = (tmp/65535)<<sh_r; 1674 lookup_r[i] = (tmp/65535)<<sh_r;
1711 } 1675 }
1712 for (i = 0; i <= mask_g>>sh_g; i++) 1676 for (i = 0; i <= mask_g>>sh_g; i++)
1713 { 1677 {
1714 uint32_t tmp; 1678 uint32_t tmp;
1715 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g)); 1679 tmp = i * high.g;
1716 tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g); 1680 tmp += (mask_g>>sh_g) * low.g;
1717 lookup_g[i] = (tmp/65535)<<sh_g; 1681 lookup_g[i] = (tmp/65535)<<sh_g;
1718 } 1682 }
1719 for (i = 0; i <= mask_b>>sh_b; i++) 1683 for (i = 0; i <= mask_b>>sh_b; i++)
1720 { 1684 {
1721 uint32_t tmp; 1685 uint32_t tmp;
1722 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b)); 1686 tmp = i * high.b;
1723 tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b); 1687 tmp += (mask_b>>sh_b) * low.b;
1724 lookup_b[i] = (tmp/65535)<<sh_b; 1688 lookup_b[i] = (tmp/65535)<<sh_b;
1725 } 1689 }
1726 1690
1727 /* apply table to input image (replacing colors by newly calculated ones) */ 1691 /* apply table to input image (replacing colors by newly calculated ones) */
1728 if (srcImage->bits_per_pixel == 32 1692 if (srcImage->bits_per_pixel == 32

Diff Legend

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