the monster patch

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

diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C
index 24369697fa0d66c981394a18455cf5d5eacd0b45..f9f5e1352f8cb558e7178860bfa9f8e4c67798f1 100644 (file)
--- a/src/insets/insetgraphics.C
+++ b/src/insets/insetgraphics.C
@@ -64,11 +64,11 @@ TODO
 #include "funcrequest.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
-#include "latexrunparams.h"
 #include "lyx_main.h"
 #include "lyxlex.h"
 #include "lyxrc.h"
 #include "metricsinfo.h"
+#include "outputparams.h"
 
 #include "frontends/Alert.h"
 #include "frontends/LyXView.h"
@@ -133,10 +133,10 @@ string const uniqueID()
 }
 
 
-string findTargetFormat(string const & suffix, LatexRunParams const & runparams)
+string findTargetFormat(string const & suffix, OutputParams const & runparams)
 {
        // Are we using latex or pdflatex).
-       if (runparams.flavor == LatexRunParams::PDFLATEX) {
+       if (runparams.flavor == OutputParams::PDFLATEX) {
                lyxerr[Debug::GRAPHICS] << "findTargetFormat: PDF mode" << endl;
                if (contains(suffix, "ps") || suffix == "pdf")
                        return "pdf";
@@ -192,35 +192,40 @@ void InsetGraphics::statusChanged() const
 
 
 DispatchResult
-InsetGraphics::priv_dispatch(FuncRequest const & cmd, idx_type &, pos_type &)
+InsetGraphics::priv_dispatch(BufferView & bv, FuncRequest const & cmd)
 {
        switch (cmd.action) {
        case LFUN_INSET_MODIFY: {
-               Buffer const & buffer = *cmd.view()->buffer();
+               Buffer const & buffer = *bv.buffer();
                InsetGraphicsParams p;
                InsetGraphicsMailer::string2params(cmd.argument, buffer, p);
                if (!p.filename.empty()) {
                        setParams(p);
-                       cmd.view()->updateInset(this);
+                       bv.update();
                }
-               return DISPATCHED;
+               return DispatchResult(true, true);
        }
 
        case LFUN_INSET_DIALOG_UPDATE:
-               InsetGraphicsMailer(*this).updateDialog(cmd.view());
-               return DISPATCHED;
+               InsetGraphicsMailer(*this).updateDialog(&bv);
+               return DispatchResult(true, true);
 
-       case LFUN_INSET_EDIT:
        case LFUN_MOUSE_RELEASE:
-               InsetGraphicsMailer(*this).showDialog(cmd.view());
-               return DISPATCHED;
+               InsetGraphicsMailer(*this).showDialog(&bv);
+               return DispatchResult(true, true);
 
        default:
-               return UNDISPATCHED;
+               return DispatchResult(false);
        }
 }
 
 
+void InsetGraphics::edit(BufferView * bv, bool)
+{
+       InsetGraphicsMailer(*this).showDialog(bv);
+}
+
+
 void InsetGraphics::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        graphic_->metrics(mi, dim);
@@ -230,6 +235,8 @@ void InsetGraphics::metrics(MetricsInfo & mi, Dimension & dim) const
 
 void InsetGraphics::draw(PainterInfo & pi, int x, int y) const
 {
+       xo_ = x;
+       yo_ = y;
        graphic_->draw(pi, x, y);
 }
 
@@ -411,7 +418,7 @@ string const stripExtensionIfPossible(string const & file, string const & to)
 
 
 string const InsetGraphics::prepareFile(Buffer const & buf,
-                                       LatexRunParams const & runparams) const
+                                       OutputParams const & runparams) const
 {
        string orig_file = params().filename.absFilename();
        string const rel_file = params().filename.relFilename(buf.filePath());
@@ -534,7 +541,7 @@ string const InsetGraphics::prepareFile(Buffer const & buf,
 
 
 int InsetGraphics::latex(Buffer const & buf, ostream & os,
-                        LatexRunParams const & runparams) const
+                        OutputParams const & runparams) const
 {
        // If there is no file specified or not existing,
        // just output a message about it in the latex output.
@@ -611,7 +618,8 @@ int InsetGraphics::latex(Buffer const & buf, ostream & os,
 }
 
 
-int InsetGraphics::ascii(Buffer const &, ostream & os, int) const
+int InsetGraphics::plaintext(Buffer const &, ostream & os,
+                        OutputParams const &) const
 {
        // No graphics in ascii output. Possible to use gifscii to convert
        // images to ascii approximation.
@@ -624,7 +632,8 @@ int InsetGraphics::ascii(Buffer const &, ostream & os, int) const
 }
 
 
-int InsetGraphics::linuxdoc(Buffer const & buf, ostream & os) const
+int InsetGraphics::linuxdoc(Buffer const & buf, ostream & os,
+                           OutputParams const &) const
 {
        string const file_name = buf.niceFile() ?
                                params().filename.relFilename(buf.filePath()):
@@ -640,7 +649,7 @@ int InsetGraphics::linuxdoc(Buffer const & buf, ostream & os) const
 // http://en.tldp.org/LDP/LDP-Author-Guide/inserting-pictures.html
 // See also the docbook guide at http://www.docbook.org/
 int InsetGraphics::docbook(Buffer const &, ostream & os,
-                          bool /*mixcont*/) const
+                          OutputParams const &) const
 {
        // In DocBook v5.0, the graphic tag will be eliminated from DocBook, will
        // need to switch to MediaObject. However, for now this is sufficient and
@@ -707,7 +716,6 @@ void InsetGraphicsMailer::string2params(string const & in,
                                        InsetGraphicsParams & params)
 {
        params = InsetGraphicsParams();
-
        if (in.empty())
                return;
 
@@ -715,18 +723,14 @@ void InsetGraphicsMailer::string2params(string const & in,
        LyXLex lex(0,0);
        lex.setStream(data);
 
-       if (lex.isOK()) {
-               lex.next();
-               string const token = lex.getString();
-               if (token != name_)
-                       return;
-       }
+       string name;
+       lex >> name;
+       if (!lex || name != name_)
+               return print_mailer_error("InsetGraphicsMailer", in, 1, name_);
 
-       if (lex.isOK()) {
-               InsetGraphics inset;
-               inset.readInsetGraphics(lex, buffer.filePath());
-               params = inset.params();
-       }
+       InsetGraphics inset;
+       inset.readInsetGraphics(lex, buffer.filePath());
+       params = inset.params();
 }