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.107 by sf-exg, Mon Nov 1 14:29:33 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
… …
909# endif /* HAVE_PIXBUF */ 909# endif /* HAVE_PIXBUF */
910 910
911bool 911bool
912bgPixmap_t::set_file (const char *file) 912bgPixmap_t::set_file (const char *file)
913{ 913{
914 assert (file); 914 if (!file || !*file)
915 return false;
915 916
916 if (*file)
917 {
918 if (const char *p = strchr (file, ';')) 917 if (const char *p = strchr (file, ';'))
919 { 918 {
920 size_t len = p - file; 919 size_t len = p - file;
921 char *f = rxvt_temp_buf<char> (len + 1); 920 char *f = rxvt_temp_buf<char> (len + 1);
922 memcpy (f, file, len); 921 memcpy (f, file, len);
923 f[len] = '\0'; 922 f[len] = '\0';
924 file = f; 923 file = f;
925 } 924 }
926 925
927# ifdef HAVE_AFTERIMAGE 926# ifdef HAVE_AFTERIMAGE
928 if (!target->asimman) 927 if (!target->asimman)
929 target->asimman = create_generic_imageman (target->rs[Rs_path]); 928 target->asimman = create_generic_imageman (target->rs[Rs_path]);
930 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 929 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
931 if (image) 930 if (image)
932 { 931 {
933 if (original_asim) 932 if (original_asim)
934 safe_asimage_destroy (original_asim); 933 safe_asimage_destroy (original_asim);
935 original_asim = image; 934 original_asim = image;
936 have_image = true; 935 have_image = true;
937 return true; 936 return true;
938 } 937 }
939# endif 938# endif
940 939
941# ifdef HAVE_PIXBUF 940# ifdef HAVE_PIXBUF
942 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 941 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
943 if (image) 942 if (image)
944 { 943 {
945 if (pixbuf) 944 if (pixbuf)
946 g_object_unref (pixbuf); 945 g_object_unref (pixbuf);
947 pixbuf = image; 946 pixbuf = image;
948 have_image = true; 947 have_image = true;
949 return true; 948 return true;
950 } 949 }
951# endif 950# endif
952 }
953 951
954 return false; 952 return false;
955} 953}
956 954
957# endif /* BG_IMAGE_FROM_FILE */ 955# endif /* BG_IMAGE_FROM_FILE */
… …
1001 flags &= ~blurNeeded; 999 flags &= ~blurNeeded;
1002 else 1000 else
1003 flags |= blurNeeded; 1001 flags |= blurNeeded;
1004 1002
1005#if XRENDER 1003#if XRENDER
1006 XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root); 1004 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1007 if (filters) 1005 if (filters)
1008 { 1006 {
1009 for (int i = 0; i < filters->nfilter; i++) 1007 for (int i = 0; i < filters->nfilter; i++)
1010 if (!strcmp (filters->filter[i], FilterConvolution)) 1008 if (!strcmp (filters->filter[i], FilterConvolution))
1011 flags |= bgPixmap_t::blurServerSide; 1009 flags |= bgPixmap_t::blurServerSide;
… …
1299 return 0; 1297 return 0;
1300 1298
1301 /* 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
1302 * be always up-to-date, so let's use it : 1300 * be always up-to-date, so let's use it :
1303 */ 1301 */
1304 Window root = target->display->root;
1305 int screen = target->display->screen; 1302 int screen = target->display->screen;
1306 Display *dpy = target->dpy; 1303 Display *dpy = target->dpy;
1304 int root_depth = DefaultDepth (dpy, screen);
1307 int root_width = DisplayWidth (dpy, screen); 1305 int root_width = DisplayWidth (dpy, screen);
1308 int root_height = DisplayHeight (dpy, screen); 1306 int root_height = DisplayHeight (dpy, screen);
1307 unsigned int root_pmap_width, root_pmap_height;
1309 int window_width = target->szHint.width; 1308 int window_width = target->szHint.width;
1310 int window_height = target->szHint.height; 1309 int window_height = target->szHint.height;
1311 int sx, sy; 1310 int sx, sy;
1312 XGCValues gcv; 1311 XGCValues gcv;
1313 GC gc; 1312 GC gc;
… …
1317 /* 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 : */
1318 if (sx + window_width <= 0 || sy + window_height <= 0 1317 if (sx + window_width <= 0 || sy + window_height <= 0
1319 || sx >= root_width || sy >= root_height) 1318 || sx >= root_width || sy >= root_height)
1320 return 0; 1319 return 0;
1321 1320
1321 // validate root pixmap and get its size
1322 if (root_pixmap != None)
1323 {
1324 Window wdummy;
1325 int idummy;
1326 unsigned int udummy;
1327
1328 target->allowedxerror = -1;
1329
1330 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy))
1331 root_pixmap = None;
1332
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
1363 }
1364
1322 if (root_pixmap == None) 1365 if (root_pixmap == None)
1323 return 0; 1366 return 0;
1324 1367
1325 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);
1326 1369
1327 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1370 if (tiled_root_pmap == None) /* something really bad happened - abort */
1328 return 0; 1371 return 0;
1329 1372
1330 /* straightforward pixmap copy */ 1373 /* straightforward pixmap copy */
1331 gcv.tile = root_pixmap; 1374 gcv.tile = recoded_root_pmap;
1332 gcv.fill_style = FillTiled; 1375 gcv.fill_style = FillTiled;
1333 1376
1334 while (sx < 0) sx += (int)root_width; 1377 while (sx < 0) sx += (int)root_width;
1335 while (sy < 0) sy += (int)root_height; 1378 while (sy < 0) sy += (int)root_height;
1336 1379
1337 gcv.ts_x_origin = -sx; 1380 gcv.ts_x_origin = -sx;
1338 gcv.ts_y_origin = -sy; 1381 gcv.ts_y_origin = -sy;
1339 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1382 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1340 1383
1341 if (gc) 1384 if (gc)
1342 { 1385 {
1343 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);
1344 result |= transpPmapTiled; 1387 result |= transpPmapTiled;
… …
1347 1390
1348 if (tiled_root_pmap != None) 1391 if (tiled_root_pmap != None)
1349 { 1392 {
1350 if (!need_client_side_rendering ()) 1393 if (!need_client_side_rendering ())
1351 { 1394 {
1352 if (flags & (blurNeeded | blurServerSide)) 1395 if ((flags & blurNeeded)
1396 && (flags & blurServerSide))
1353 { 1397 {
1354 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))
1355 result |= transpPmapBlurred; 1399 result |= transpPmapBlurred;
1356 } 1400 }
1357 if (flags & (tintNeeded | tintServerSide)) 1401 if ((flags & tintNeeded)
1402 && (flags & 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
… …
1510 valid_since = ev::now (); 1513 valid_since = ev::now ();
1511 1514
1512 return true; 1515 return true;
1513} 1516}
1514 1517
1515bool 1518void
1516bgPixmap_t::set_target (rxvt_term *new_target) 1519bgPixmap_t::set_target (rxvt_term *new_target)
1517{ 1520{
1518 if (new_target)
1519 if (target != new_target)
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;
1526 }
1527
1528 return false;
1529} 1522}
1530 1523
1531void 1524void
1532bgPixmap_t::apply () 1525bgPixmap_t::apply ()
1533{ 1526{
1534 if (target) 1527 if (target == NULL)
1535 { 1528 return;
1529
1536 if (pixmap != None) 1530 if (pixmap != None)
1537 { 1531 {
1538 /* set target's background to pixmap */ 1532 /* set target's background to pixmap */
1539# ifdef ENABLE_TRANSPARENCY 1533# ifdef ENABLE_TRANSPARENCY
1540 if (flags & isTransparent) 1534 if (flags & isTransparent)
1541 { 1535 {
1542 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1536 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1543 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1537 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1544 1538
1545 if (target->scrollBar.win) 1539 if (target->scrollBar.win)
1546 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1540 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1547 } 1541 }
1548 else 1542 else
1549# endif 1543# endif
1550 { 1544 {
1551 /* force old pixmap dereference in case it was transparent before :*/ 1545 /* force old pixmap dereference in case it was transparent before :*/
1552 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1553 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1554 /* do we also need to set scrollbar's background here ? */
1555
1556 if (target->scrollBar.win)
1557 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1558 }
1559 }
1560 else
1561 {
1562 /* set target background to a pixel */
1563 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1546 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1564 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1547 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1565 /* do we also need to set scrollbar's background here ? */ 1548 /* do we also need to set scrollbar's background here ? */
1549
1566 if (target->scrollBar.win) 1550 if (target->scrollBar.win)
1567 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1551 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1568 } 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 }
1569 1563
1570 /* 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
1571 scr_touch or we get a great deal of flicker otherwise: */ 1565 scr_touch or we get a great deal of flicker otherwise: */
1572 XClearWindow (target->dpy, target->parent[0]); 1566 XClearWindow (target->dpy, target->parent[0]);
1573 1567
1574 if (target->scrollBar.state && target->scrollBar.win) 1568 if (target->scrollBar.state && target->scrollBar.win)
1575 { 1569 {
1576 target->scrollBar.state = STATE_IDLE; 1570 target->scrollBar.state = STATE_IDLE;
1577 target->scrollBar.show (0); 1571 target->scrollBar.show (0);
1578 } 1572 }
1579 1573
1580 target->want_refresh = 1; 1574 target->want_refresh = 1;
1581 flags |= hasChanged; 1575 flags |= hasChanged;
1582 }
1583} 1576}
1584 1577
1585#endif /* HAVE_BG_PIXMAP */ 1578#endif /* HAVE_BG_PIXMAP */
1586 1579
1587#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XRENDER 1580#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XRENDER

Diff Legend

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