* src/LyXAction.C: mark goto-clear-bookmark as working without buffer

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

diff --git a/src/insets/insetcommand.C b/src/insets/insetcommand.C
index 544d25a7da1a835d95fd66c63c66ce4c7f3c82cd..6d5248844b923d5650941ffb563ea74feb0313ae 100644 (file)
--- a/src/insets/insetcommand.C
+++ b/src/insets/insetcommand.C
@@ -16,38 +16,62 @@
 #include "BufferView.h"
 #include "dispatchresult.h"
 #include "funcrequest.h"
+#include "FuncStatus.h"
 #include "lyxlex.h"
 #include "metricsinfo.h"
 
-#include "support/std_sstream.h"
+#include <sstream>
 
 
+namespace lyx {
+
 using std::string;
 using std::istringstream;
 using std::ostream;
 using std::ostringstream;
 
 
-InsetCommand::InsetCommand(InsetCommandParams const & p)
-       : p_(p.getCmdName(), p.getContents(), p.getOptions()),
-         set_label_(false)
+InsetCommand::InsetCommand(InsetCommandParams const & p,
+                          string const & mailer_name)
+       : p_(p),
+         mailer_name_(mailer_name),
+         mouse_hover_(false),
+         updateButtonLabel_(true)
 {}
 
 
-void InsetCommand::metrics(MetricsInfo & mi, Dimension & dim) const
+InsetCommand::~InsetCommand()
+{
+       if (!mailer_name_.empty())
+               InsetCommandMailer(mailer_name_, *this).hideDialog();
+}
+
+
+bool InsetCommand::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       if (!set_label_) {
-               set_label_ = true;
+       if (updateButtonLabel_) {
+               updateButtonLabel_ = false;
                button_.update(getScreenLabel(*mi.base.bv->buffer()),
                               editable() != NOT_EDITABLE);
        }
        button_.metrics(mi, dim);
+       bool const changed = dim_ != dim;
        dim_ = dim;
+       return changed;
+}
+
+
+bool InsetCommand::setMouseHover(bool mouse_hover)
+{
+       mouse_hover_ = mouse_hover;
+       return true;
 }
 
 
 void InsetCommand::draw(PainterInfo & pi, int x, int y) const
 {
+       setPosCache(pi, x, y);
+       button_.setRenderState(mouse_hover_);
        button_.draw(pi, x, y);
 }
 
@@ -55,11 +79,11 @@ void InsetCommand::draw(PainterInfo & pi, int x, int y) const
 void InsetCommand::setParams(InsetCommandParams const & p)
 {
        p_ = p;
-       set_label_ = false;
+       updateButtonLabel_ = true;
 }
 
 
-int InsetCommand::latex(Buffer const &, ostream & os,
+int InsetCommand::latex(Buffer const &, odocstream & os,
                        OutputParams const &) const
 {
        os << getCommand();
@@ -67,54 +91,81 @@ int InsetCommand::latex(Buffer const &, ostream & os,
 }
 
 
-int InsetCommand::plaintext(Buffer const &, ostream &,
+int InsetCommand::plaintext(Buffer const &, odocstream &,
                        OutputParams const &) const
 {
        return 0;
 }
 
 
-int InsetCommand::linuxdoc(Buffer const &, ostream &,
-                          OutputParams const &) const
-{
-       return 0;
-}
-
-
-int InsetCommand::docbook(Buffer const &, ostream &,
+int InsetCommand::docbook(Buffer const &, odocstream &,
                          OutputParams const &) const
 {
        return 0;
 }
 
 
-DispatchResult
-InsetCommand::priv_dispatch(FuncRequest const & cmd, idx_type &, pos_type &)
+void InsetCommand::doDispatch(LCursor & cur, FuncRequest & cmd)
 {
        switch (cmd.action) {
+       case LFUN_INSET_REFRESH:
+               updateButtonLabel_ = true;
+               break;
+
        case LFUN_INSET_MODIFY: {
-               InsetCommandParams p;
-               InsetCommandMailer::string2params(cmd.argument, p);
+               InsetCommandParams p(p_.getCmdName());
+               InsetCommandMailer::string2params(mailer_name_, to_utf8(cmd.argument()), p);
                if (p.getCmdName().empty())
-                       return DispatchResult(false);
+                       cur.noUpdate();
+               else
+                       setParams(p);
+               break;
+       }
 
-               setParams(p);
-               cmd.view()->updateInset(this);
-               return DispatchResult(true, true);
+       case LFUN_INSET_DIALOG_UPDATE: {
+               string const name = to_utf8(cmd.argument());
+               InsetCommandMailer(name, *this).updateDialog(&cur.bv());
+               break;
        }
 
-       case LFUN_INSET_DIALOG_UPDATE:
-               InsetCommandMailer(cmd.argument, *this).updateDialog(cmd.view());
-               return DispatchResult(true, true);
+       case LFUN_MOUSE_RELEASE: {
+               if (!mailer_name_.empty())
+                       InsetCommandMailer(mailer_name_, *this).showDialog(&cur.bv());
+               break;
+       }
+
+       default:
+               InsetBase::doDispatch(cur, cmd);
+               break;
+       }
+
+}
 
-       case LFUN_MOUSE_RELEASE:
-               edit(cmd.view(), true);
-               return DispatchResult(true);
 
+bool InsetCommand::getStatus(LCursor & cur, FuncRequest const & cmd,
+       FuncStatus & status) const
+{
+       switch (cmd.action) {
+       // suppress these
+       case LFUN_ERT_INSERT:
+               status.enabled(false);
+               return true;
+       // we handle these
+       case LFUN_INSET_REFRESH:
+       case LFUN_INSET_MODIFY:
+       case LFUN_INSET_DIALOG_UPDATE:
+               status.enabled(true);
+               return true;
        default:
-               return DispatchResult(false);
+               return InsetBase::getStatus(cur, cmd, status);
        }
+}
 
+
+void InsetCommand::replaceContents(std::string const & from, string const & to)
+{
+       if (getContents() == from)
+               setContents(to);
 }
 
 
@@ -130,11 +181,11 @@ string const InsetCommandMailer::inset2string(Buffer const &) const
 }
 
 
-void InsetCommandMailer::string2params(string const & in,
+void InsetCommandMailer::string2params(string const & name,
+                                      string const & in,
                                       InsetCommandParams & params)
 {
-       params = InsetCommandParams();
-
+       params.clear();
        if (in.empty())
                return;
 
@@ -142,26 +193,24 @@ void InsetCommandMailer::string2params(string const & in,
        LyXLex lex(0,0);
        lex.setStream(data);
 
-       if (lex.isOK()) {
-               lex.next();
-               string const name = lex.getString();
-       }
+       string n;
+       lex >> n;
+       if (!lex || n != name)
+               return print_mailer_error("InsetCommandMailer", in, 1, name);
 
        // 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 != "LatexCommand")
-                       return;
-       }
-       if (lex.isOK()) {
-               params.read(lex);
-       }
+       // by LyXText::readInset
+       string id;
+       lex >> id;
+       if (!lex || id != "LatexCommand")
+               return print_mailer_error("InsetCommandMailer", in, 2, "LatexCommand");
+
+       params.read(lex);
 }
 
 
-string const InsetCommandMailer::params2string(string const & name,
+string const
+InsetCommandMailer::params2string(string const & name,
                                  InsetCommandParams const & params)
 {
        ostringstream data;
@@ -170,3 +219,6 @@ string const InsetCommandMailer::params2string(string const & name,
        data << "\\end_inset\n";
        return data.str();
 }
+
+
+} // namespace lyx