#include "output.h"
#include "OutputParams.h"
#include "TexRow.h"
+#include "texstream.h"
#include "frontends/Application.h" // hexName
#include "support/bind.h"
#include "support/TempFile.h"
-#include <sstream>
+#include <atomic>
#include <fstream>
#include <iomanip>
+#include <memory>
+#include <mutex>
+#include <sstream>
#include <QTimer>
return ptr;
}
- // FIXME THREAD
- static bool first = true;
- if (first) {
- first = false;
- LYXERR0("PreviewLoader::startLoading()\n"
- << "No converter from \"" << from << "\" format has been defined.");
- }
+ // Show the error only once
+#ifdef LYX_USE_STD_CALL_ONCE
+ // This is thread-safe.
+ static once_flag flag;
+ call_once(flag, [&](){
+ LYXERR0("PreviewLoader::startLoading()\n"
+ << "No converter from \"" << from
+ << "\" format has been defined.");
+ });
+#else
+ // This is also thread-safe according to ยง6.7.4 of the C++11 standard.
+ static bool once = ([&]{
+ LYXERR0("PreviewLoader::startLoading()\n"
+ << "No converter from \"" << from
+ << "\" format has been defined.");
+ } (), true);
+#endif
return 0;
}
namespace lyx {
namespace graphics {
-class PreviewLoader::Impl : public boost::signals::trackable {
+class PreviewLoader::Impl : public boost::signals2::trackable {
public:
///
Impl(PreviewLoader & p, Buffer const & b);
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);
void refreshPreviews();
/// Emit this signal when an image is ready for display.
- boost::signal<void(PreviewImage const &)> imageReady;
+ boost::signals2::signal<void(PreviewImage const &)> imageReady;
Buffer const & buffer() const { return buffer_; }
/** cache_ allows easy retrieval of already-generated images
* using the LaTeX snippet as the identifier.
*/
- typedef shared_ptr<PreviewImage> PreviewImagePtr;
+ typedef s
td::shared_ptr<PreviewImage> PreviewImagePtr;
///
typedef map<string, PreviewImagePtr> Cache;
///
*/
InProgressProcesses in_progress_;
- ///
- set<docstring> macrodefs_;
-
///
PreviewLoader & parent_;
///
///
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_;
}
-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);
}
-boost::signals::connection PreviewLoader::connect(slot_type const & slot) const
+boost::signals2::connection PreviewLoader::connect(slot_type const & slot) const
{
return pimpl_->imageReady.connect(slot);
}
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");
PreviewLoader::Impl::~Impl()
{
+ delete delay_refresh_;
+
InProgressProcesses::iterator ipit = in_progress_.begin();
InProgressProcesses::iterator ipend = in_progress_.end();
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();
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();
}
}
-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_)
return;
}
- TexRow texrow;
- otexstream os(of, texrow);
+ otexstream os(of);
OutputParams runparams(&enc);
LaTeXFeatures features(buffer_, buffer_.params(), runparams);
}
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()
if (wait) {
ForkedCall call(buffer_.filePath(), buffer_.layoutPos());
int ret = call.startScript(ForkedProcess::Wait, command);
- // FIXME THREAD
- static int fake = (2^20) + 1;
+ static atomic_int fake((2^20) + 1);
int pid = fake++;
inprogress.pid = pid;
inprogress.command = command;
if (git == in_progress_.end()) {
lyxerr << "PreviewLoader::finishedGenerating(): unable to find "
"data for PID " << pid << endl;
+ finished_generating_ = true;
return;
}
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());
for (; nit != nend; ++nit) {
imageReady(*nit->get());
}
+ finished_generating_ = true;
}
projects / lyx.git / blobdiff