]> git.lyx.org Git - lyx.git/blobdiff - src/insets/insetinclude.C
The markDirty() and fitCursor() changes
[lyx.git] / src / insets / insetinclude.C
index f8c62f404a1eee194aaaef038be977af61fb72d4..ab4d2dc727a31fa045ade32f578ebf5598a7a84c 100644 (file)
@@ -1,29 +1,40 @@
+/**
+ * \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
+ */
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "insetinclude.h"
 #include "buffer.h"
 #include "bufferlist.h"
 #include "BufferView.h"
 #include "debug.h"
-#include "lyxrc.h"
-#include "frontends/LyXView.h"
-#include "LaTeXFeatures.h"
+#include "funcrequest.h"
 #include "gettext.h"
+#include "LaTeXFeatures.h"
+#include "lyxlex.h"
+#include "lyxrc.h"
 
 #include "frontends/Dialogs.h"
+#include "frontends/LyXView.h"
 #include "frontends/Painter.h"
 
 #include "support/filetools.h"
 #include "support/FileInfo.h"
+#include "support/FileMonitor.h"
 #include "support/lstrings.h"
 
 #include "graphics/PreviewedInset.h"
 #include "graphics/PreviewImage.h"
 
+#include <boost/bind.hpp>
+
 #include <cstdlib>
 
 
@@ -33,7 +44,7 @@ using std::vector;
 using std::pair;
 
 extern BufferList bufferlist;
-extern BufferView * current_view;
+
 
 class InsetInclude::PreviewImpl : public grfx::PreviewedInset {
 public:
@@ -44,13 +55,23 @@ public:
        bool previewWanted() const;
        ///
        string const latexString() const;
-
-       ///
-       BufferView * view() const { return current_view; }
        ///
        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_;
 };
 
 
@@ -64,7 +85,7 @@ string const uniqueID()
        ost << "file" << ++seed;
 
        // Needed if we use lyxstring.
-       return ost.str().c_str();
+       return STRCONV(ost.str());
 }
 
 } // namespace anon
@@ -87,7 +108,45 @@ InsetInclude::InsetInclude(InsetCommandParams const & p, Buffer const & b)
 
 InsetInclude::~InsetInclude()
 {
-       hideDialog();
+       InsetIncludeMailer mailer(*this);
+       mailer.hideDialog();
+}
+
+
+dispatch_result InsetInclude::localDispatch(FuncRequest const & cmd)
+{
+       dispatch_result result = UNDISPATCHED;
+
+       switch (cmd.action) {
+       case LFUN_INSET_MODIFY: {
+               InsetInclude::Params p;
+               InsetIncludeMailer::string2params(cmd.argument, p);
+               if (p.cparams.getCmdName().empty())
+                       break;
+
+               set(p);
+               params_.masterFilename_ = cmd.view()->buffer()->fileName();
+
+               cmd.view()->updateInset(this);
+               result = DISPATCHED;
+       }
+       break;
+
+       case LFUN_INSET_DIALOG_UPDATE: {
+               InsetIncludeMailer mailer(*this);
+               mailer.updateDialog(cmd.view());
+       }
+       break;
+
+       case LFUN_MOUSE_RELEASE:
+               edit(cmd.view(), cmd.x, cmd.y, cmd.button());
+               break;
+
+       default:
+               break;
+       }
+
+       return result;
 }
 
 
@@ -100,7 +159,7 @@ InsetInclude::Params const & InsetInclude::params() const
 bool InsetInclude::Params::operator==(Params const & o) const
 {
        if (cparams == o.cparams && flag == o.flag &&
-           noload == o.noload && masterFilename_ == o.masterFilename_)
+           masterFilename_ == o.masterFilename_)
                return true;
 
        return false;
@@ -117,9 +176,8 @@ void InsetInclude::set(Params const & p)
 {
        params_ = p;
 
-       // Just to be safe...
        string command;
-
        switch (params_.flag) {
                case INCLUDE:
                        command="include";
@@ -134,8 +192,11 @@ void InsetInclude::set(Params const & p)
                        command="verbatiminput*";
                        break;
        }
-
-       params_.cparams.setCmdName(command);
+       params_.cparams.setCmdName(command); 
+       if (preview_->monitoring())
+               preview_->stopMonitoring();
 
        if (grfx::PreviewedInset::activated() && params_.flag == INPUT)
                preview_->generatePreview();
@@ -153,7 +214,8 @@ Inset * InsetInclude::clone(Buffer const & buffer, bool) const
 
 void InsetInclude::edit(BufferView * bv, int, int, mouse_button::state)
 {
-       bv->owner()->getDialogs()->showInclude(this);
+       InsetIncludeMailer mailer(*this);
+       mailer.showDialog(bv);
 }
 
 
@@ -165,7 +227,8 @@ void InsetInclude::edit(BufferView * bv, bool)
 
 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';
 }
 
 
@@ -235,7 +298,7 @@ string const InsetInclude::getMasterFilename() const
 
 bool InsetInclude::loadIfNeeded() const
 {
-       if (params_.noload || isVerbatim())
+       if (isVerbatim())
                return false;
 
        if (!IsLyXFilename(getFileName()))
@@ -249,7 +312,7 @@ bool InsetInclude::loadIfNeeded() const
        if (!finfo.isOK())
                return false;
 
-       return bufferlist.readFile(getFileName(), !finfo.writable()) != 0;
+       return bufferlist.loadLyXFile(getFileName(), false) != 0;
 }
 
 
@@ -461,18 +524,14 @@ vector<string> const InsetInclude::getLabelList() const
 }
 
 
-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;
 }
 
 
@@ -498,13 +557,17 @@ int InsetInclude::width(BufferView * bv, LyXFont const & font) const
 
 
 void InsetInclude::draw(BufferView * bv, LyXFont const & font, int y,
-                       float & xx, bool b) const
+                       float & xx) const
 {
+       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);
@@ -512,7 +575,7 @@ void InsetInclude::draw(BufferView * bv, LyXFont const & font, int y,
        int const h = a + d;
 
        bv->painter().image(x, y - a, w, h,
-                           *(preview_->pimage()->image(*this, *bv)));
+                           *(preview_->pimage()->image()));
 
        xx += w;
 }
@@ -524,14 +587,15 @@ void InsetInclude::draw(BufferView * bv, LyXFont const & font, int y,
 
 void InsetInclude::addPreview(grfx::PreviewLoader & ploader) const
 {
-       lyxerr << "InsetInclude::addPreview" << endl;
        preview_->addPreview(ploader);
 }
 
 
 bool InsetInclude::PreviewImpl::previewWanted() const
 {
-       return parent().params_.flag == InsetInclude::INPUT;
+       return parent().params_.flag == InsetInclude::INPUT &&
+               parent().params_.cparams.preview() &&
+               IsFileReadable(parent().getFileName());
 }
 
 
@@ -543,19 +607,83 @@ string const InsetInclude::PreviewImpl::latexString() const
        ostringstream os;
        parent().latex(view()->buffer(), os, false, false);
 
-       // This fails if the file has a relative path.
-       // return os.str().c_str();
+       return STRCONV(os.str());
+}
 
-       // 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());
+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();
+}
+
+
+string const InsetIncludeMailer::name_("include");
+
+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();
+
+       istringstream data(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";
 
-       ostringstream out;
-       out << command << '{' << file << '}' << endl;
-       
-       return out.str().c_str();
+       return data.str();
 }