Regularly check if graphics is modified when visible on screen (#10596)

[lyx.git] / src / graphics / GraphicsCacheItem.cpp

diff --git a/src/graphics/GraphicsCacheItem.cpp b/src/graphics/GraphicsCacheItem.cpp
index ea59173eff79bc93588ed18373b7c167965f4a68..4ed496a533d52d671b983e74a900e8891f219e05 100644 (file)
--- a/src/graphics/GraphicsCacheItem.cpp
+++ b/src/graphics/GraphicsCacheItem.cpp
@@ -14,6 +14,7 @@
 
 #include "GraphicsCacheItem.h"
 
+#include "Buffer.h"
 #include "GraphicsCache.h"
 #include "GraphicsConverter.h"
 #include "GraphicsImage.h"
@@ -42,7 +43,9 @@ class CacheItem::Impl : public boost::signals2::trackable {
 public:
 
        ///
-       Impl(FileName const & file);
+       Impl(FileName const & file, FileName const & doc_file);
+
+       void startMonitor();
 
        /**
         *  If no file conversion is needed, then tryDisplayFormat() calls
@@ -93,8 +96,10 @@ public:
 
        /// The filename we refer too.
        FileName const filename_;
+       /// The document filename this graphic item belongs to
+       FileName const & doc_file_;
        ///
-       FileMonitor const monitor_;
+       ActiveFileMonitorPtr monitor_;
 
        /// Is the file compressed?
        bool zipped_;
@@ -125,8 +130,8 @@ public:
 };
 
 
-CacheItem::CacheItem(FileName const & file)
-       : pimpl_(new Impl(file))
+CacheItem::CacheItem(FileName const & file, FileName const & doc_file)
+  : pimpl_(new Impl(file,doc_file))
 {}
 
 
@@ -164,20 +169,21 @@ void CacheItem::startLoading() const
 
 void CacheItem::startMonitoring() const
 {
-       if (!pimpl_->monitor_.monitoring())
-               pimpl_->monitor_.start();
+       pimpl_->startMonitor();
 }
 
 
 bool CacheItem::monitoring() const
 {
-       return pimpl_->monitor_.monitoring();
+       return (bool)pimpl_->monitor_;
 }
 
 
-unsigned long CacheItem::checksum() const
+void CacheItem::checkModifiedAsync() const
 {
-       return pimpl_->monitor_.checksum();
+       if (!pimpl_->monitor_)
+               return;
+       pimpl_->monitor_->checkModifiedAsync();
 }
 
 
@@ -204,14 +210,20 @@ boost::signals2::connection CacheItem::connect(slot_type const & slot) const
 //------------------------------
 
 
-CacheItem::Impl::Impl(FileName const & file)
-       : filename_(file),
-         monitor_(file, 2000),
+CacheItem::Impl::Impl(FileName const & file, FileName const & doc_file)
+       : filename_(file), doc_file_(doc_file),
          zipped_(false),
          remove_loaded_file_(false),
          status_(WaitingToLoad)
+{}
+
+
+void CacheItem::Impl::startMonitor()
 {
-       monitor_.connect(bind(&Impl::startLoading, this));
+       if (monitor_)
+               return;
+       monitor_ = FileSystemWatcher::activeMonitor(filename_);
+       monitor_->connect([=](){ startLoading(); });
 }
 
 
@@ -312,13 +324,12 @@ bool CacheItem::Impl::loadImage()
 }
 
 
-static string const findTargetFormat(string const & from)
-{
-       typedef vector<string> FormatList;
-       FormatList const & formats = Cache::get().loadableFormats();
+typedef vector<string> FormatList;
 
+static string const findTargetFormat(FormatList const & format_list, string const & from)
+{
         // There must be a format to load from.
-       LASSERT(!formats.empty(), return string());
+       LASSERT(!theFormats().empty(), return string());
 
        // Use the standard converter if we don't know the format to load
        // from.
@@ -326,15 +337,15 @@ static string const findTargetFormat(string const & from)
                return string("ppm");
 
        // First ascertain if we can load directly with no conversion
-       FormatList::const_iterator it  = formats.begin();
-       FormatList::const_iterator end = formats.end();
+       FormatList::const_iterator it  = format_list.begin();
+       FormatList::const_iterator end = format_list.end();
        for (; it != end; ++it) {
                if (from == *it)
                        return *it;
        }
 
        // So, we have to convert to a loadable format. Can we?
-       it = formats.begin();
+       it = format_list.begin();
        for (; it != end; ++it) {
                if (lyx::graphics::Converter::isReachable(from, *it))
                        return *it;
@@ -361,7 +372,7 @@ bool CacheItem::Impl::tryDisplayFormat(FileName & filename, string & from)
                return false;
        }
 
-       zipped_ = formats.isZippedFile(filename_);
+       zipped_ = theFormats().isZippedFile(filename_);
        if (zipped_) {
                string tempname = unzippedFileName(filename_.toFilesystemEncoding());
                string const ext = getExtension(tempname);
@@ -386,13 +397,13 @@ bool CacheItem::Impl::tryDisplayFormat(FileName & filename, string & from)
                << "\tAttempting to convert image file: " << filename
                << "\n\twith displayed filename: " << to_utf8(displayed_filename));
 
-       from = formats.getFormatFromFile(filename);
+       from = theFormats().getFormatFromFile(filename);
        if (from.empty()) {
                status_ = ErrorConverting;
                LYXERR(Debug::GRAPHICS, "\tCould not determine file format.");
        }
        LYXERR(Debug::GRAPHICS, "\n\tThe file contains " << from << " format data.");
-       to_ = findTargetFormat(from);
+       to_ = findTargetFormat(Cache::get().loadableFormats(), from);
 
        if (from == to_) {
                // No conversion needed!
@@ -438,7 +449,7 @@ void CacheItem::Impl::convertToDisplayFormat()
        // Connect a signal to this->imageConverted and pass this signal to
        // the graphics converter so that we can load the modified file
        // on completion of the conversion process.
-       converter_ = make_unique<Converter>(filename, to_file_base.absFileName(),
+       converter_ = make_unique<Converter>(doc_file_, filename, to_file_base.absFileName(),
                                            from, to_);
        converter_->connect(bind(&Impl::imageConverted, this, _1));
        converter_->startConversion();