X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FRenderPreview.cpp;h=0b17d2f83c5ff40d9d938ba66642d01df4c4d87a;hb=48b1e8a0aca2f3f3faa8f1f800568e47792ba9a0;hp=0c567631b0d4d47d7c46fe5eb53d97a6df092cb3;hpb=850e4d80c0ec8df578c4ab5d73952e435141b7d6;p=lyx.git

diff --git a/src/insets/RenderPreview.cpp b/src/insets/RenderPreview.cpp
index 0c567631b0..0b17d2f83c 100644
--- a/src/insets/RenderPreview.cpp
+++ b/src/insets/RenderPreview.cpp
@@ -31,17 +31,39 @@
 #include "support/lassert.h"
 #include "support/lstrings.h"
 
-#include "support/bind.h"
-
 using namespace std;
 using namespace lyx::support;
 
 namespace lyx {
 
 
-LyXRC_PreviewStatus RenderPreview::status()
+bool RenderPreview::previewText()
 {
-	return lyxrc.preview;
+	// Use a switch to trigger a warning if the enum is changed.
+	switch(lyxrc.preview) {
+	case LyXRC::PREVIEW_ON:
+	case LyXRC::PREVIEW_NO_MATH:
+		return true;
+	case LyXRC::PREVIEW_OFF:
+		break;
+	}
+
+	return false;
+}
+
+
+bool RenderPreview::previewMath()
+{
+	// Use a switch to trigger a warning if the enum is changed.
+	switch(lyxrc.preview) {
+	case LyXRC::PREVIEW_ON:
+		return true;
+	case LyXRC::PREVIEW_NO_MATH:
+	case LyXRC::PREVIEW_OFF:
+		break;
+	}
+
+	return false;
 }
 
 
@@ -53,19 +75,11 @@ RenderPreview::RenderPreview(Inset const * inset)
 RenderPreview::RenderPreview(RenderPreview const & other,
 			     Inset const * inset)
 	: RenderBase(other),
-	  boost::signals::trackable(),
 	  snippet_(other.snippet_),
 	  parent_(inset)
 {}
 
 
-RenderPreview::~RenderPreview()
-{
-	if (ploader_connection_.connected())
-		ploader_connection_.disconnect();
-}
-
-
 RenderBase * RenderPreview::clone(Inset const * inset) const
 {
 	return new RenderPreview(*this, inset);
@@ -76,10 +90,13 @@ namespace {
 
 docstring const statusMessage(BufferView const * bv, string const & snippet)
 {
-	LASSERT(bv, /**/);
+	LASSERT(bv, return docstring());
 
 	Buffer const & buffer = bv->buffer();
 	graphics::PreviewLoader const * loader = buffer.loader();
+	// please coverity (probably worth the check anyway)
+	if (!loader)
+		return docstring();
 	graphics::PreviewLoader::Status const status = loader->status(snippet);
 
 	docstring message;
@@ -99,7 +116,7 @@ docstring const statusMessage(BufferView const * bv, string const & snippet)
 	return message;
 }
 
-} // namespace anon
+} // namespace
 
 
 graphics::PreviewImage const *
@@ -113,7 +130,7 @@ RenderPreview::getPreviewImage(Buffer const & buffer) const
 
 void RenderPreview::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	LASSERT(mi.base.bv, /**/);
+	LBUFERR(mi.base.bv);
 
 	graphics::PreviewImage const * const pimage =
 		getPreviewImage(mi.base.bv->buffer());
@@ -128,7 +145,7 @@ void RenderPreview::metrics(MetricsInfo & mi, Dimension & dim) const
 
 		FontInfo font(mi.base.font);
 		font.setFamily(SANS_FAMILY);
-		font.setSize(FONT_SIZE_FOOTNOTE);
+		font.setSize(FOOTNOTE_SIZE);
 		docstring const stat = statusMessage(mi.base.bv, snippet_);
 		dim.wid = 15 + theFontMetrics(font).width(stat);
 	}
