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.107 by sf-exg, Mon Nov 1 14:29:33 2010 UTC

… …
428 { 428 {
429 flags = new_flags; 429 flags = new_flags;
430 changed++; 430 changed++;
431 } 431 }
432 432
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); 433 return (changed > 0);
436} 434}
437 435
438void 436void
439bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 437bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
… …
529 527
530 int x = 0; 528 int x = 0;
531 int y = 0; 529 int y = 0;
532 int w = 0; 530 int w = 0;
533 int h = 0; 531 int h = 0;
534
535 TIMING_TEST_START (asim);
536 532
537 if (original_asim) 533 if (original_asim)
538 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y); 534 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
539 535
540 if (!original_asim 536 if (!original_asim
… …
657 } 653 }
658 654
659 free (layers); 655 free (layers);
660 } 656 }
661 } 657 }
662 TIMING_TEST_PRINT_RESULT (asim);
663 658
664 bool ret = false; 659 bool ret = false;
665 660
666 if (result) 661 if (result)
667 { 662 {
… …
713 708
714 if (result != background && result != original_asim) 709 if (result != background && result != original_asim)
715 destroy_asimage (&result); 710 destroy_asimage (&result);
716 711
717 XFreeGC (target->dpy, gc); 712 XFreeGC (target->dpy, gc);
718 TIMING_TEST_PRINT_RESULT (asim);
719 713
720 ret = true; 714 ret = true;
721 } 715 }
722 716
723 if (background) 717 if (background)
… …
735 return false; 729 return false;
736 730
737 if (!pixbuf) 731 if (!pixbuf)
738 return false; 732 return false;
739 733
740#if !XFT 734#if !XRENDER
741 if (background_flags) 735 if (background_flags)
742 return false; 736 return false;
743#endif 737#endif
744 738
745 GdkPixbuf *result; 739 GdkPixbuf *result;
… …
862 dst_width, dst_height, 856 dst_width, dst_height,
863 XLIB_RGB_DITHER_NONE, 857 XLIB_RGB_DITHER_NONE,
864 0, 0); 858 0, 0);
865 } 859 }
866 860
867#if XFT 861#if XRENDER
868 if (background_flags) 862 if (background_flags)
869 { 863 {
870 Display *dpy = target->dpy; 864 Display *dpy = target->dpy;
871 XRenderPictureAttributes pa; 865 XRenderPictureAttributes pa;
872 866
873 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen)); 867 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, target->visual);
874 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 868 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
875 869
876 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); 870 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
877 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa); 871 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
878 872
… …
915# endif /* HAVE_PIXBUF */ 909# endif /* HAVE_PIXBUF */
916 910
917bool 911bool
918bgPixmap_t::set_file (const char *file) 912bgPixmap_t::set_file (const char *file)
919{ 913{
920 assert (file); 914 if (!file || !*file)
915 return false;
921 916
922 if (*file)
923 {
924 if (const char *p = strchr (file, ';')) 917 if (const char *p = strchr (file, ';'))
925 { 918 {
926 size_t len = p - file; 919 size_t len = p - file;
927 char *f = rxvt_temp_buf<char> (len + 1); 920 char *f = rxvt_temp_buf<char> (len + 1);
928 memcpy (f, file, len); 921 memcpy (f, file, len);
929 f[len] = '\0'; 922 f[len] = '\0';
930 file = f; 923 file = f;
931 } 924 }
932 925
933# ifdef HAVE_AFTERIMAGE 926# ifdef HAVE_AFTERIMAGE
934 if (!target->asimman) 927 if (!target->asimman)
935 target->asimman = create_generic_imageman (target->rs[Rs_path]); 928 target->asimman = create_generic_imageman (target->rs[Rs_path]);
936 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 929 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
937 if (image) 930 if (image)
938 { 931 {
939 if (original_asim) 932 if (original_asim)
940 safe_asimage_destroy (original_asim); 933 safe_asimage_destroy (original_asim);
941 original_asim = image; 934 original_asim = image;
942 have_image = true; 935 have_image = true;
943 return true; 936 return true;
944 } 937 }
945# endif 938# endif
946 939
947# ifdef HAVE_PIXBUF 940# ifdef HAVE_PIXBUF
948 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 941 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
949 if (image) 942 if (image)
950 { 943 {
951 if (pixbuf) 944 if (pixbuf)
952 g_object_unref (pixbuf); 945 g_object_unref (pixbuf);
953 pixbuf = image; 946 pixbuf = image;
954 have_image = true; 947 have_image = true;
955 return true; 948 return true;
956 } 949 }
957# endif 950# endif
958 }
959 951
960 return false; 952 return false;
961} 953}
962 954
963# endif /* BG_IMAGE_FROM_FILE */ 955# endif /* BG_IMAGE_FROM_FILE */
… …
1006 if (v_blurRadius == 0 && h_blurRadius == 0) 998 if (v_blurRadius == 0 && h_blurRadius == 0)
1007 flags &= ~blurNeeded; 999 flags &= ~blurNeeded;
1008 else 1000 else
1009 flags |= blurNeeded; 1001 flags |= blurNeeded;
1010 1002
1011#if XFT 1003#if XRENDER
1012 XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root); 1004 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1013 if (filters) 1005 if (filters)
1014 { 1006 {
1015 for (int i = 0; i < filters->nfilter; i++) 1007 for (int i = 0; i < filters->nfilter; i++)
1016 if (!strcmp (filters->filter[i], FilterConvolution)) 1008 if (!strcmp (filters->filter[i], FilterConvolution))
1017 flags |= bgPixmap_t::blurServerSide; 1009 flags |= bgPixmap_t::blurServerSide;
… …
1056 { 1048 {
1057 if (flags & bgPixmap_t::tintWholesome) 1049 if (flags & bgPixmap_t::tintWholesome)
1058 flags |= bgPixmap_t::tintServerSide; 1050 flags |= bgPixmap_t::tintServerSide;
1059 else 1051 else
1060 { 1052 {
1061#if XFT 1053#if XRENDER
1062 flags |= bgPixmap_t::tintServerSide; 1054 flags |= bgPixmap_t::tintServerSide;
1063#endif 1055#endif
1064 } 1056 }
1065 } 1057 }
1066 1058
… …
1113 } 1105 }
1114 1106
1115 return false; 1107 return false;
1116} 1108}
1117 1109
1118#if XFT 1110#if XRENDER
1119static void 1111static void
1120get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 1112get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1121{ 1113{
1122 double sigma = radius / 2.0; 1114 double sigma = radius / 2.0;
1123 double scale = sqrt (2.0 * M_PI) * sigma; 1115 double scale = sqrt (2.0 * M_PI) * sigma;
… …
1140 1132
1141bool 1133bool
1142bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1134bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1143{ 1135{
1144 bool ret = false; 1136 bool ret = false;
1145#if XFT 1137#if XRENDER
1146 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1138 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1147 double *kernel = (double *)malloc (size * sizeof (double)); 1139 double *kernel = (double *)malloc (size * sizeof (double));
1148 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1140 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1149 1141
1150 Display *dpy = target->dpy; 1142 Display *dpy = target->dpy;
… …
1227 XFreeGC (dpy, gc); 1219 XFreeGC (dpy, gc);
1228 } 1220 }
1229 } 1221 }
1230 else 1222 else
1231 { 1223 {
1232# if XFT 1224# if XRENDER
1233 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1225 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1234 1226
1235 if (flags & tintSet) 1227 if (flags & tintSet)
1236 tint.get (c); 1228 tint.get (c);
1237 1229
… …
1283 } 1275 }
1284 1276
1285 XRenderFreePicture (dpy, mask_pic); 1277 XRenderFreePicture (dpy, mask_pic);
1286 XRenderFreePicture (dpy, overlay_pic); 1278 XRenderFreePicture (dpy, overlay_pic);
1287 XRenderFreePicture (dpy, back_pic); 1279 XRenderFreePicture (dpy, back_pic);
1288# if DO_TIMING_TEST
1289 XSync (dpy, False);
1290# endif
1291# endif 1280# endif
1292 } 1281 }
1293 1282
1294 return ret; 1283 return ret;
1295} 1284}
1296 1285
1297/* make_transparency_pixmap() 1286/* make_transparency_pixmap()
1298 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1287 * 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 1288 * the tiled portion of the root pixmap that is supposed to be covered by
1300 * our window. 1289 * our window.
1301 */ 1290 */
1302unsigned long 1291unsigned long
1303bgPixmap_t::make_transparency_pixmap () 1292bgPixmap_t::make_transparency_pixmap ()
1304{ 1293{
… …
1308 return 0; 1297 return 0;
1309 1298
1310 /* root dimensions may change from call to call - but Display structure should 1299 /* root dimensions may change from call to call - but Display structure should
1311 * be always up-to-date, so let's use it : 1300 * be always up-to-date, so let's use it :
1312 */ 1301 */
1313 Window root = target->display->root;
1314 int screen = target->display->screen; 1302 int screen = target->display->screen;
1315 Display *dpy = target->dpy; 1303 Display *dpy = target->dpy;
1304 int root_depth = DefaultDepth (dpy, screen);
1316 int root_width = DisplayWidth (dpy, screen); 1305 int root_width = DisplayWidth (dpy, screen);
1317 int root_height = DisplayHeight (dpy, screen); 1306 int root_height = DisplayHeight (dpy, screen);
1318 unsigned int root_pmap_width, root_pmap_height; 1307 unsigned int root_pmap_width, root_pmap_height;
1319 int window_width = target->szHint.width; 1308 int window_width = target->szHint.width;
1320 int window_height = target->szHint.height; 1309 int window_height = target->szHint.height;
1321 int sx, sy; 1310 int sx, sy;
1322 XGCValues gcv; 1311 XGCValues gcv;
1323 GC gc; 1312 GC gc;
1324 1313
1325 TIMING_TEST_START (tp);
1326 target->get_window_origin (sx, sy); 1314 target->get_window_origin (sx, sy);
1327 1315
1328 /* check if we are outside of the visible part of the virtual screen : */ 1316 /* check if we are outside of the visible part of the virtual screen : */
1329 if (sx + window_width <= 0 || sy + window_height <= 0 1317 if (sx + window_width <= 0 || sy + window_height <= 0
1330 || sx >= root_width || sy >= root_height) 1318 || sx >= root_width || sy >= root_height)
1331 return 0; 1319 return 0;
1332 1320
1321 // validate root pixmap and get its size
1333 if (root_pixmap != None) 1322 if (root_pixmap != None)
1334 { 1323 {
1335 /* we want to validate the pixmap and get its size at the same time : */ 1324 Window wdummy;
1336 int junk; 1325 int idummy;
1337 unsigned int ujunk; 1326 unsigned int udummy;
1338 /* root pixmap may be bad - allow a error */ 1327
1339 target->allowedxerror = -1; 1328 target->allowedxerror = -1;
1340 1329
1341 if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk)) 1330 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy))
1342 root_pixmap = None; 1331 root_pixmap = None;
1343 1332
1344 target->allowedxerror = 0; 1333 target->allowedxerror = 0;
1334 }
1335
1336 Pixmap recoded_root_pmap = root_pixmap;
1337
1338 if (root_pixmap != None && root_depth != target->depth)
1339 {
1340#if XRENDER
1341 XRenderPictureAttributes pa;
1342
1343 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1344 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1345
1346 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
1347 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
1348 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1349
1350 if (src && dst)
1351 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1352 else
1353 {
1354 XFreePixmap (dpy, recoded_root_pmap);
1355 root_pixmap = None;
1356 }
1357
1358 XRenderFreePicture (dpy, src);
1359 XRenderFreePicture (dpy, dst);
1360#else
1361 root_pixmap = None;
1362#endif
1345 } 1363 }
1346 1364
1347 if (root_pixmap == None) 1365 if (root_pixmap == None)
1348 return 0; 1366 return 0;
1349 1367
1350 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1368 Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth);
1351 1369
1352 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1370 if (tiled_root_pmap == None) /* something really bad happened - abort */
1353 return 0; 1371 return 0;
1354 1372
1355 /* straightforward pixmap copy */ 1373 /* straightforward pixmap copy */
1356 gcv.tile = root_pixmap; 1374 gcv.tile = recoded_root_pmap;
1357 gcv.fill_style = FillTiled; 1375 gcv.fill_style = FillTiled;
1358 1376
1359 while (sx < 0) sx += (int)root_width; 1377 while (sx < 0) sx += (int)root_width;
1360 while (sy < 0) sy += (int)root_height; 1378 while (sy < 0) sy += (int)root_height;
1361 1379
1362 gcv.ts_x_origin = -sx; 1380 gcv.ts_x_origin = -sx;
1363 gcv.ts_y_origin = -sy; 1381 gcv.ts_y_origin = -sy;
1364 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1382 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1365 1383
1366 if (gc) 1384 if (gc)
1367 { 1385 {
1368 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1386 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1369 result |= transpPmapTiled; 1387 result |= transpPmapTiled;
1370 XFreeGC (dpy, gc); 1388 XFreeGC (dpy, gc);
1371 } 1389 }
1372 TIMING_TEST_PRINT_RESULT (tp);
1373 1390
1374 if (tiled_root_pmap != None) 1391 if (tiled_root_pmap != None)
1375 { 1392 {
1376 if (!need_client_side_rendering ()) 1393 if (!need_client_side_rendering ())
1377 { 1394 {
1378 if (flags & (blurNeeded | blurServerSide)) 1395 if ((flags & blurNeeded)
1396 && (flags & blurServerSide))
1379 { 1397 {
1380 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height)) 1398 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1381 result |= transpPmapBlurred; 1399 result |= transpPmapBlurred;
1382 } 1400 }
1383 if (flags & (tintNeeded | tintServerSide)) 1401 if ((flags & tintNeeded)
1402 && (flags & tintServerSide))
1384 { 1403 {
1385 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height)) 1404 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1386 result |= transpPmapTinted; 1405 result |= transpPmapTinted;
1387 } 1406 }
1388 } /* server side rendering completed */ 1407 } /* server side rendering completed */
1389 1408
1390 if (pixmap) 1409 if (pixmap)
1391 XFreePixmap (dpy, pixmap); 1410 XFreePixmap (dpy, pixmap);
1392 1411
1393 pixmap = tiled_root_pmap; 1412 pixmap = tiled_root_pmap;
1394 pmap_width = window_width; 1413 pmap_width = window_width;
1395 pmap_height = window_height; 1414 pmap_height = window_height;
1396 pmap_depth = root_depth; 1415 pmap_depth = target->depth;
1397 } 1416 }
1398 1417
1399 TIMING_TEST_PRINT_RESULT (tp); 1418 if (recoded_root_pmap != root_pixmap)
1419 XFreePixmap (dpy, recoded_root_pmap);
1400 1420
1401 return result; 1421 return result;
1402} 1422}
1403 1423
1404bool 1424void
1405bgPixmap_t::set_root_pixmap () 1425bgPixmap_t::set_root_pixmap ()
1406{ 1426{
1407 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1427 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1408 if (new_root_pixmap == None) 1428 if (new_root_pixmap == None)
1409 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1429 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1410 1430
1411 if (new_root_pixmap != root_pixmap)
1412 {
1413 root_pixmap = new_root_pixmap; 1431 root_pixmap = new_root_pixmap;
1414 return true;
1415 }
1416
1417 return false;
1418} 1432}
1419# endif /* ENABLE_TRANSPARENCY */ 1433# endif /* ENABLE_TRANSPARENCY */
1420 1434
1421# ifndef HAVE_AFTERIMAGE 1435# ifndef HAVE_AFTERIMAGE
1422static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm); 1436static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm);
… …
1427{ 1441{
1428 unsigned long background_flags = 0; 1442 unsigned long background_flags = 0;
1429 1443
1430 if (target == NULL) 1444 if (target == NULL)
1431 return false; 1445 return false;
1432
1433 TIMING_TEST_START (tp);
1434 1446
1435 invalidate (); 1447 invalidate ();
1436# ifdef ENABLE_TRANSPARENCY 1448# ifdef ENABLE_TRANSPARENCY
1437 if (flags & isTransparent) 1449 if (flags & isTransparent)
1438 { 1450 {
1439 /* we need to re-generate transparency pixmap in that case ! */ 1451 /* we need to re-generate transparency pixmap in that case ! */
1440 background_flags = make_transparency_pixmap (); 1452 background_flags = make_transparency_pixmap ();
1441 if (background_flags == 0) 1453 if (background_flags == 0)
1442 return false; 1454 return false;
1443 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1455 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1444 && pmap_depth == target->depth)
1445 flags = flags & ~isInvalid; 1456 flags = flags & ~isInvalid;
1446 } 1457 }
1447# endif 1458# endif
1448 1459
1449# ifdef BG_IMAGE_FROM_FILE 1460# ifdef BG_IMAGE_FROM_FILE
… …
1462 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1473 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1463 } 1474 }
1464 1475
1465 if (result) 1476 if (result)
1466 { 1477 {
1467# if !defined(HAVE_AFTERIMAGE) && !XFT 1478# if !defined(HAVE_AFTERIMAGE) && !XRENDER
1468 /* our own client-side tinting */ 1479 /* 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)) 1480 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1472 { 1481 {
1473 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1482 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1474 if (flags & tintSet) 1483 if (flags & tintSet)
1475 tint.get (c); 1484 tint.get (c);
… …
1479 1488
1480 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1489 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1481 1490
1482 if (gc) 1491 if (gc)
1483 { 1492 {
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); 1493 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1513 1494
1514 XFreeGC (target->dpy, gc); 1495 XFreeGC (target->dpy, gc);
1515 flags = flags & ~isInvalid; 1496 flags = flags & ~isInvalid;
1516 } 1497 }
1517 1498
… …
1527 } 1508 }
1528 } 1509 }
1529 1510
1530 apply (); 1511 apply ();
1531 1512
1532 XSync (target->dpy, False);
1533 valid_since = ev::now (); 1513 valid_since = ev::now ();
1534 1514
1535 TIMING_TEST_PRINT_RESULT (tp);
1536
1537 return true; 1515 return true;
1538} 1516}
1539 1517
1540bool 1518void
1541bgPixmap_t::set_target (rxvt_term *new_target) 1519bgPixmap_t::set_target (rxvt_term *new_target)
1542{ 1520{
1543 if (new_target)
1544 if (target != new_target)
1545 {
1546 target = new_target; 1521 target = new_target;
1547# ifdef ENABLE_TRANSPARENCY
1548 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1549# endif
1550 return true;
1551 }
1552
1553 return false;
1554} 1522}
1555 1523
1556void 1524void
1557bgPixmap_t::apply () 1525bgPixmap_t::apply ()
1558{ 1526{
1559 if (target) 1527 if (target == NULL)
1560 { 1528 return;
1561 flags &= ~isVtOrigin;
1562 1529
1563 if (pixmap != None) 1530 if (pixmap != None)
1564 { 1531 {
1565 /* set target's background to pixmap */ 1532 /* set target's background to pixmap */
1566# ifdef ENABLE_TRANSPARENCY 1533# ifdef ENABLE_TRANSPARENCY
1567 if (flags & isTransparent) 1534 if (flags & isTransparent)
1568 { 1535 {
1569 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1536 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1570 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1537 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1571 1538
1572 if (target->scrollBar.win) 1539 if (target->scrollBar.win)
1573 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1540 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1574 } 1541 }
1575 else 1542 else
1576# endif 1543# endif
1577 { 1544 {
1578 flags |= isVtOrigin;
1579 /* force old pixmap dereference in case it was transparent before :*/ 1545 /* 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]); 1546 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1592 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1547 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1593 /* do we also need to set scrollbar's background here ? */ 1548 /* do we also need to set scrollbar's background here ? */
1549
1594 if (target->scrollBar.win) 1550 if (target->scrollBar.win)
1595 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1551 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1596 } 1552 }
1553 }
1554 else
1555 {
1556 /* set target background to a pixel */
1557 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1558 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1559 /* do we also need to set scrollbar's background here ? */
1560 if (target->scrollBar.win)
1561 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1562 }
1597 1563
1598 /* don't want Expose on the parent or vt. It is better to use 1564 /* 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: */ 1565 scr_touch or we get a great deal of flicker otherwise: */
1600 XClearWindow (target->dpy, target->parent[0]); 1566 XClearWindow (target->dpy, target->parent[0]);
1601 1567
1602 if (target->scrollBar.state && target->scrollBar.win) 1568 if (target->scrollBar.state && target->scrollBar.win)
1603 { 1569 {
1604 target->scrollBar.state = STATE_IDLE; 1570 target->scrollBar.state = STATE_IDLE;
1605 target->scrollBar.show (0); 1571 target->scrollBar.show (0);
1606 } 1572 }
1607 1573
1608 target->want_refresh = 1; 1574 target->want_refresh = 1;
1609 flags |= hasChanged; 1575 flags |= hasChanged;
1610 }
1611} 1576}
1612 1577
1613#endif /* HAVE_BG_PIXMAP */ 1578#endif /* HAVE_BG_PIXMAP */
1614 1579
1615#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1580#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XRENDER
1616/* taken from aterm-0.4.2 */ 1581/* taken from aterm-0.4.2 */
1617 1582
1618static void 1583static void
1619ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm) 1584ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm)
1620{ 1585{

Diff Legend

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