-#include <config.h>
+/**
+ * \file insetinclude.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Lars Gullik Bjønnes
+ *
+ * Full author contact details are available in file CREDITS
+ */
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include <config.h>
#include "insetinclude.h"
#include "buffer.h"
#include "bufferlist.h"
#include "BufferView.h"
#include "debug.h"
-#include "lyxrc.h"
-#include "LaTeXFeatures.h"
+#include "funcrequest.h"
#include "gettext.h"
+#include "LaTeXFeatures.h"
+#include "latexrunparams.h"
+#include "Lsstream.h"
+#include "lyxlex.h"
+#include "lyxrc.h"
+#include "Lsstream.h"
#include "frontends/Dialogs.h"
#include "frontends/LyXView.h"
#include "support/filetools.h"
#include "support/FileInfo.h"
-#include "support/lstrings.h"
+#include "support/FileMonitor.h"
+#include "support/lstrings.h" // contains
+#include "support/tostr.h"
#include "graphics/PreviewedInset.h"
#include "graphics/PreviewImage.h"
-#include <cstdlib>
+#include <boost/bind.hpp>
+#include <cstdlib>
using std::ostream;
using std::endl;
InsetInclude & parent() const {
return *static_cast<InsetInclude*>(inset());
}
+
+ ///
+ bool monitoring() const { return monitor_.get(); }
+ ///
+ void startMonitoring();
+ ///
+ void stopMonitoring() { monitor_.reset(); }
+
+private:
+ /// Invoked by monitor_ should the parent file change.
+ void restartLoading();
+ ///
+ boost::scoped_ptr<FileMonitor> monitor_;
};
string const uniqueID()
{
static unsigned int seed = 1000;
-
- ostringstream ost;
- ost << "file" << ++seed;
-
- // Needed if we use lyxstring.
- return ost.str().c_str();
+ return "file" + tostr(++seed);
}
} // namespace anon
InsetInclude::~InsetInclude()
{
- hideDialog();
+ InsetIncludeMailer mailer(*this);
+ mailer.hideDialog();
+}
+
+
+dispatch_result InsetInclude::localDispatch(FuncRequest const & cmd)
+{
+ switch (cmd.action) {
+
+ case LFUN_INSET_MODIFY: {
+ InsetInclude::Params p;
+ InsetIncludeMailer::string2params(cmd.argument, p);
+ if (!p.cparams.getCmdName().empty()) {
+ set(p);
+ params_.masterFilename_ = cmd.view()->buffer()->fileName();
+ cmd.view()->updateInset(this);
+ }
+ return DISPATCHED;
+ }
+
+ case LFUN_INSET_DIALOG_UPDATE:
+ InsetIncludeMailer(*this).updateDialog(cmd.view());
+ return DISPATCHED;
+
+ case LFUN_MOUSE_RELEASE:
+ case LFUN_INSET_EDIT:
+ InsetIncludeMailer(*this).showDialog(cmd.view());
+ return DISPATCHED;
+
+ default:
+ return UNDISPATCHED;
+ }
}
bool InsetInclude::Params::operator==(Params const & o) const
{
- if (cparams == o.cparams && flag == o.flag &&
- noload == o.noload && masterFilename_ == o.masterFilename_)
- return true;
-
- return false;
+ return cparams == o.cparams && flag == o.flag &&
+ masterFilename_ == o.masterFilename_;
}
{
params_ = p;
- // Just to be safe...
string command;
switch (params_.flag) {
params_.cparams.setCmdName(command);
+ if (preview_->monitoring())
+ preview_->stopMonitoring();
+
if (grfx::PreviewedInset::activated() && params_.flag == INPUT)
preview_->generatePreview();
}
}
-void InsetInclude::edit(BufferView * bv, int, int, mouse_button::state)
-{
- bv->owner()->getDialogs()->showInclude(this);
-}
-
-
-void InsetInclude::edit(BufferView * bv, bool)
-{
- edit(bv, 0, 0, mouse_button::none);
-}
-
-
void InsetInclude::write(Buffer const *, ostream & os) const
{
- os << "Include " << params_.cparams.getCommand() << "\n";
+ os << "Include " << params_.cparams.getCommand() << '\n'
+ << "preview " << tostr(params_.cparams.preview()) << '\n';
}
}
-string const InsetInclude::getRelFileBaseName() const
-{
- return OnlyFilename(ChangeExtension(params_.cparams.getContents(), string()));
-}
-
-
string const InsetInclude::getFileName() const
{
return MakeAbsPath(params_.cparams.getContents(),
bool InsetInclude::loadIfNeeded() const
{
- if (params_.noload || isVerbatim())
+ if (isVerbatim())
return false;
if (!IsLyXFilename(getFileName()))
if (!finfo.isOK())
return false;
- return bufferlist.readFile(getFileName(), !finfo.writable()) != 0;
+ return bufferlist.loadLyXFile(getFileName(), false) != 0;
}
int InsetInclude::latex(Buffer const * buffer, ostream & os,
- bool /*fragile*/, bool /*fs*/) const
+ LatexRunParams const & runparams) const
{
string incfile(params_.cparams.getContents());
// write it to a file (so far the complete file)
string writefile = ChangeExtension(getFileName(), ".tex");
- if (!buffer->tmppath.empty()
- && !buffer->niceFile) {
+ if (!buffer->tmppath.empty() && !runparams.nice) {
incfile = subst(incfile, '/','@');
#ifdef __EMX__
incfile = subst(incfile, ':', '$');
tmp->markDepClean(buffer->tmppath);
- tmp->makeLaTeXFile(writefile,
- OnlyPath(getMasterFilename()),
- buffer->niceFile, true);
+ tmp->makeLaTeXFile(writefile, OnlyPath(getMasterFilename()),
+ runparams, true);
}
if (isVerbatim()) {
}
-vector<pair<string,string> > const InsetInclude::getKeys() const
+void InsetInclude::fillWithBibKeys(vector<pair<string,string> > & keys) const
{
- vector<pair<string,string> > keys;
-
if (loadIfNeeded()) {
Buffer * tmp = bufferlist.getBuffer(getFileName());
tmp->setParentName("");
- keys = tmp->getBibkeyList();
+ tmp->fillWithBibKeys(keys);
tmp->setParentName(getMasterFilename());
}
-
- return keys;
}
void InsetInclude::draw(BufferView * bv, LyXFont const & font, int y,
- float & xx, bool b) const
+ float & xx) const
{
- preview_->setView(bv);
+ cache(bv);
if (!preview_->previewReady()) {
- InsetButton::draw(bv, font, y, xx, b);
+ InsetButton::draw(bv, font, y, xx);
return;
}
+ if (!preview_->monitoring())
+ preview_->startMonitoring();
+
int const x = int(xx);
int const w = width(bv, font);
int const d = descent(bv, font);
int const h = a + d;
bv->painter().image(x, y - a, w, h,
- *(preview_->pimage()->image(*this, *bv)));
+ *(preview_->pimage()->image()));
xx += w;
}
bool InsetInclude::PreviewImpl::previewWanted() const
{
- return parent().params_.flag == InsetInclude::INPUT;
+ return parent().params_.flag == InsetInclude::INPUT &&
+ parent().params_.cparams.preview() &&
+ IsFileReadable(parent().getFileName());
}
return string();
ostringstream os;
- parent().latex(view()->buffer(), os, false, false);
+ LatexRunParams runparams;
+ runparams.flavor = LatexRunParams::LATEX;
+ parent().latex(view()->buffer(), os, runparams);
- // This fails if the file has a relative path.
- // return os.str().c_str();
+ return STRCONV(os.str());
+}
+
+
+void InsetInclude::PreviewImpl::startMonitoring()
+{
+ monitor_.reset(new FileMonitor(parent().getFileName(), 2000));
+ monitor_->connect(boost::bind(&PreviewImpl::restartLoading, this));
+ monitor_->start();
+}
+
+
+void InsetInclude::PreviewImpl::restartLoading()
+{
+ lyxerr << "restartLoading()" << std::endl;
+ removePreview();
+ if (view())
+ view()->updateInset(&parent());
+ generatePreview();
+}
- // I would /really/ like not to do this...
- // HELP!
- string command;
- string file = rtrim(split(os.str().c_str(), command, '{'), "}");
- if (!AbsolutePath(file))
- file = MakeAbsPath(file, view()->buffer()->filePath());
+string const InsetIncludeMailer::name_("include");
- ostringstream out;
- out << command << '{' << file << '}' << endl;
+InsetIncludeMailer::InsetIncludeMailer(InsetInclude & inset)
+ : inset_(inset)
+{}
+
+
+string const InsetIncludeMailer::inset2string() const
+{
+ return params2string(inset_.params());
+}
+
+
+void InsetIncludeMailer::string2params(string const & in,
+ InsetInclude::Params & params)
+{
+ params = InsetInclude::Params();
+
+ if (in.empty())
+ return;
- return out.str().c_str();
+ istringstream data(STRCONV(in));
+ LyXLex lex(0,0);
+ lex.setStream(data);
+
+ if (lex.isOK()) {
+ lex.next();
+ string const token = lex.getString();
+ if (token != name_)
+ return;
+ }
+
+ // This is part of the inset proper that is usually swallowed
+ // by Buffer::readInset
+ if (lex.isOK()) {
+ lex.next();
+ string const token = lex.getString();
+ if (token != "Include")
+ return;
+ }
+
+ if (lex.isOK()) {
+ InsetInclude inset(params);
+ inset.read(0, lex);
+ params = inset.params();
+ }
+}
+
+
+string const
+InsetIncludeMailer::params2string(InsetInclude::Params const & params)
+{
+ InsetInclude inset(params);
+ inset.set(params);
+ ostringstream data;
+ data << name_ << ' ';
+ inset.write(0, data);
+ data << "\\end_inset\n";
+ return STRCONV(data.str());
}
projects / lyx.git / blobdiff