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.93 by sf-exg, Tue Oct 19 14:44:30 2010 UTC vs.
Revision 1.109 by sf-exg, Tue Nov 2 22:01:47 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>
… …
428 { 432 {
429 flags = new_flags; 433 flags = new_flags;
430 changed++; 434 changed++;
431 } 435 }
432 436
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); 437 return (changed > 0);
436} 438}
437 439
438void 440void
439bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 441bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
… …
529 531
530 int x = 0; 532 int x = 0;
531 int y = 0; 533 int y = 0;
532 int w = 0; 534 int w = 0;
533 int h = 0; 535 int h = 0;
534
535 TIMING_TEST_START (asim);
536 536
537 if (original_asim) 537 if (original_asim)
538 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y); 538 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
539 539
540 if (!original_asim 540 if (!original_asim
… …
657 } 657 }
658 658
659 free (layers); 659 free (layers);
660 } 660 }
661 } 661 }
662 TIMING_TEST_PRINT_RESULT (asim);
663 662
664 bool ret = false; 663 bool ret = false;
665 664
666 if (result) 665 if (result)
667 { 666 {
… …
713 712
714 if (result != background && result != original_asim) 713 if (result != background && result != original_asim)
715 destroy_asimage (&result); 714 destroy_asimage (&result);
716 715
717 XFreeGC (target->dpy, gc); 716 XFreeGC (target->dpy, gc);
718 TIMING_TEST_PRINT_RESULT (asim);
719 717
720 ret = true; 718 ret = true;
721 } 719 }
722 720
723 if (background) 721 if (background)
… …
735 return false; 733 return false;
736 734
737 if (!pixbuf) 735 if (!pixbuf)
738 return false; 736 return false;
739 737
740#if !XFT
741 if (background_flags) 738 if (background_flags
739 && !(flags & HAS_RENDER))
742 return false; 740 return false;
743#endif
744 741
745 GdkPixbuf *result; 742 GdkPixbuf *result;
746 743
747 int image_width = gdk_pixbuf_get_width (pixbuf); 744 int image_width = gdk_pixbuf_get_width (pixbuf);
748 int image_height = gdk_pixbuf_get_height (pixbuf); 745 int image_height = gdk_pixbuf_get_height (pixbuf);
… …
862 dst_width, dst_height, 859 dst_width, dst_height,
863 XLIB_RGB_DITHER_NONE, 860 XLIB_RGB_DITHER_NONE,
864 0, 0); 861 0, 0);
865 } 862 }
866 863
867#if XFT 864#if XRENDER
868 if (background_flags) 865 if (background_flags)
869 { 866 {
870 Display *dpy = target->dpy; 867 Display *dpy = target->dpy;
871 XRenderPictureAttributes pa; 868 XRenderPictureAttributes pa;
872 869
873 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen)); 870 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, target->visual);
874 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 871 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
875 872
876 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); 873 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
877 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa); 874 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
878 875
… …
915# endif /* HAVE_PIXBUF */ 912# endif /* HAVE_PIXBUF */
916 913
917bool 914bool
918bgPixmap_t::set_file (const char *file) 915bgPixmap_t::set_file (const char *file)
919{ 916{
920 assert (file); 917 if (!file || !*file)
918 return false;
921 919
922 if (*file)
923 {
924 if (const char *p = strchr (file, ';')) 920 if (const char *p = strchr (file, ';'))
925 { 921 {
926 size_t len = p - file; 922 size_t len = p - file;
927 char *f = rxvt_temp_buf<char> (len + 1); 923 char *f = rxvt_temp_buf<char> (len + 1);
928 memcpy (f, file, len); 924 memcpy (f, file, len);
929 f[len] = '\0'; 925 f[len] = '\0';
930 file = f; 926 file = f;
931 } 927 }
932 928
933# ifdef HAVE_AFTERIMAGE 929# ifdef HAVE_AFTERIMAGE
934 if (!target->asimman) 930 if (!target->asimman)
935 target->asimman = create_generic_imageman (target->rs[Rs_path]); 931 target->asimman = create_generic_imageman (target->rs[Rs_path]);
936 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 932 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
937 if (image) 933 if (image)
938 { 934 {
939 if (original_asim) 935 if (original_asim)
940 safe_asimage_destroy (original_asim); 936 safe_asimage_destroy (original_asim);
941 original_asim = image; 937 original_asim = image;
942 have_image = true; 938 have_image = true;
943 return true; 939 return true;
944 } 940 }
945# endif 941# endif
946 942
947# ifdef HAVE_PIXBUF 943# ifdef HAVE_PIXBUF
948 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 944 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
949 if (image) 945 if (image)
950 { 946 {
951 if (pixbuf) 947 if (pixbuf)
952 g_object_unref (pixbuf); 948 g_object_unref (pixbuf);
953 pixbuf = image; 949 pixbuf = image;
954 have_image = true; 950 have_image = true;
955 return true; 951 return true;
956 } 952 }
957# endif 953# endif
958 }
959 954
960 return false; 955 return false;
961} 956}
962 957
963# endif /* BG_IMAGE_FROM_FILE */ 958# endif /* BG_IMAGE_FROM_FILE */
… …
1005 1000
1006 if (v_blurRadius == 0 && h_blurRadius == 0) 1001 if (v_blurRadius == 0 && h_blurRadius == 0)
1007 flags &= ~blurNeeded; 1002 flags &= ~blurNeeded;
1008 else 1003 else
1009 flags |= blurNeeded; 1004 flags |= blurNeeded;
1010
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 1005
1023 return (changed > 0); 1006 return (changed > 0);
1024} 1007}
1025 1008
1026static inline unsigned long 1009static inline unsigned long
… …
1050 { 1033 {
1051 flags |= bgPixmap_t::tintNeeded; 1034 flags |= bgPixmap_t::tintNeeded;
1052 } 1035 }
1053 } 1036 }
1054 1037
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; 1038 return flags;
1068} 1039}
1069 1040
1070bool 1041bool
1071bgPixmap_t::set_tint (rxvt_color &new_tint) 1042bgPixmap_t::set_tint (rxvt_color &new_tint)
… …
1113 } 1084 }
1114 1085
1115 return false; 1086 return false;
1116} 1087}
1117 1088
1118#if XFT 1089#if XRENDER
1119static void 1090static void
1120get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 1091get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1121{ 1092{
1122 double sigma = radius / 2.0; 1093 double sigma = radius / 2.0;
1123 double scale = sqrt (2.0 * M_PI) * sigma; 1094 double scale = sqrt (2.0 * M_PI) * sigma;
… …
1140 1111
1141bool 1112bool
1142bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1113bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1143{ 1114{
1144 bool ret = false; 1115 bool ret = false;
1145#if XFT 1116#if XRENDER
1146 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1117 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1147 double *kernel = (double *)malloc (size * sizeof (double)); 1118 double *kernel = (double *)malloc (size * sizeof (double));
1148 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1119 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1149 1120
1150 Display *dpy = target->dpy; 1121 Display *dpy = target->dpy;
… …
1227 XFreeGC (dpy, gc); 1198 XFreeGC (dpy, gc);
1228 } 1199 }
1229 } 1200 }
1230 else 1201 else
1231 { 1202 {
1232# if XFT 1203# if XRENDER
1233 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1204 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1234 1205
1235 if (flags & tintSet) 1206 if (flags & tintSet)
1236 tint.get (c); 1207 tint.get (c);
1237 1208
… …
1283 } 1254 }
1284 1255
1285 XRenderFreePicture (dpy, mask_pic); 1256 XRenderFreePicture (dpy, mask_pic);
1286 XRenderFreePicture (dpy, overlay_pic); 1257 XRenderFreePicture (dpy, overlay_pic);
1287 XRenderFreePicture (dpy, back_pic); 1258 XRenderFreePicture (dpy, back_pic);
1288# if DO_TIMING_TEST
1289 XSync (dpy, False);
1290# endif
1291# endif 1259# endif
1292 } 1260 }
1293 1261
1294 return ret; 1262 return ret;
1295} 1263}
1296 1264
1297/* make_transparency_pixmap() 1265/* make_transparency_pixmap()
1298 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1266 * 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 1267 * the tiled portion of the root pixmap that is supposed to be covered by
1300 * our window. 1268 * our window.
1301 */ 1269 */
1302unsigned long 1270unsigned long
1303bgPixmap_t::make_transparency_pixmap () 1271bgPixmap_t::make_transparency_pixmap ()
1304{ 1272{
… …
1308 return 0; 1276 return 0;
1309 1277
1310 /* root dimensions may change from call to call - but Display structure should 1278 /* root dimensions may change from call to call - but Display structure should
1311 * be always up-to-date, so let's use it : 1279 * be always up-to-date, so let's use it :
1312 */ 1280 */
1313 Window root = target->display->root;
1314 int screen = target->display->screen; 1281 int screen = target->display->screen;
1315 Display *dpy = target->dpy; 1282 Display *dpy = target->dpy;
1283 int root_depth = DefaultDepth (dpy, screen);
1316 int root_width = DisplayWidth (dpy, screen); 1284 int root_width = DisplayWidth (dpy, screen);
1317 int root_height = DisplayHeight (dpy, screen); 1285 int root_height = DisplayHeight (dpy, screen);
1318 unsigned int root_pmap_width, root_pmap_height; 1286 unsigned int root_pmap_width, root_pmap_height;
1319 int window_width = target->szHint.width; 1287 int window_width = target->szHint.width;
1320 int window_height = target->szHint.height; 1288 int window_height = target->szHint.height;
1321 int sx, sy; 1289 int sx, sy;
1322 XGCValues gcv; 1290 XGCValues gcv;
1323 GC gc; 1291 GC gc;
1324 1292
1325 TIMING_TEST_START (tp);
1326 target->get_window_origin (sx, sy); 1293 target->get_window_origin (sx, sy);
1327 1294
1328 /* check if we are outside of the visible part of the virtual screen : */ 1295 /* check if we are outside of the visible part of the virtual screen : */
1329 if (sx + window_width <= 0 || sy + window_height <= 0 1296 if (sx + window_width <= 0 || sy + window_height <= 0
1330 || sx >= root_width || sy >= root_height) 1297 || sx >= root_width || sy >= root_height)
1331 return 0; 1298 return 0;
1332 1299
1300 // validate root pixmap and get its size
1333 if (root_pixmap != None) 1301 if (root_pixmap != None)
1334 { 1302 {
1335 /* we want to validate the pixmap and get its size at the same time : */ 1303 Window wdummy;
1336 int junk; 1304 int idummy;
1337 unsigned int ujunk; 1305 unsigned int udummy;
1338 /* root pixmap may be bad - allow a error */ 1306
1339 target->allowedxerror = -1; 1307 target->allowedxerror = -1;
1340 1308
1341 if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk)) 1309 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy))
1342 root_pixmap = None; 1310 root_pixmap = None;
1343 1311
1344 target->allowedxerror = 0; 1312 target->allowedxerror = 0;
1313 }
1314
1315 Pixmap recoded_root_pmap = root_pixmap;
1316
1317 if (root_pixmap != None && root_depth != target->depth)
1318 {
1319#if XRENDER
1320 if (flags & HAS_RENDER)
1321 {
1322 XRenderPictureAttributes pa;
1323
1324 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1325 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1326
1327 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
1328 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
1329 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1330
1331 if (src && dst)
1332 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1333 else
1334 {
1335 XFreePixmap (dpy, recoded_root_pmap);
1336 root_pixmap = None;
1337 }
1338
1339 XRenderFreePicture (dpy, src);
1340 XRenderFreePicture (dpy, dst);
1341 }
1342 else
1343#endif
1344 root_pixmap = None;
1345 } 1345 }
1346 1346
1347 if (root_pixmap == None) 1347 if (root_pixmap == None)
1348 return 0; 1348 return 0;
1349 1349
1350 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1350 Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth);
1351 1351
1352 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1352 if (tiled_root_pmap == None) /* something really bad happened - abort */
1353 return 0; 1353 return 0;
1354 1354
1355 /* straightforward pixmap copy */ 1355 /* straightforward pixmap copy */
1356 gcv.tile = root_pixmap; 1356 gcv.tile = recoded_root_pmap;
1357 gcv.fill_style = FillTiled; 1357 gcv.fill_style = FillTiled;
1358 1358
1359 while (sx < 0) sx += (int)root_width; 1359 while (sx < 0) sx += (int)root_width;
1360 while (sy < 0) sy += (int)root_height; 1360 while (sy < 0) sy += (int)root_height;
1361 1361
1362 gcv.ts_x_origin = -sx; 1362 gcv.ts_x_origin = -sx;
1363 gcv.ts_y_origin = -sy; 1363 gcv.ts_y_origin = -sy;
1364 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1364 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1365 1365
1366 if (gc) 1366 if (gc)
1367 { 1367 {
1368 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1368 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1369 result |= transpPmapTiled; 1369 result |= transpPmapTiled;
1370 XFreeGC (dpy, gc); 1370 XFreeGC (dpy, gc);
1371 } 1371 }
1372 TIMING_TEST_PRINT_RESULT (tp);
1373 1372
1374 if (tiled_root_pmap != None) 1373 if (tiled_root_pmap != None)
1375 { 1374 {
1376 if (!need_client_side_rendering ()) 1375 if (!need_client_side_rendering ())
1377 { 1376 {
1378 if (flags & (blurNeeded | blurServerSide)) 1377 if ((flags & blurNeeded)
1378 && (flags & HAS_RENDER_CONV))
1379 { 1379 {
1380 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height)) 1380 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1381 result |= transpPmapBlurred; 1381 result |= transpPmapBlurred;
1382 } 1382 }
1383 if (flags & (tintNeeded | tintServerSide)) 1383 if ((flags & tintNeeded)
1384 && (flags & (tintWholesome | HAS_RENDER)))
1384 { 1385 {
1385 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height)) 1386 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1386 result |= transpPmapTinted; 1387 result |= transpPmapTinted;
1387 } 1388 }
1388 } /* server side rendering completed */ 1389 } /* server side rendering completed */
1389 1390
1390 if (pixmap) 1391 if (pixmap)
1391 XFreePixmap (dpy, pixmap); 1392 XFreePixmap (dpy, pixmap);
1392 1393
1393 pixmap = tiled_root_pmap; 1394 pixmap = tiled_root_pmap;
1394 pmap_width = window_width; 1395 pmap_width = window_width;
1395 pmap_height = window_height; 1396 pmap_height = window_height;
1396 pmap_depth = root_depth; 1397 pmap_depth = target->depth;
1397 } 1398 }
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# ifndef 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, int rm, int gm, int bm);
… …
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
… …
1462 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1455 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1463 } 1456 }
1464 1457
1465 if (result) 1458 if (result)
1466 { 1459 {
1467# if !defined(HAVE_AFTERIMAGE) && !XFT 1460# if !defined(HAVE_AFTERIMAGE) && !XRENDER
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);
… …
1479 1470
1480 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1471 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1481 1472
1482 if (gc) 1473 if (gc)
1483 { 1474 {
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); 1475 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1513 1476
1514 XFreeGC (target->dpy, gc); 1477 XFreeGC (target->dpy, gc);
1515 flags = flags & ~isInvalid; 1478 flags = flags & ~isInvalid;
1516 } 1479 }
1517 1480
… …
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) && !XRENDER
1616/* taken from aterm-0.4.2 */ 1579/* taken from aterm-0.4.2 */
1617
1618typedef uint32_t RUINT32T;
1619 1580
1620static void 1581static void
1621ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm) 1582ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm)
1622{ 1583{
1623 int sh_r, sh_g, sh_b; 1584 int sh_r, sh_g, sh_b;
1624 RUINT32T mask_r, mask_g, mask_b; 1585 uint32_t mask_r, mask_g, mask_b;
1625 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1586 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1626 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1587 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1627 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1588 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1628 int i; 1589 int i;
1629 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; 1590 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1630 1591
… …
1641 case 15: 1602 case 15:
1642 if ((mask_r != 0x7c00) || 1603 if ((mask_r != 0x7c00) ||
1643 (mask_g != 0x03e0) || 1604 (mask_g != 0x03e0) ||
1644 (mask_b != 0x001f)) 1605 (mask_b != 0x001f))
1645 return; 1606 return;
1646 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1607 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32));
1647 lookup_r = lookup; 1608 lookup_r = lookup;
1648 lookup_g = lookup+32; 1609 lookup_g = lookup+32;
1649 lookup_b = lookup+32+32; 1610 lookup_b = lookup+32+32;
1650 sh_r = 10; 1611 sh_r = 10;
1651 sh_g = 5; 1612 sh_g = 5;
… …
1654 case 16: 1615 case 16:
1655 if ((mask_r != 0xf800) || 1616 if ((mask_r != 0xf800) ||
1656 (mask_g != 0x07e0) || 1617 (mask_g != 0x07e0) ||
1657 (mask_b != 0x001f)) 1618 (mask_b != 0x001f))
1658 return; 1619 return;
1659 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1620 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1660 lookup_r = lookup; 1621 lookup_r = lookup;
1661 lookup_g = lookup+32; 1622 lookup_g = lookup+32;
1662 lookup_b = lookup+32+64; 1623 lookup_b = lookup+32+64;
1663 sh_r = 11; 1624 sh_r = 11;
1664 sh_g = 5; 1625 sh_g = 5;
… …
1667 case 24: 1628 case 24:
1668 if ((mask_r != 0xff0000) || 1629 if ((mask_r != 0xff0000) ||
1669 (mask_g != 0x00ff00) || 1630 (mask_g != 0x00ff00) ||
1670 (mask_b != 0x0000ff)) 1631 (mask_b != 0x0000ff))
1671 return; 1632 return;
1672 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1633 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1673 lookup_r = lookup; 1634 lookup_r = lookup;
1674 lookup_g = lookup+256; 1635 lookup_g = lookup+256;
1675 lookup_b = lookup+256+256; 1636 lookup_b = lookup+256+256;
1676 sh_r = 16; 1637 sh_r = 16;
1677 sh_g = 8; 1638 sh_g = 8;
… …
1680 case 32: 1641 case 32:
1681 if ((mask_r != 0xff0000) || 1642 if ((mask_r != 0xff0000) ||
1682 (mask_g != 0x00ff00) || 1643 (mask_g != 0x00ff00) ||
1683 (mask_b != 0x0000ff)) 1644 (mask_b != 0x0000ff))
1684 return; 1645 return;
1685 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1646 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1686 lookup_r = lookup; 1647 lookup_r = lookup;
1687 lookup_g = lookup+256; 1648 lookup_g = lookup+256;
1688 lookup_b = lookup+256+256; 1649 lookup_b = lookup+256+256;
1689 sh_r = 16; 1650 sh_r = 16;
1690 sh_g = 8; 1651 sh_g = 8;
… …
1701 1662
1702 lower_lim_r = 65535-rm; 1663 lower_lim_r = 65535-rm;
1703 lower_lim_g = 65535-gm; 1664 lower_lim_g = 65535-gm;
1704 lower_lim_b = 65535-bm; 1665 lower_lim_b = 65535-bm;
1705 1666
1706 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1667 lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100);
1707 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1668 lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100);
1708 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1669 lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100);
1709 1670
1710 upper_lim_r = upper_lim_g = upper_lim_b = 65535; 1671 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1711 } 1672 }
1712 else 1673 else
1713 { 1674 {
1714 1675
1715 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1676 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1716 1677
1717 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100); 1678 upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1718 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100); 1679 upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1719 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100); 1680 upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1720 } 1681 }
1721 1682
1722 /* fill our lookup tables */ 1683 /* fill our lookup tables */
1723 for (i = 0; i <= mask_r>>sh_r; i++) 1684 for (i = 0; i <= mask_r>>sh_r; i++)
1724 { 1685 {
1725 RUINT32T tmp; 1686 uint32_t tmp;
1726 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1687 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r));
1727 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1688 tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r);
1728 lookup_r[i] = (tmp/65535)<<sh_r; 1689 lookup_r[i] = (tmp/65535)<<sh_r;
1729 } 1690 }
1730 for (i = 0; i <= mask_g>>sh_g; i++) 1691 for (i = 0; i <= mask_g>>sh_g; i++)
1731 { 1692 {
1732 RUINT32T tmp; 1693 uint32_t tmp;
1733 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1694 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g));
1734 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1695 tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g);
1735 lookup_g[i] = (tmp/65535)<<sh_g; 1696 lookup_g[i] = (tmp/65535)<<sh_g;
1736 } 1697 }
1737 for (i = 0; i <= mask_b>>sh_b; i++) 1698 for (i = 0; i <= mask_b>>sh_b; i++)
1738 { 1699 {
1739 RUINT32T tmp; 1700 uint32_t tmp;
1740 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1701 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b));
1741 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1702 tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b);
1742 lookup_b[i] = (tmp/65535)<<sh_b; 1703 lookup_b[i] = (tmp/65535)<<sh_b;
1743 } 1704 }
1744 1705
1745 /* apply table to input image (replacing colors by newly calculated ones) */ 1706 /* apply table to input image (replacing colors by newly calculated ones) */
1746 if (srcImage->bits_per_pixel == 32 1707 if (srcImage->bits_per_pixel == 32
1747 && (srcImage->depth == 24 || srcImage->depth == 32) 1708 && (srcImage->depth == 24 || srcImage->depth == 32)
1748 && srcImage->byte_order == host_byte_order) 1709 && srcImage->byte_order == host_byte_order)
1749 { 1710 {
1750 RUINT32T *p1, *pf, *p, *pl; 1711 uint32_t *p1, *pf, *p, *pl;
1751 p1 = (RUINT32T *) srcImage->data; 1712 p1 = (uint32_t *) srcImage->data;
1752 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1713 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1753 1714
1754 while (p1 < pf) 1715 while (p1 < pf)
1755 { 1716 {
1756 p = p1; 1717 p = p1;
1757 pl = p1 + srcImage->width; 1718 pl = p1 + srcImage->width;
… …
1760 *p = lookup_r[(*p & 0xff0000) >> 16] | 1721 *p = lookup_r[(*p & 0xff0000) >> 16] |
1761 lookup_g[(*p & 0x00ff00) >> 8] | 1722 lookup_g[(*p & 0x00ff00) >> 8] |
1762 lookup_b[(*p & 0x0000ff)] | 1723 lookup_b[(*p & 0x0000ff)] |
1763 (*p & 0xff000000); 1724 (*p & 0xff000000);
1764 } 1725 }
1765 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line); 1726 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line);
1766 } 1727 }
1767 } 1728 }
1768 else 1729 else
1769 { 1730 {
1770 for (int y = 0; y < srcImage->height; y++) 1731 for (int y = 0; y < srcImage->height; y++)

Diff Legend

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