The speed patch: redraw only rows that have changed

[lyx.git] / src / insets / insetexternal.C

diff --git a/src/insets/insetexternal.C b/src/insets/insetexternal.C
index 51c79fea42a859061608ae0d0ed7f0fe62c2dd8b..4af98bba7798aaabc06d8a9fd1291caf1e7f6f18 100644 (file)
--- a/src/insets/insetexternal.C
+++ b/src/insets/insetexternal.C
@@ -22,6 +22,7 @@
 #include "cursor.h"
 #include "debug.h"
 #include "dispatchresult.h"
+#include "exporter.h"
 #include "funcrequest.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
@@ -36,16 +37,15 @@
 
 #include "graphics/PreviewLoader.h"
 
-#include "support/FileInfo.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 #include "support/translator.h"
-#include "support/std_sstream.h"
 
 #include <boost/bind.hpp>
 
+#include <sstream>
 
 namespace support = lyx::support;
 namespace external = lyx::external;
@@ -200,7 +200,7 @@ void InsetExternalParams::write(Buffer const & buffer, ostream & os) const
                   << '\n';
 
        if (lyxscale != defaultLyxScale)
-               os << "\tlyxscale " << tostr(lyxscale) << '\n';
+               os << "\tlyxscale " << convert<string>(lyxscale) << '\n';
 
        if (draft)
                os << "\tdraft\n";
@@ -219,7 +219,7 @@ void InsetExternalParams::write(Buffer const & buffer, ostream & os) const
        }
 
        if (!rotationdata.no_rotation()) {
-               os << "\trotateAngle " << rotationdata.angle() << '\n';
+               os << "\trotateAngle " << rotationdata.adjAngle() << '\n';
                if (rotationdata.origin() != external::RotationData::DEFAULT)
                        os << "\trotateOrigin "
                           << rotationdata.originString() << '\n';
@@ -227,9 +227,9 @@ void InsetExternalParams::write(Buffer const & buffer, ostream & os) const
 
        if (!resizedata.no_resize()) {
                using support::float_equal;
-
-               if (!float_equal(resizedata.scale, 0.0, 0.05)) {
-                       if (!float_equal(resizedata.scale, 100.0, 0.05))
+               double const scl = convert<double>(resizedata.scale);
+               if (!float_equal(scl, 0.0, 0.05)) {
+                       if (!float_equal(scl, 100.0, 0.05))
                                os << "\tscale "
                                   << resizedata.scale << '\n';
                } else {
@@ -353,7 +353,7 @@ bool InsetExternalParams::read(Buffer const & buffer, LyXLex & lex)
 
                case EX_ROTATEANGLE:
                        lex.next();
-                       rotationdata.angle(lex.getFloat());
+                       rotationdata.angle = lex.getString();
                        break;
 
                case EX_ROTATEORIGIN:
@@ -363,7 +363,7 @@ bool InsetExternalParams::read(Buffer const & buffer, LyXLex & lex)
 
                case EX_SCALE:
                        lex.next();
-                       resizedata.scale = lex.getFloat();
+                       resizedata.scale = lex.getString();
                        break;
 
                case EX_WIDTH:
@@ -414,7 +414,7 @@ InsetExternal::InsetExternal(InsetExternal const & other)
 {}
 
 
-auto_ptr<InsetBase> InsetExternal::clone() const
+auto_ptr<InsetBase> InsetExternal::doClone() const
 {
        return auto_ptr<InsetBase>(new InsetExternal(*this));
 }
@@ -432,7 +432,7 @@ void InsetExternal::statusChanged() const
 }
 
 
-void InsetExternal::priv_dispatch(LCursor & cur, FuncRequest & cmd)
+void InsetExternal::doDispatch(LCursor & cur, FuncRequest & cmd)
 {
        switch (cmd.action) {
 
@@ -461,7 +461,24 @@ void InsetExternal::priv_dispatch(LCursor & cur, FuncRequest & cmd)
                break;
 
        default:
-               InsetOld::priv_dispatch(cur, cmd);
+               InsetBase::doDispatch(cur, cmd);
+       }
+}
+
+
+bool InsetExternal::getStatus(LCursor & cur, FuncRequest const & cmd,
+               FuncStatus & flag) const
+{
+       switch (cmd.action) {
+
+       case LFUN_EXTERNAL_EDIT:
+       case LFUN_INSET_MODIFY:
+       case LFUN_INSET_DIALOG_UPDATE:
+               flag.enabled(true);
+               return true;
+
+       default:
+               return InsetBase::getStatus(cur, cmd, flag);
        }
 }
 
@@ -503,7 +520,7 @@ RenderType getRenderType(InsetExternalParams const & p)
                return RENDERBUTTON;
 
        if (p.display == external::PreviewDisplay) {
-               if (RenderPreview::activated())
+               if (RenderPreview::status() != LyXRC::PREVIEW_OFF)
                        return RENDERPREVIEW;
                return RENDERBUTTON;
        }
@@ -523,7 +540,7 @@ graphics::Params get_grfx_params(InsetExternalParams const & eparams)
        gparams.scale = eparams.lyxscale;
        if (eparams.clipdata.clip)
                gparams.bb = eparams.clipdata.bbox;
-       gparams.angle = eparams.rotationdata.angle();
+       gparams.angle = convert<double>(eparams.rotationdata.adjAngle());
 
        switch (eparams.display) {
        case external::DefaultDisplay:
@@ -562,7 +579,7 @@ string const getScreenLabel(InsetExternalParams const & params,
        if (!ptr)
                return support::bformat(_("External template %1$s is not installed"),
                                        params.templatename());
-       return external::doSubstitution(params, buffer, ptr->guiName);
+       return external::doSubstitution(params, buffer, ptr->guiName, false);
 }
 
 void add_preview_and_start_loading(RenderMonitoredPreview &,
@@ -687,32 +704,37 @@ int InsetExternal::latex(Buffer const & buf, ostream & os,
                        et.formats.find("PDFLaTeX");
                if (cit != et.formats.end())
                        return external::writeExternal(params_, "PDFLaTeX",
-                                            buf, os, external_in_tmpdir);
+                                                      buf, os,
+                                                      *(runparams.exportdata),
+                                                      external_in_tmpdir);
        }
-
-       return external::writeExternal(params_, "LaTeX",
-                                      buf, os, external_in_tmpdir);
+       return external::writeExternal(params_, "LaTeX", buf, os,
+                                      *(runparams.exportdata),
+                                      external_in_tmpdir);
 }
 
 
 int InsetExternal::plaintext(Buffer const & buf, ostream & os,
-                        OutputParams const &) const
+                        OutputParams const & runparams) const
 {
-       return external::writeExternal(params_, "Ascii", buf, os);
+       return external::writeExternal(params_, "Ascii", buf, os,
+                                      *(runparams.exportdata));
 }
 
 
 int InsetExternal::linuxdoc(Buffer const & buf, ostream & os,
-                           OutputParams const &) const
+                           OutputParams const & runparams) const
 {
-       return external::writeExternal(params_, "LinuxDoc", buf, os);
+       return external::writeExternal(params_, "LinuxDoc", buf, os,
+                                      *(runparams.exportdata));
 }
 
 
 int InsetExternal::docbook(Buffer const & buf, ostream & os,
-                          OutputParams const &) const
+                          OutputParams const & runparams) const
 {
-       return external::writeExternal(params_, "DocBook", buf, os);
+       return external::writeExternal(params_, "DocBook", buf, os,
+                                      *(runparams.exportdata));
 }
 
 
