whitespace only

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

diff --git a/src/graphics/PreviewLoader.cpp b/src/graphics/PreviewLoader.cpp
index 3c82c006603885cc43abfbcfdd6f49bbeac5587a..88320e4517b5106ce3cd1d13f7177b2a9a4cdcef 100644 (file)
--- a/src/graphics/PreviewLoader.cpp
+++ b/src/graphics/PreviewLoader.cpp
@@ -207,10 +207,6 @@ public:
        void add(string const & latex_snippet);
        ///
        void remove(string const & latex_snippet);
-       /// Record math macro definitions added to the loader
-       void addMacroDef(docstring const & latex_snippet);
-       /// Has a math macro definition already been added to the loader?
-       bool hasMacroDef(docstring const & latex_snippet) const;
        /// \p wait whether to wait for the process to complete or, instead,
        /// to do it in the background.
        void startLoading(bool wait = false);
@@ -250,9 +246,6 @@ private:
         */
        InProgressProcesses in_progress_;
 
-       ///
-       set<docstring> macrodefs_;
-
        ///
        PreviewLoader & parent_;
        ///
@@ -260,7 +253,13 @@ private:
        ///
        mutable int font_scaling_factor_;
        ///
+       mutable int fg_color_;
+       ///
+       mutable int bg_color_;
+       ///
        QTimer * delay_refresh_;
+       ///
+       bool finished_generating_;
 
        /// We don't own this
        static lyx::Converter const * pconverter_;
@@ -309,18 +308,6 @@ void PreviewLoader::remove(string const & latex_snippet) const
 }
 
 
-void PreviewLoader::addMacroDef(docstring const & latex_snippet) const
-{
-       pimpl_->addMacroDef(latex_snippet);
-}
-
-
-bool PreviewLoader::hasMacroDef(docstring const & latex_snippet) const
-{
-       return pimpl_->hasMacroDef(latex_snippet);
-}
-
-
 void PreviewLoader::startLoading(bool wait) const
 {
        pimpl_->startLoading(wait);
@@ -421,9 +408,16 @@ namespace lyx {
 namespace graphics {
 
 PreviewLoader::Impl::Impl(PreviewLoader & p, Buffer const & b)
-       : parent_(p), buffer_(b)
+       : parent_(p), buffer_(b), finished_generating_(true)
 {
        font_scaling_factor_ = int(buffer_.fontScalingFactor());
+       if (theApp()) {
+               fg_color_ = strtol(theApp()->hexName(foregroundColor()).c_str(), 0, 16);
+               bg_color_ = strtol(theApp()->hexName(backgroundColor()).c_str(), 0, 16);
+       } else {
+               fg_color_ = 0x0;
+               bg_color_ = 0xffffff;
+       }
        if (!pconverter_)
                pconverter_ = setConverter("lyxpreview");
 
@@ -450,14 +444,22 @@ PreviewImage const *
 PreviewLoader::Impl::preview(string const & latex_snippet) const
 {
        int fs = int(buffer_.fontScalingFactor());
-       if (font_scaling_factor_ != fs) {
-               // Schedule refresh of all previews on zoom changes.
+       int fg = 0x0;
+       int bg = 0xffffff;
+       if (theApp()) {
+               fg = strtol(theApp()->hexName(foregroundColor()).c_str(), 0, 16);
+               bg = strtol(theApp()->hexName(backgroundColor()).c_str(), 0, 16);
+       }
+       if (font_scaling_factor_ != fs || fg_color_ != fg || bg_color_ != bg) {
+               // Schedule refresh of all previews on zoom or color changes.
                // The previews are regenerated only after the zoom factor
                // has not been changed for about 1 second.
+               fg_color_ = fg;
+               bg_color_ = bg;
                delay_refresh_->start(1000);
        }
-       // Don't try to access the cache until we are finished.
-       if (delay_refresh_->isActive())
+       // Don't try to access the cache until we are done.
+       if (delay_refresh_->isActive() || !finished_generating_)
                return 0;
        Cache::const_iterator it = cache_.find(latex_snippet);
        return (it == cache_.end()) ? 0 : it->second.get();
@@ -467,10 +469,16 @@ PreviewLoader::Impl::preview(string const & latex_snippet) const
 void PreviewLoader::Impl::refreshPreviews()
 {
        font_scaling_factor_ = int(buffer_.fontScalingFactor());
+       // Reschedule refresh until the previous process completed.
+       if (!finished_generating_) {
+               delay_refresh_->start(1000);
+               return;
+       }
        Cache::const_iterator cit = cache_.begin();
        Cache::const_iterator cend = cache_.end();
        while (cit != cend)
                parent_.remove((cit++)->first);
+       finished_generating_ = false;
        buffer_.updatePreviews();
 }
 
@@ -581,18 +589,6 @@ void PreviewLoader::Impl::remove(string const & latex_snippet)
 }
 
 
-void PreviewLoader::Impl::addMacroDef(docstring const & latex_snippet)
-{
-       macrodefs_.insert(latex_snippet);
-}
-
-
-bool PreviewLoader::Impl::hasMacroDef(docstring const & latex_snippet) const
-{
-       return macrodefs_.find(latex_snippet) != macrodefs_.end();
-}
-
-
 void PreviewLoader::Impl::startLoading(bool wait)
 {
        if (pending_.empty() || !pconverter_)
@@ -643,6 +639,11 @@ void PreviewLoader::Impl::startLoading(bool wait)
        }
        of << "\\batchmode\n";
 
+       // Set \jobname of previews to the document name (see bug 9627)
+       of << "\\def\\jobname{"
+          << from_utf8(changeExtension(buffer_.latexName(true), ""))
+          << "}\n";
+
        LYXERR(Debug::LATEX, "Format = " << buffer_.params().getDefaultOutputFormat());
        string latexparam = "";
        bool docformat = !buffer_.params().default_output_format.empty()
@@ -769,6 +770,7 @@ void PreviewLoader::Impl::finishedGenerating(pid_t pid, int retval)
        if (git == in_progress_.end()) {
                lyxerr << "PreviewLoader::finishedGenerating(): unable to find "
                        "data for PID " << pid << endl;
+               finished_generating_ = true;
                return;
        }
 
@@ -777,8 +779,11 @@ void PreviewLoader::Impl::finishedGenerating(pid_t pid, int retval)
        LYXERR(Debug::GRAPHICS, "PreviewLoader::finishedInProgress("
                                << retval << "): processing " << status
                                << " for " << command);
-       if (retval > 0)
+       if (retval > 0) {
+               in_progress_.erase(git);
+               finished_generating_ = true;
                return;
+       }
 
        // Read the metrics file, if it exists
        vector<double> ascent_fractions(git->second.snippets.size());
@@ -819,6 +824,7 @@ void PreviewLoader::Impl::finishedGenerating(pid_t pid, int retval)
        for (; nit != nend; ++nit) {
                imageReady(*nit->get());
        }
+       finished_generating_ = true;
 }