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.101 by sf-exg, Sun Oct 31 08:28:04 2010 UTC vs.
Revision 1.104 by sf-exg, Sun Oct 31 17:44:39 2010 UTC

… …
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
… …
1001 flags &= ~blurNeeded; 1001 flags &= ~blurNeeded;
1002 else 1002 else
1003 flags |= blurNeeded; 1003 flags |= blurNeeded;
1004 1004
1005#if XRENDER 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;
… …
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 {
1356 XFreePixmap (dpy, recoded_root_pmap);
1357 root_pixmap = None;
1358 }
1359
1360 XRenderFreePicture (dpy, src);
1361 XRenderFreePicture (dpy, dst);
1362#else
1363 root_pixmap = None;
1364#endif
1365 }
1366
1322 if (root_pixmap == None) 1367 if (root_pixmap == None)
1323 return 0; 1368 return 0;
1324 1369
1325 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1370 Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth);
1326 1371
1327 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1372 if (tiled_root_pmap == None) /* something really bad happened - abort */
1328 return 0; 1373 return 0;
1329 1374
1330 /* straightforward pixmap copy */ 1375 /* straightforward pixmap copy */
1331 gcv.tile = root_pixmap; 1376 gcv.tile = recoded_root_pmap;
1332 gcv.fill_style = FillTiled; 1377 gcv.fill_style = FillTiled;
1333 1378
1334 while (sx < 0) sx += (int)root_width; 1379 while (sx < 0) sx += (int)root_width;
1335 while (sy < 0) sy += (int)root_height; 1380 while (sy < 0) sy += (int)root_height;
1336 1381
1337 gcv.ts_x_origin = -sx; 1382 gcv.ts_x_origin = -sx;
1338 gcv.ts_y_origin = -sy; 1383 gcv.ts_y_origin = -sy;
1339 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1384 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1340 1385
1341 if (gc) 1386 if (gc)
1342 { 1387 {
1343 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1388 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1344 result |= transpPmapTiled; 1389 result |= transpPmapTiled;
… …
1349 { 1394 {
1350 if (!need_client_side_rendering ()) 1395 if (!need_client_side_rendering ())
1351 { 1396 {
1352 if (flags & (blurNeeded | blurServerSide)) 1397 if (flags & (blurNeeded | blurServerSide))
1353 { 1398 {
1354 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height)) 1399 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1355 result |= transpPmapBlurred; 1400 result |= transpPmapBlurred;
1356 } 1401 }
1357 if (flags & (tintNeeded | tintServerSide)) 1402 if (flags & (tintNeeded | tintServerSide))
1358 { 1403 {
1359 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))
1360 result |= transpPmapTinted; 1405 result |= transpPmapTinted;
1361 } 1406 }
1362 } /* server side rendering completed */ 1407 } /* server side rendering completed */
1363 1408
1364 if (pixmap) 1409 if (pixmap)
1365 XFreePixmap (dpy, pixmap); 1410 XFreePixmap (dpy, pixmap);
1366 1411
1367 pixmap = tiled_root_pmap; 1412 pixmap = tiled_root_pmap;
1368 pmap_width = window_width; 1413 pmap_width = window_width;
1369 pmap_height = window_height; 1414 pmap_height = window_height;
1370 pmap_depth = root_depth; 1415 pmap_depth = target->depth;
1371 } 1416 }
1417
1418 if (recoded_root_pmap != root_pixmap)
1419 XFreePixmap (dpy, recoded_root_pmap);
1372 1420
1373 return result; 1421 return result;
1374} 1422}
1375 1423
1376void 1424void
… …
1379 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1427 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1380 if (new_root_pixmap == None) 1428 if (new_root_pixmap == None)
1381 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1429 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1382 1430
1383 root_pixmap = new_root_pixmap; 1431 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} 1432}
1401# endif /* ENABLE_TRANSPARENCY */ 1433# endif /* ENABLE_TRANSPARENCY */
1402 1434
1403# ifndef HAVE_AFTERIMAGE 1435# ifndef HAVE_AFTERIMAGE
1404static 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);
… …
1418 { 1450 {
1419 /* we need to re-generate transparency pixmap in that case ! */ 1451 /* we need to re-generate transparency pixmap in that case ! */
1420 background_flags = make_transparency_pixmap (); 1452 background_flags = make_transparency_pixmap ();
1421 if (background_flags == 0) 1453 if (background_flags == 0)
1422 return false; 1454 return false;
1423 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1455 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1424 && pmap_depth == target->depth)
1425 flags = flags & ~isInvalid; 1456 flags = flags & ~isInvalid;
1426 } 1457 }
1427# endif 1458# endif
1428 1459
1429# ifdef BG_IMAGE_FROM_FILE 1460# ifdef BG_IMAGE_FROM_FILE
… …
1457 1488
1458 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1489 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1459 1490
1460 if (gc) 1491 if (gc)
1461 { 1492 {
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); 1493 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1491 1494
1492 XFreeGC (target->dpy, gc); 1495 XFreeGC (target->dpy, gc);
1493 flags = flags & ~isInvalid; 1496 flags = flags & ~isInvalid;
1494 } 1497 }
1495 1498
… …
1517{ 1520{
1518 if (new_target) 1521 if (new_target)
1519 if (target != new_target) 1522 if (target != new_target)
1520 { 1523 {
1521 target = new_target; 1524 target = new_target;
1522# ifdef ENABLE_TRANSPARENCY
1523 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1524# endif
1525 return true; 1525 return true;
1526 } 1526 }
1527 1527
1528 return false; 1528 return false;
1529} 1529}

Diff Legend

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