@@ -727,18 +749,24 @@ void InsetExternal::validate(LaTeXFeatures & features) const
                return;
        external::Template const & et = *et_ptr;
 
+       // FIXME: This is wrong if we export to PDFLaTeX
        external::Template::Formats::const_iterator cit =
                et.formats.find("LaTeX");
        if (cit == et.formats.end())
                return;
 
-       if (!cit->second.requirement.empty())
-               features.require(cit->second.requirement);
+       // FIXME: We don't need that always
+       features.require("lyxdot");
+
+       vector<string>::const_iterator it  = cit->second.requirements.begin();
+       vector<string>::const_iterator end = cit->second.requirements.end();
+       for (; it != end; ++it)
+               features.require(*it);
 
        external::TemplateManager & etm = external::TemplateManager::get();
 
-       vector<string>::const_iterator it  = cit->second.preambleNames.begin();
-       vector<string>::const_iterator end = cit->second.preambleNames.end();
+       it  = cit->second.preambleNames.begin();
+       end = cit->second.preambleNames.end();
        for (; it != end; ++it) {
                string const preamble = etm.getPreambleDefByName(*it);
                if (!preamble.empty())
@@ -779,7 +807,7 @@ void add_preview_and_start_loading(RenderMonitoredPreview & renderer,
 {
        InsetExternalParams const & params = inset.params();
 
-       if (RenderPreview::activated() &&
+       if (RenderPreview::status() != LyXRC::PREVIEW_OFF &&
            preview_wanted(params)) {
                renderer.setAbsFile(params.filename.absFilename());
                string const snippet = latex_string(inset, buffer);