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.100 by sf-exg, Sat Oct 30 23:15:14 2010 UTC vs.
Revision 1.103 by sf-exg, Sun Oct 31 11:15:29 2010 UTC

… …
729 return false; 729 return false;
730 730
731 if (!pixbuf) 731 if (!pixbuf)
732 return false; 732 return false;
733 733
734#if !XFT 734#if !XRENDER
735 if (background_flags) 735 if (background_flags)
736 return false; 736 return false;
737#endif 737#endif
738 738
739 GdkPixbuf *result; 739 GdkPixbuf *result;
… …
856 dst_width, dst_height, 856 dst_width, dst_height,
857 XLIB_RGB_DITHER_NONE, 857 XLIB_RGB_DITHER_NONE,
858 0, 0); 858 0, 0);
859 } 859 }
860 860
861#if XFT 861#if XRENDER
862 if (background_flags) 862 if (background_flags)
863 { 863 {
864 Display *dpy = target->dpy; 864 Display *dpy = target->dpy;
865 XRenderPictureAttributes pa; 865 XRenderPictureAttributes pa;
866 866
867 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen)); 867 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, target->visual);
868 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 868 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
869 869
870 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); 870 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
871 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa); 871 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
872 872
… …
1000 if (v_blurRadius == 0 && h_blurRadius == 0) 1000 if (v_blurRadius == 0 && h_blurRadius == 0)
1001 flags &= ~blurNeeded; 1001 flags &= ~blurNeeded;
1002 else 1002 else
1003 flags |= blurNeeded; 1003 flags |= blurNeeded;
1004 1004
1005#if XFT 1005#if XRENDER
1006 XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root); 1006 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1007 if (filters) 1007 if (filters)
1008 { 1008 {
1009 for (int i = 0; i < filters->nfilter; i++) 1009 for (int i = 0; i < filters->nfilter; i++)
1010 if (!strcmp (filters->filter[i], FilterConvolution)) 1010 if (!strcmp (filters->filter[i], FilterConvolution))
1011 flags |= bgPixmap_t::blurServerSide; 1011 flags |= bgPixmap_t::blurServerSide;
… …
1050 { 1050 {
1051 if (flags & bgPixmap_t::tintWholesome) 1051 if (flags & bgPixmap_t::tintWholesome)
1052 flags |= bgPixmap_t::tintServerSide; 1052 flags |= bgPixmap_t::tintServerSide;
1053 else 1053 else
1054 { 1054 {
1055#if XFT 1055#if XRENDER
1056 flags |= bgPixmap_t::tintServerSide; 1056 flags |= bgPixmap_t::tintServerSide;
1057#endif 1057#endif
1058 } 1058 }
1059 } 1059 }
1060 1060
… …
1107 } 1107 }
1108 1108
1109 return false; 1109 return false;
1110} 1110}
1111 1111
1112#if XFT 1112#if XRENDER
1113static void 1113static void
1114get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 1114get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1115{ 1115{
1116 double sigma = radius / 2.0; 1116 double sigma = radius / 2.0;
1117 double scale = sqrt (2.0 * M_PI) * sigma; 1117 double scale = sqrt (2.0 * M_PI) * sigma;
… …
1134 1134
1135bool 1135bool
1136bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1136bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1137{ 1137{
1138 bool ret = false; 1138 bool ret = false;
1139#if XFT 1139#if XRENDER
1140 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1140 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1141 double *kernel = (double *)malloc (size * sizeof (double)); 1141 double *kernel = (double *)malloc (size * sizeof (double));
1142 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1142 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1143 1143
1144 Display *dpy = target->dpy; 1144 Display *dpy = target->dpy;
… …
1221 XFreeGC (dpy, gc); 1221 XFreeGC (dpy, gc);
1222 } 1222 }
1223 } 1223 }
1224 else 1224 else
1225 { 1225 {
1226# if XFT 1226# if XRENDER
1227 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1227 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1228 1228
1229 if (flags & tintSet) 1229 if (flags & tintSet)
1230 tint.get (c); 1230 tint.get (c);
1231 1231
… …
1299 return 0; 1299 return 0;
1300 1300
1301 /* root dimensions may change from call to call - but Display structure should 1301 /* root dimensions may change from call to call - but Display structure should
1302 * be always up-to-date, so let's use it : 1302 * be always up-to-date, so let's use it :
1303 */ 1303 */
1304 Window root = target->display->root;
1305 int screen = target->display->screen; 1304 int screen = target->display->screen;
1306 Display *dpy = target->dpy; 1305 Display *dpy = target->dpy;
1306 int root_depth = DefaultDepth (dpy, screen);
1307 int root_width = DisplayWidth (dpy, screen); 1307 int root_width = DisplayWidth (dpy, screen);
1308 int root_height = DisplayHeight (dpy, screen); 1308 int root_height = DisplayHeight (dpy, screen);
1309 unsigned int root_pmap_width, root_pmap_height;
1309 int window_width = target->szHint.width; 1310 int window_width = target->szHint.width;
1310 int window_height = target->szHint.height; 1311 int window_height = target->szHint.height;
1311 int sx, sy; 1312 int sx, sy;
1312 XGCValues gcv; 1313 XGCValues gcv;
1313 GC gc; 1314 GC gc;
… …
1317 /* check if we are outside of the visible part of the virtual screen : */ 1318 /* check if we are outside of the visible part of the virtual screen : */
1318 if (sx + window_width <= 0 || sy + window_height <= 0 1319 if (sx + window_width <= 0 || sy + window_height <= 0
1319 || sx >= root_width || sy >= root_height) 1320 || sx >= root_width || sy >= root_height)
1320 return 0; 1321 return 0;
1321 1322
1323 // validate root pixmap and get its size
1324 if (root_pixmap != None)
1325 {
1326 Window wdummy;
1327 int idummy;
1328 unsigned int udummy;
1329
1330 target->allowedxerror = -1;
1331
1332 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy))
1333 root_pixmap = None;
1334
1335 target->allowedxerror = 0;
1336 }
1337
1338 Pixmap recoded_root_pmap = root_pixmap;
1339
1340 if (root_pixmap != None && root_depth != target->depth)
1341 {
1342#if XRENDER
1343 XRenderPictureAttributes pa;
1344
1345 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1346 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1347
1348 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
1349 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
1350 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1351
1352 if (src && dst)
1353 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1354 else
1355 root_pixmap = None;
1356
1357 XRenderFreePicture (dpy, src);
1358 XRenderFreePicture (dpy, dst);
1359#else
1360 root_pixmap = None;
1361#endif
1362 }
1363
1322 if (root_pixmap == None) 1364 if (root_pixmap == None)
1323 return 0; 1365 return 0;
1324 1366
1325 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1367 Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth);
1326 1368
1327 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1369 if (tiled_root_pmap == None) /* something really bad happened - abort */
1328 return 0; 1370 return 0;
1329 1371
1330 /* straightforward pixmap copy */ 1372 /* straightforward pixmap copy */
1331 gcv.tile = root_pixmap; 1373 gcv.tile = recoded_root_pmap;
1332 gcv.fill_style = FillTiled; 1374 gcv.fill_style = FillTiled;
1333 1375
1334 while (sx < 0) sx += (int)root_width; 1376 while (sx < 0) sx += (int)root_width;
1335 while (sy < 0) sy += (int)root_height; 1377 while (sy < 0) sy += (int)root_height;
1336 1378
1337 gcv.ts_x_origin = -sx; 1379 gcv.ts_x_origin = -sx;
1338 gcv.ts_y_origin = -sy; 1380 gcv.ts_y_origin = -sy;
1339 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1381 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1340 1382
1341 if (gc) 1383 if (gc)
1342 { 1384 {
1343 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1385 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1344 result |= transpPmapTiled; 1386 result |= transpPmapTiled;
… …
1349 { 1391 {
1350 if (!need_client_side_rendering ()) 1392 if (!need_client_side_rendering ())
1351 { 1393 {
1352 if (flags & (blurNeeded | blurServerSide)) 1394 if (flags & (blurNeeded | blurServerSide))
1353 { 1395 {
1354 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height)) 1396 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1355 result |= transpPmapBlurred; 1397 result |= transpPmapBlurred;
1356 } 1398 }
1357 if (flags & (tintNeeded | tintServerSide)) 1399 if (flags & (tintNeeded | tintServerSide))
1358 { 1400 {
1359 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height)) 1401 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1360 result |= transpPmapTinted; 1402 result |= transpPmapTinted;
1361 } 1403 }
1362 } /* server side rendering completed */ 1404 } /* server side rendering completed */
1363 1405
1364 if (pixmap) 1406 if (pixmap)
1365 XFreePixmap (dpy, pixmap); 1407 XFreePixmap (dpy, pixmap);
1366 1408
1367 pixmap = tiled_root_pmap; 1409 pixmap = tiled_root_pmap;
1368 pmap_width = window_width; 1410 pmap_width = window_width;
1369 pmap_height = window_height; 1411 pmap_height = window_height;
1370 pmap_depth = root_depth; 1412 pmap_depth = target->depth;
1371 } 1413 }
1414
1415 if (recoded_root_pmap != root_pixmap)
1416 XFreePixmap (dpy, recoded_root_pmap);
1372 1417
1373 return result; 1418 return result;
1374} 1419}
1375 1420
1376void 1421void
… …
1379 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1424 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1380 if (new_root_pixmap == None) 1425 if (new_root_pixmap == None)
1381 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1426 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1382 1427
1383 root_pixmap = new_root_pixmap; 1428 root_pixmap = new_root_pixmap;
1384
1385 // validate root pixmap
1386 if (root_pixmap != None)
1387 {
1388 unsigned int width, height;
1389 Window wdummy;
1390 int idummy;
1391 unsigned int udummy;
1392
1393 target->allowedxerror = -1;
1394
1395 if (!XGetGeometry (target->dpy, root_pixmap, &wdummy, &idummy, &idummy, &width, &height, &udummy, &udummy))
1396 root_pixmap = None;
1397
1398 target->allowedxerror = 0;
1399 }
1400} 1429}
1401# endif /* ENABLE_TRANSPARENCY */ 1430# endif /* ENABLE_TRANSPARENCY */
1402 1431
1403# ifndef HAVE_AFTERIMAGE 1432# ifndef HAVE_AFTERIMAGE
1404static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm); 1433static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm);
… …
1418 { 1447 {
1419 /* we need to re-generate transparency pixmap in that case ! */ 1448 /* we need to re-generate transparency pixmap in that case ! */
1420 background_flags = make_transparency_pixmap (); 1449 background_flags = make_transparency_pixmap ();
1421 if (background_flags == 0) 1450 if (background_flags == 0)
1422 return false; 1451 return false;
1423 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1452 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1424 && pmap_depth == target->depth)
1425 flags = flags & ~isInvalid; 1453 flags = flags & ~isInvalid;
1426 } 1454 }
1427# endif 1455# endif
1428 1456
1429# ifdef BG_IMAGE_FROM_FILE 1457# ifdef BG_IMAGE_FROM_FILE
… …
1442 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1470 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1443 } 1471 }
1444 1472
1445 if (result) 1473 if (result)
1446 { 1474 {
1447# if !defined(HAVE_AFTERIMAGE) && !XFT 1475# if !defined(HAVE_AFTERIMAGE) && !XRENDER
1448 /* our own client-side tinting */ 1476 /* our own client-side tinting */
1449 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1477 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1450 { 1478 {
1451 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1479 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1452 if (flags & tintSet) 1480 if (flags & tintSet)
… …
1457 1485
1458 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1486 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1459 1487
1460 if (gc) 1488 if (gc)
1461 { 1489 {
1462 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1463 {
1464 XFreePixmap (target->dpy, pixmap);
1465 pixmap = None;
1466 }
1467
1468 if (pixmap == None)
1469 {
1470 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1471 pmap_width = result->width;
1472 pmap_height = result->height;
1473 pmap_depth = target->depth;
1474 }
1475
1476 if (pmap_depth != result->depth)
1477 {
1478 /* Bad Match error will ensue ! stupid X !!!! */
1479 if (result->depth == 24 && pmap_depth == 32)
1480 result->depth = 32;
1481 else if (result->depth == 32 && pmap_depth == 24)
1482 result->depth = 24;
1483 else
1484 {
1485 /* TODO: implement image recoding */
1486 }
1487 }
1488
1489 if (pmap_depth == result->depth)
1490 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1490 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1491 1491
1492 XFreeGC (target->dpy, gc); 1492 XFreeGC (target->dpy, gc);
1493 flags = flags & ~isInvalid; 1493 flags = flags & ~isInvalid;
1494 } 1494 }
1495 1495
… …
1517{ 1517{
1518 if (new_target) 1518 if (new_target)
1519 if (target != new_target) 1519 if (target != new_target)
1520 { 1520 {
1521 target = new_target; 1521 target = new_target;
1522# ifdef ENABLE_TRANSPARENCY
1523 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1524# endif
1525 return true; 1522 return true;
1526 } 1523 }
1527 1524
1528 return false; 1525 return false;
1529} 1526}
… …
1582 } 1579 }
1583} 1580}
1584 1581
1585#endif /* HAVE_BG_PIXMAP */ 1582#endif /* HAVE_BG_PIXMAP */
1586 1583
1587#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1584#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XRENDER
1588/* taken from aterm-0.4.2 */ 1585/* taken from aterm-0.4.2 */
1589 1586
1590static void 1587static void
1591ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm) 1588ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm)
1592{ 1589{

Diff Legend

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