@@ -139,7 +156,7 @@ void RenderPreview::metrics(MetricsInfo & mi, Dimension & dim) const
 
 void RenderPreview::draw(PainterInfo & pi, int x, int y) const
 {
-	LASSERT(pi.base.bv, /**/);
+	LBUFERR(pi.base.bv);
 
 	graphics::PreviewImage const * const pimage =
 		getPreviewImage(pi.base.bv->buffer());
@@ -148,9 +165,8 @@ void RenderPreview::draw(PainterInfo & pi, int x, int y) const
 	if (image) {
 		pi.pain.image(x, y - dim_.asc, dim_.wid, dim_.height(),
 			      *image);
-
 	} else {
-		int const offset = Inset::TEXT_TO_INSET_OFFSET;
+		int const offset = Inset::textOffset(pi.base.bv);
 
 		pi.pain.rectangle(x + offset,
 				  y - dim_.asc,
@@ -160,19 +176,21 @@ void RenderPreview::draw(PainterInfo & pi, int x, int y) const
 
 		FontInfo font(pi.base.font);
 		font.setFamily(SANS_FAMILY);
-		font.setSize(FONT_SIZE_FOOTNOTE);
+		font.setSize(FOOTNOTE_SIZE);
 
 		docstring const stat = statusMessage(pi.base.bv, snippet_);
 		pi.pain.text(x + offset + 6,
 			     y - theFontMetrics(font).maxAscent() - 4,
 			     stat, font);
 	}
+	pi.change.paintCue(pi, x, y - dim_.asc,
+	                   x + dim_.width(), y - dim_.asc + dim_.height());
 }
 
 
 void RenderPreview::startLoading(Buffer const & buffer, bool forexport) const
 {
-	if (!forexport && (status() == LyXRC::PREVIEW_OFF || snippet_.empty()))
+	if (!forexport && (lyxrc.preview == LyXRC::PREVIEW_OFF || snippet_.empty()))
 		return;
 
 	graphics::PreviewLoader * loader = buffer.loader();
@@ -182,10 +200,10 @@ void RenderPreview::startLoading(Buffer const & buffer, bool forexport) const
 
 
 void RenderPreview::addPreview(docstring const & latex_snippet,
-                               Buffer const & buffer, 
+                               Buffer const & buffer,
                                bool ignore_lyxrc)
 {
-	if (status() == LyXRC::PREVIEW_OFF && !ignore_lyxrc)
+	if (lyxrc.preview == LyXRC::PREVIEW_OFF && !ignore_lyxrc)
 		return;
 
 	graphics::PreviewLoader * loader = buffer.loader();
@@ -195,10 +213,10 @@ void RenderPreview::addPreview(docstring const & latex_snippet,
 
 
 void RenderPreview::addPreview(docstring const & latex_snippet,
-                               graphics::PreviewLoader & ploader, 
+                               graphics::PreviewLoader & ploader,
                                bool ignore_lyxrc)
 {
-	if (status() == LyXRC::PREVIEW_OFF && !ignore_lyxrc)
+	if (lyxrc.preview == LyXRC::PREVIEW_OFF && !ignore_lyxrc)
 		return;
 
 	// FIXME UNICODE
@@ -213,10 +231,12 @@ void RenderPreview::addPreview(docstring const & latex_snippet,
 	// If this is the first time of calling, connect to the
 	// PreviewLoader signal that'll inform us when the preview image
 	// is ready for loading.
-	if (!ploader_connection_.connected()) {
-		ploader_connection_ = ploader.connect(
-			bind(&RenderPreview::imageReady, this, _1));
-	}
+	if (!ploader_connection_.connected())
+		// This is a scoped connection.
+		ploader_connection_ =
+			ploader.connect([this](graphics::PreviewImage const & pi){
+				imageReady(pi);
+			});
 
 	ploader.add(snippet_);
 }
@@ -243,28 +263,59 @@ void RenderPreview::imageReady(graphics::PreviewImage const & pimage)
 
 
 RenderMonitoredPreview::RenderMonitoredPreview(Inset const * inset)
-	: RenderPreview(inset), monitor_(FileName(), 2000)
-{}
+	: RenderPreview(inset)
+{
+	setAbsFile(FileName());
+}
 
 
 void RenderMonitoredPreview::setAbsFile(FileName const & file)
 {
-	monitor_.reset(file);
+	bool mon = monitoring();
+	if (mon)
+		stopMonitoring();
+	filename_ = file;
+	if (mon)
+		startMonitoring();
 }
 
 
 void RenderMonitoredPreview::draw(PainterInfo & pi, int x, int y) const
 {
 	RenderPreview::draw(pi, x, y);
-	if (!monitoring())
-		startMonitoring();
+	startMonitoring();
+	monitor_->checkModifiedAsync();
+}
+
+
+signals2::connection RenderMonitoredPreview::connect(slot const & slot)
+{
+	return changed_.connect(slot);
 }
 
 
-boost::signals::connection
-RenderMonitoredPreview::fileChanged(slot_type const & slot)
+bool RenderMonitoredPreview::monitoring() const
 {
-	return monitor_.connect(slot);
+	return (bool) monitor_;
 }
 
+
+void RenderMonitoredPreview::startMonitoring() const
+{
+	if (!monitoring()) {
+		monitor_ = FileSystemWatcher::activeMonitor(filename_);
+		// Disconnected at the same time as this is destroyed.
+		monitor_->connect([this](bool /* exists */){ changed_(); });
+	}
+}
+
+
+void RenderMonitoredPreview::stopMonitoring() const
+{
+	monitor_ = nullptr;
+}
+
+
+
+
 } // namespace lyx