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.94 by sf-exg, Wed Oct 20 09:04:55 2010 UTC vs.
Revision 1.114 by sf-exg, Wed Nov 10 13:15:08 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 //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{
… …
529 532
530 int x = 0; 533 int x = 0;
531 int y = 0; 534 int y = 0;
532 int w = 0; 535 int w = 0;
533 int h = 0; 536 int h = 0;
534
535 TIMING_TEST_START (asim);
536 537
537 if (original_asim) 538 if (original_asim)
538 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y); 539 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
539 540
540 if (!original_asim 541 if (!original_asim
… …
657 } 658 }
658 659
659 free (layers); 660 free (layers);
660 } 661 }
661 } 662 }
662 TIMING_TEST_PRINT_RESULT (asim);
663 663
664 bool ret = false; 664 bool ret = false;
665 665
666 if (result) 666 if (result)
667 { 667 {
… …
713 713
714 if (result != background && result != original_asim) 714 if (result != background && result != original_asim)
715 destroy_asimage (&result); 715 destroy_asimage (&result);
716 716
717 XFreeGC (target->dpy, gc); 717 XFreeGC (target->dpy, gc);
718 TIMING_TEST_PRINT_RESULT (asim);
719 718
720 ret = true; 719 ret = true;
721 } 720 }
722 721
723 if (background) 722 if (background)
… …
735 return false; 734 return false;
736 735
737 if (!pixbuf) 736 if (!pixbuf)
738 return false; 737 return false;
739 738
740#if !XFT
741 if (background_flags) 739 if (background_flags
740 && !(flags & HAS_RENDER))
742 return false; 741 return false;
743#endif
744 742
745 GdkPixbuf *result; 743 GdkPixbuf *result;
746 744
747 int image_width = gdk_pixbuf_get_width (pixbuf); 745 int image_width = gdk_pixbuf_get_width (pixbuf);
748 int image_height = gdk_pixbuf_get_height (pixbuf); 746 int image_height = gdk_pixbuf_get_height (pixbuf);
… …
862 dst_width, dst_height, 860 dst_width, dst_height,
863 XLIB_RGB_DITHER_NONE, 861 XLIB_RGB_DITHER_NONE,
864 0, 0); 862 0, 0);
865 } 863 }
866 864
867#if XFT 865#if XRENDER
868 if (background_flags) 866 if (background_flags)
869 { 867 {
870 Display *dpy = target->dpy; 868 Display *dpy = target->dpy;
871 XRenderPictureAttributes pa; 869 XRenderPictureAttributes pa;
872 870
873 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen)); 871 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, target->visual);
874 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 872 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
875 873
876 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); 874 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
877 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa); 875 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
878 876
… …
915# endif /* HAVE_PIXBUF */ 913# endif /* HAVE_PIXBUF */
916 914
917bool 915bool
918bgPixmap_t::set_file (const char *file) 916bgPixmap_t::set_file (const char *file)
919{ 917{
920 assert (file); 918 if (!file || !*file)
919 return false;
921 920
922 if (*file)
923 {
924 if (const char *p = strchr (file, ';')) 921 if (const char *p = strchr (file, ';'))
925 { 922 {
926 size_t len = p - file; 923 size_t len = p - file;
927 char *f = rxvt_temp_buf<char> (len + 1); 924 char *f = rxvt_temp_buf<char> (len + 1);
928 memcpy (f, file, len); 925 memcpy (f, file, len);
929 f[len] = '\0'; 926 f[len] = '\0';
930 file = f; 927 file = f;
931 } 928 }
932 929
933# ifdef HAVE_AFTERIMAGE 930# ifdef HAVE_AFTERIMAGE
934 if (!target->asimman) 931 if (!target->asimman)
935 target->asimman = create_generic_imageman (target->rs[Rs_path]); 932 target->asimman = create_generic_imageman (target->rs[Rs_path]);
936 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 933 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
937 if (image) 934 if (image)
938 { 935 {
939 if (original_asim) 936 if (original_asim)
940 safe_asimage_destroy (original_asim); 937 safe_asimage_destroy (original_asim);
941 original_asim = image; 938 original_asim = image;
942 have_image = true; 939 have_image = true;
943 return true; 940 return true;
944 } 941 }
945# endif 942# endif
946 943
947# ifdef HAVE_PIXBUF 944# ifdef HAVE_PIXBUF
948 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 945 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
949 if (image) 946 if (image)
950 { 947 {
951 if (pixbuf) 948 if (pixbuf)
952 g_object_unref (pixbuf); 949 g_object_unref (pixbuf);
953 pixbuf = image; 950 pixbuf = image;
954 have_image = true; 951 have_image = true;
955 return true; 952 return true;
956 } 953 }
957# endif 954# endif
958 }
959 955
960 return false; 956 return false;
961} 957}
962 958
963# endif /* BG_IMAGE_FROM_FILE */ 959# endif /* BG_IMAGE_FROM_FILE */
… …
976} 972}
977 973
978bool 974bool
979bgPixmap_t::set_blur_radius (const char *geom) 975bgPixmap_t::set_blur_radius (const char *geom)
980{ 976{
981 int changed = 0; 977 bool changed = false;
982 unsigned int hr, vr; 978 unsigned int hr, vr;
983 int junk; 979 int junk;
984 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 980 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
985 981
986 if (!(geom_flags & WidthValue)) 982 if (!(geom_flags & WidthValue))
… …
991 min_it (hr, 128); 987 min_it (hr, 128);
992 min_it (vr, 128); 988 min_it (vr, 128);
993 989
994 if (h_blurRadius != hr) 990 if (h_blurRadius != hr)
995 { 991 {
996 ++changed; 992 changed = true;
997 h_blurRadius = hr; 993 h_blurRadius = hr;
998 } 994 }
999 995
1000 if (v_blurRadius != vr) 996 if (v_blurRadius != vr)
1001 { 997 {
1002 ++changed; 998 changed = true;
1003 v_blurRadius = vr; 999 v_blurRadius = vr;
1004 } 1000 }
1005 1001
1006 if (v_blurRadius == 0 && h_blurRadius == 0) 1002 if (v_blurRadius == 0 && h_blurRadius == 0)
1007 flags &= ~blurNeeded; 1003 flags &= ~blurNeeded;
1008 else 1004 else
1009 flags |= blurNeeded; 1005 flags |= blurNeeded;
1010 1006
1011#if XFT
1012 XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root);
1013 if (filters)
1014 {
1015 for (int i = 0; i < filters->nfilter; i++)
1016 if (!strcmp (filters->filter[i], FilterConvolution))
1017 flags |= bgPixmap_t::blurServerSide;
1018
1019 XFree (filters);
1020 }
1021#endif
1022
1023 return (changed > 0); 1007 return changed;
1024} 1008}
1025 1009
1026static inline unsigned long 1010static inline unsigned long
1027compute_tint_shade_flags (rxvt_color *tint, int shade) 1011compute_tint_shade_flags (rxvt_color *tint, int shade)
1028{ 1012{
… …
1050 { 1034 {
1051 flags |= bgPixmap_t::tintNeeded; 1035 flags |= bgPixmap_t::tintNeeded;
1052 } 1036 }
1053 } 1037 }
1054 1038
1055 if (flags & bgPixmap_t::tintNeeded)
1056 {
1057 if (flags & bgPixmap_t::tintWholesome)
1058 flags |= bgPixmap_t::tintServerSide;
1059 else
1060 {
1061#if XFT
1062 flags |= bgPixmap_t::tintServerSide;
1063#endif
1064 }
1065 }
1066
1067 return flags; 1039 return flags;
1068} 1040}
1069 1041
1070bool 1042bool
1071bgPixmap_t::set_tint (rxvt_color &new_tint) 1043bgPixmap_t::set_tint (rxvt_color &new_tint)
… …
1113 } 1085 }
1114 1086
1115 return false; 1087 return false;
1116} 1088}
1117 1089
1118#if XFT 1090#if XRENDER
1119static void 1091static void
1120get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 1092get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1121{ 1093{
1122 double sigma = radius / 2.0; 1094 double sigma = radius / 2.0;
1123 double scale = sqrt (2.0 * M_PI) * sigma; 1095 double scale = sqrt (2.0 * M_PI) * sigma;
… …
1140 1112
1141bool 1113bool
1142bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1114bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1143{ 1115{
1144 bool ret = false; 1116 bool ret = false;
1145#if XFT 1117#if XRENDER
1146 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1118 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1147 double *kernel = (double *)malloc (size * sizeof (double)); 1119 double *kernel = (double *)malloc (size * sizeof (double));
1148 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1120 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1149 1121
1150 Display *dpy = target->dpy; 1122 Display *dpy = target->dpy;
… …
1227 XFreeGC (dpy, gc); 1199 XFreeGC (dpy, gc);
1228 } 1200 }
1229 } 1201 }
1230 else 1202 else
1231 { 1203 {
1232# if XFT 1204# if XRENDER
1233 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1205 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1234 1206
1235 if (flags & tintSet) 1207 if (flags & tintSet)
1236 tint.get (c); 1208 tint.get (c);
1237 1209
… …
1283 } 1255 }
1284 1256
1285 XRenderFreePicture (dpy, mask_pic); 1257 XRenderFreePicture (dpy, mask_pic);
1286 XRenderFreePicture (dpy, overlay_pic); 1258 XRenderFreePicture (dpy, overlay_pic);
1287 XRenderFreePicture (dpy, back_pic); 1259 XRenderFreePicture (dpy, back_pic);
1288# if DO_TIMING_TEST
1289 XSync (dpy, False);
1290# endif
1291# endif 1260# endif
1292 } 1261 }
1293 1262
1294 return ret; 1263 return ret;
1295} 1264}
1296 1265
1297/* make_transparency_pixmap() 1266/* make_transparency_pixmap()
1298 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1267 * Builds a pixmap of the same size as the terminal window that contains
1299 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 1268 * the tiled portion of the root pixmap that is supposed to be covered by
1300 * our window. 1269 * our window.
1301 */ 1270 */
1302unsigned long 1271unsigned long
1303bgPixmap_t::make_transparency_pixmap () 1272bgPixmap_t::make_transparency_pixmap ()
1304{ 1273{
… …
1308 return 0; 1277 return 0;
1309 1278
1310 /* root dimensions may change from call to call - but Display structure should 1279 /* root dimensions may change from call to call - but Display structure should
1311 * be always up-to-date, so let's use it : 1280 * be always up-to-date, so let's use it :
1312 */ 1281 */
1313 Window root = target->display->root;
1314 int screen = target->display->screen; 1282 int screen = target->display->screen;
1315 Display *dpy = target->dpy; 1283 Display *dpy = target->dpy;
1284 int root_depth = DefaultDepth (dpy, screen);
1316 int root_width = DisplayWidth (dpy, screen); 1285 int root_width = DisplayWidth (dpy, screen);
1317 int root_height = DisplayHeight (dpy, screen); 1286 int root_height = DisplayHeight (dpy, screen);
1318 unsigned int root_pmap_width, root_pmap_height; 1287 unsigned int root_pmap_width, root_pmap_height;
1319 int window_width = target->szHint.width; 1288 int window_width = target->szHint.width;
1320 int window_height = target->szHint.height; 1289 int window_height = target->szHint.height;
1321 int sx, sy; 1290 int sx, sy;
1322 XGCValues gcv; 1291 XGCValues gcv;
1323 GC gc; 1292 GC gc;
1324 1293
1325 TIMING_TEST_START (tp);
1326 target->get_window_origin (sx, sy); 1294 target->get_window_origin (sx, sy);
1327 1295
1328 /* check if we are outside of the visible part of the virtual screen : */ 1296 /* check if we are outside of the visible part of the virtual screen : */
1329 if (sx + window_width <= 0 || sy + window_height <= 0 1297 if (sx + window_width <= 0 || sy + window_height <= 0
1330 || sx >= root_width || sy >= root_height) 1298 || sx >= root_width || sy >= root_height)
1331 return 0; 1299 return 0;
1332 1300
1301 // validate root pixmap and get its size
1333 if (root_pixmap != None) 1302 if (root_pixmap != None)
1334 { 1303 {
1335 /* we want to validate the pixmap and get its size at the same time : */ 1304 Window wdummy;
1336 int junk; 1305 int idummy;
1337 unsigned int ujunk; 1306 unsigned int udummy;
1338 /* root pixmap may be bad - allow a error */ 1307
1339 target->allowedxerror = -1; 1308 target->allowedxerror = -1;
1340 1309
1341 if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk)) 1310 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy))
1342 root_pixmap = None; 1311 root_pixmap = None;
1343 1312
1344 target->allowedxerror = 0; 1313 target->allowedxerror = 0;
1314 }
1315
1316 Pixmap recoded_root_pmap = root_pixmap;
1317
1318 if (root_pixmap != None && root_depth != target->depth)
1319 {
1320#if XRENDER
1321 if (flags & HAS_RENDER)
1322 {
1323 XRenderPictureAttributes pa;
1324
1325 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1326 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1327
1328 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
1329 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
1330 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1331
1332 if (src && dst)
1333 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1334 else
1335 {
1336 XFreePixmap (dpy, recoded_root_pmap);
1337 root_pixmap = None;
1338 }
1339
1340 XRenderFreePicture (dpy, src);
1341 XRenderFreePicture (dpy, dst);
1342 }
1343 else
1344#endif
1345 root_pixmap = None;
1345 } 1346 }
1346 1347
1347 if (root_pixmap == None) 1348 if (root_pixmap == None)
1348 return 0; 1349 return 0;
1349 1350
1350 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1351 Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth);
1351 1352
1352 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1353 if (tiled_root_pmap == None) /* something really bad happened - abort */
1353 return 0; 1354 return 0;
1354 1355
1355 /* straightforward pixmap copy */ 1356 /* straightforward pixmap copy */
1356 gcv.tile = root_pixmap; 1357 gcv.tile = recoded_root_pmap;
1357 gcv.fill_style = FillTiled; 1358 gcv.fill_style = FillTiled;
1358 1359
1359 while (sx < 0) sx += (int)root_width; 1360 while (sx < 0) sx += (int)root_width;
1360 while (sy < 0) sy += (int)root_height; 1361 while (sy < 0) sy += (int)root_height;
1361 1362
1362 gcv.ts_x_origin = -sx; 1363 gcv.ts_x_origin = -sx;
1363 gcv.ts_y_origin = -sy; 1364 gcv.ts_y_origin = -sy;
1364 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1365 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1365 1366
1366 if (gc) 1367 if (gc)
1367 { 1368 {
1368 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1369 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1369 result |= transpPmapTiled; 1370 result |= transpPmapTiled;
1370 XFreeGC (dpy, gc); 1371 XFreeGC (dpy, gc);
1371 }
1372 TIMING_TEST_PRINT_RESULT (tp);
1373 1372
1374 if (tiled_root_pmap != None)
1375 {
1376 if (!need_client_side_rendering ()) 1373 if (!need_client_side_rendering ())
1377 { 1374 {
1378 if (flags & (blurNeeded | blurServerSide)) 1375 if ((flags & blurNeeded)
1376 && (flags & HAS_RENDER_CONV))
1379 { 1377 {
1380 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height)) 1378 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1381 result |= transpPmapBlurred; 1379 result |= transpPmapBlurred;
1382 } 1380 }
1383 if (flags & (tintNeeded | tintServerSide)) 1381 if ((flags & tintNeeded)
1382 && (flags & (tintWholesome | HAS_RENDER)))
1384 { 1383 {
1385 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height)) 1384 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1386 result |= transpPmapTinted; 1385 result |= transpPmapTinted;
1387 } 1386 }
1388 } /* server side rendering completed */ 1387 } /* server side rendering completed */
1389 1388
1390 if (pixmap) 1389 if (pixmap)
1391 XFreePixmap (dpy, pixmap); 1390 XFreePixmap (dpy, pixmap);
1392 1391
1393 pixmap = tiled_root_pmap; 1392 pixmap = tiled_root_pmap;
1394 pmap_width = window_width; 1393 pmap_width = window_width;
1395 pmap_height = window_height; 1394 pmap_height = window_height;
1396 pmap_depth = root_depth; 1395 pmap_depth = target->depth;
1397 } 1396 }
1397 else
1398 XFreePixmap (dpy, tiled_root_pmap);
1398 1399
1399 TIMING_TEST_PRINT_RESULT (tp); 1400 if (recoded_root_pmap != root_pixmap)
1401 XFreePixmap (dpy, recoded_root_pmap);
1400 1402
1401 return result; 1403 return result;
1402} 1404}
1403 1405
1404bool 1406void
1405bgPixmap_t::set_root_pixmap () 1407bgPixmap_t::set_root_pixmap ()
1406{ 1408{
1407 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1409 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1408 if (new_root_pixmap == None) 1410 if (new_root_pixmap == None)
1409 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1411 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1410 1412
1411 if (new_root_pixmap != root_pixmap)
1412 {
1413 root_pixmap = new_root_pixmap; 1413 root_pixmap = new_root_pixmap;
1414 return true;
1415 }
1416
1417 return false;
1418} 1414}
1419# endif /* ENABLE_TRANSPARENCY */ 1415# endif /* ENABLE_TRANSPARENCY */
1420 1416
1421# ifndef HAVE_AFTERIMAGE 1417#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1422static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm); 1418static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c);
1423# endif 1419# endif
1424 1420
1425bool 1421bool
1426bgPixmap_t::render () 1422bgPixmap_t::render ()
1427{ 1423{
1428 unsigned long background_flags = 0; 1424 unsigned long background_flags = 0;
1429 1425
1430 if (target == NULL) 1426 if (target == NULL)
1431 return false; 1427 return false;
1432
1433 TIMING_TEST_START (tp);
1434 1428
1435 invalidate (); 1429 invalidate ();
1436# ifdef ENABLE_TRANSPARENCY 1430# ifdef ENABLE_TRANSPARENCY
1437 if (flags & isTransparent) 1431 if (flags & isTransparent)
1438 { 1432 {
1439 /* we need to re-generate transparency pixmap in that case ! */ 1433 /* we need to re-generate transparency pixmap in that case ! */
1440 background_flags = make_transparency_pixmap (); 1434 background_flags = make_transparency_pixmap ();
1441 if (background_flags == 0) 1435 if (background_flags == 0)
1442 return false; 1436 return false;
1443 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1437 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1444 && pmap_depth == target->depth)
1445 flags = flags & ~isInvalid; 1438 flags = flags & ~isInvalid;
1446 } 1439 }
1447# endif 1440# endif
1448 1441
1449# ifdef BG_IMAGE_FROM_FILE 1442# ifdef BG_IMAGE_FROM_FILE
… …
1453 if (render_image (background_flags)) 1446 if (render_image (background_flags))
1454 flags = flags & ~isInvalid; 1447 flags = flags & ~isInvalid;
1455 } 1448 }
1456# endif 1449# endif
1457 1450
1451# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1458 XImage *result = NULL; 1452 XImage *result = NULL;
1459 1453
1460 if (background_flags && (flags & isInvalid)) 1454 if (background_flags && (flags & isInvalid))
1461 { 1455 {
1462 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1456 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1463 } 1457 }
1464 1458
1465 if (result) 1459 if (result)
1466 { 1460 {
1467# if !defined(HAVE_AFTERIMAGE) && !XFT
1468 /* our own client-side tinting */ 1461 /* our own client-side tinting */
1469 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1470 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1471 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1462 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1472 { 1463 {
1473 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1464 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1474 if (flags & tintSet) 1465 if (flags & tintSet)
1475 tint.get (c); 1466 tint.get (c);
1476 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b); 1467 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1477 } 1468 }
1478# endif
1479 1469
1480 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1470 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1481 1471
1482 if (gc) 1472 if (gc)
1483 { 1473 {
1484 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1485 {
1486 XFreePixmap (target->dpy, pixmap);
1487 pixmap = None;
1488 }
1489
1490 if (pixmap == None)
1491 {
1492 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1493 pmap_width = result->width;
1494 pmap_height = result->height;
1495 pmap_depth = target->depth;
1496 }
1497
1498 if (pmap_depth != result->depth)
1499 {
1500 /* Bad Match error will ensue ! stupid X !!!! */
1501 if (result->depth == 24 && pmap_depth == 32)
1502 result->depth = 32;
1503 else if (result->depth == 32 && pmap_depth == 24)
1504 result->depth = 24;
1505 else
1506 {
1507 /* TODO: implement image recoding */
1508 }
1509 }
1510
1511 if (pmap_depth == result->depth)
1512 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1474 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1513 1475
1514 XFreeGC (target->dpy, gc); 1476 XFreeGC (target->dpy, gc);
1515 flags = flags & ~isInvalid; 1477 flags = flags & ~isInvalid;
1516 } 1478 }
1517 1479
1518 XDestroyImage (result); 1480 XDestroyImage (result);
1519 } 1481 }
1482# endif
1520 1483
1521 if (flags & isInvalid) 1484 if (flags & isInvalid)
1522 { 1485 {
1523 if (pixmap != None) 1486 if (pixmap != None)
1524 { 1487 {
… …
1527 } 1490 }
1528 } 1491 }
1529 1492
1530 apply (); 1493 apply ();
1531 1494
1532 XSync (target->dpy, False);
1533 valid_since = ev::now (); 1495 valid_since = ev::now ();
1534 1496
1535 TIMING_TEST_PRINT_RESULT (tp);
1536
1537 return true; 1497 return true;
1538} 1498}
1539 1499
1540bool 1500void
1541bgPixmap_t::set_target (rxvt_term *new_target) 1501bgPixmap_t::set_target (rxvt_term *new_target)
1542{ 1502{
1543 if (new_target)
1544 if (target != new_target)
1545 {
1546 target = new_target; 1503 target = new_target;
1547# ifdef ENABLE_TRANSPARENCY 1504
1548 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1505 flags &= ~(HAS_RENDER | HAS_RENDER_CONV);
1506#if XRENDER
1507 int major, minor;
1508 if (XRenderQueryVersion (target->dpy, &major, &minor))
1509 flags |= HAS_RENDER;
1510 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1511 if (filters)
1512 {
1513 for (int i = 0; i < filters->nfilter; i++)
1514 if (!strcmp (filters->filter[i], FilterConvolution))
1515 flags |= HAS_RENDER_CONV;
1516
1517 XFree (filters);
1518 }
1549# endif 1519#endif
1550 return true;
1551 }
1552
1553 return false;
1554} 1520}
1555 1521
1556void 1522void
1557bgPixmap_t::apply () 1523bgPixmap_t::apply ()
1558{ 1524{
1559 if (target) 1525 if (target == NULL)
1560 { 1526 return;
1561 flags &= ~isVtOrigin;
1562 1527
1563 if (pixmap != None) 1528 if (pixmap != None)
1564 { 1529 {
1565 /* set target's background to pixmap */ 1530 /* set target's background to pixmap */
1566# ifdef ENABLE_TRANSPARENCY 1531# ifdef ENABLE_TRANSPARENCY
1567 if (flags & isTransparent) 1532 if (flags & isTransparent)
1568 { 1533 {
1569 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1534 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1570 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1535 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1571 1536
1572 if (target->scrollBar.win) 1537 if (target->scrollBar.win)
1573 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1538 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1574 } 1539 }
1575 else 1540 else
1576# endif 1541# endif
1577 { 1542 {
1578 flags |= isVtOrigin;
1579 /* force old pixmap dereference in case it was transparent before :*/ 1543 /* force old pixmap dereference in case it was transparent before :*/
1580 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1581 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1582 /* do we also need to set scrollbar's background here ? */
1583
1584 if (target->scrollBar.win)
1585 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1586 }
1587 }
1588 else
1589 {
1590 /* set target background to a pixel */
1591 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1544 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1592 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1545 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1593 /* do we also need to set scrollbar's background here ? */ 1546 /* do we also need to set scrollbar's background here ? */
1547
1594 if (target->scrollBar.win) 1548 if (target->scrollBar.win)
1595 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1549 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1596 } 1550 }
1551 }
1552 else
1553 {
1554 /* set target background to a pixel */
1555 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1556 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1557 /* do we also need to set scrollbar's background here ? */
1558 if (target->scrollBar.win)
1559 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1560 }
1597 1561
1598 /* don't want Expose on the parent or vt. It is better to use 1562 /* don't want Expose on the parent or vt. It is better to use
1599 scr_touch or we get a great deal of flicker otherwise: */ 1563 scr_touch or we get a great deal of flicker otherwise: */
1600 XClearWindow (target->dpy, target->parent[0]); 1564 XClearWindow (target->dpy, target->parent[0]);
1601 1565
1602 if (target->scrollBar.state && target->scrollBar.win) 1566 if (target->scrollBar.state && target->scrollBar.win)
1603 { 1567 {
1604 target->scrollBar.state = STATE_IDLE; 1568 target->scrollBar.state = STATE_IDLE;
1605 target->scrollBar.show (0); 1569 target->scrollBar.show (0);
1606 } 1570 }
1607 1571
1608 target->want_refresh = 1; 1572 target->want_refresh = 1;
1609 flags |= hasChanged; 1573 flags |= hasChanged;
1610 }
1611} 1574}
1612 1575
1613#endif /* HAVE_BG_PIXMAP */ 1576#endif /* HAVE_BG_PIXMAP */
1614 1577
1615#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1578#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1616/* taken from aterm-0.4.2 */ 1579/* taken from aterm-0.4.2 */
1617 1580
1618static void 1581static void
1619ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm) 1582ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c)
1620{ 1583{
1621 int sh_r, sh_g, sh_b; 1584 int sh_r, sh_g, sh_b;
1622 uint32_t mask_r, mask_g, mask_b; 1585 uint32_t mask_r, mask_g, mask_b;
1623 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1586 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1624 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1587 rgba low;
1625 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1588 rgba high;
1626 int i; 1589 int i;
1627 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; 1590 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1628 1591
1629 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; 1592 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1630 1593
… …
1695 /* prepare limits for color transformation (each channel is handled separately) */ 1658 /* prepare limits for color transformation (each channel is handled separately) */
1696 if (shade > 100) 1659 if (shade > 100)
1697 { 1660 {
1698 shade = 200 - shade; 1661 shade = 200 - shade;
1699 1662
1700 lower_lim_r = 65535-rm; 1663 high.r = (65535 - c.r) * shade / 100;
1701 lower_lim_g = 65535-gm; 1664 high.g = (65535 - c.g) * shade / 100;
1702 lower_lim_b = 65535-bm; 1665 high.b = (65535 - c.b) * shade / 100;
1703 1666
1704 lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100); 1667 low.r = 65535 - high.r;
1705 lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100); 1668 low.g = 65535 - high.g;
1706 lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100); 1669 low.b = 65535 - high.b;
1707
1708 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1709 } 1670 }
1710 else 1671 else
1711 { 1672 {
1673 high.r = c.r * shade / 100;
1674 high.g = c.g * shade / 100;
1675 high.b = c.b * shade / 100;
1712 1676
1713 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1677 low.r = low.g = low.b = 0;
1714
1715 upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1716 upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1717 upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1718 } 1678 }
1719 1679
1720 /* fill our lookup tables */ 1680 /* fill our lookup tables */
1721 for (i = 0; i <= mask_r>>sh_r; i++) 1681 for (i = 0; i <= mask_r>>sh_r; i++)
1722 { 1682 {
1723 uint32_t tmp; 1683 uint32_t tmp;
1724 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r)); 1684 tmp = i * high.r;
1725 tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r); 1685 tmp += (mask_r>>sh_r) * low.r;
1726 lookup_r[i] = (tmp/65535)<<sh_r; 1686 lookup_r[i] = (tmp/65535)<<sh_r;
1727 } 1687 }
1728 for (i = 0; i <= mask_g>>sh_g; i++) 1688 for (i = 0; i <= mask_g>>sh_g; i++)
1729 { 1689 {
1730 uint32_t tmp; 1690 uint32_t tmp;
1731 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g)); 1691 tmp = i * high.g;
1732 tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g); 1692 tmp += (mask_g>>sh_g) * low.g;
1733 lookup_g[i] = (tmp/65535)<<sh_g; 1693 lookup_g[i] = (tmp/65535)<<sh_g;
1734 } 1694 }
1735 for (i = 0; i <= mask_b>>sh_b; i++) 1695 for (i = 0; i <= mask_b>>sh_b; i++)
1736 { 1696 {
1737 uint32_t tmp; 1697 uint32_t tmp;
1738 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b)); 1698 tmp = i * high.b;
1739 tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b); 1699 tmp += (mask_b>>sh_b) * low.b;
1740 lookup_b[i] = (tmp/65535)<<sh_b; 1700 lookup_b[i] = (tmp/65535)<<sh_b;
1741 } 1701 }
1742 1702
1743 /* apply table to input image (replacing colors by newly calculated ones) */ 1703 /* apply table to input image (replacing colors by newly calculated ones) */
1744 if (srcImage->bits_per_pixel == 32 1704 if (srcImage->bits_per_pixel == 32

Diff Legend

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