ws changes only

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

diff --git a/src/insets/insetcommand.C b/src/insets/insetcommand.C
index 974f2569835ab9779c4a1ffc4be42999798d779f..6eff3dc6a5941a8e09f4711f28b5747cd45ca1e8 100644 (file)
--- a/src/insets/insetcommand.C
+++ b/src/insets/insetcommand.C
@@ -6,60 +6,79 @@
  * \author Angus Leeming
  * \author Lars Gullik Bjønnes
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
 #include "insetcommand.h"
+
 #include "BufferView.h"
-#include "debug.h"
 #include "funcrequest.h"
 #include "lyxlex.h"
+#include "metricsinfo.h"
 
-#include "frontends/Painter.h"
-
-#include "support/lstrings.h"
+#include "support/std_sstream.h"
 
-#include "Lsstream.h"
 
+using std::string;
+using std::istringstream;
 using std::ostream;
+using std::ostringstream;
 
 
-InsetCommand::InsetCommand(InsetCommandParams const & p, bool)
-       : p_(p.getCmdName(), p.getContents(), p.getOptions())
+InsetCommand::InsetCommand(InsetCommandParams const & p)
+       : p_(p.getCmdName(), p.getContents(), p.getOptions()),
+         set_label_(false)
 {}
 
 
+void InsetCommand::metrics(MetricsInfo & mi, Dimension & dim) const
+{
+       if (!set_label_) {
+               set_label_ = true;
+               button_.update(getScreenLabel(*mi.base.bv->buffer()),
+                              editable() != NOT_EDITABLE);
+       }
+       button_.metrics(mi, dim);
+       dim_ = dim;
+}
+
+
+void InsetCommand::draw(PainterInfo & pi, int x, int y) const
+{
+       button_.draw(pi, x, y);
+}
+
+
 void InsetCommand::setParams(InsetCommandParams const & p)
 {
-       p_.setCmdName(p.getCmdName());
-       p_.setContents(p.getContents());
-       p_.setOptions(p.getOptions());
+       p_ = p;
+       set_label_ = false;
 }
 
 
-int InsetCommand::latex(Buffer const *, ostream & os,
-                       bool /*fragile*/, bool/*fs*/) const
+int InsetCommand::latex(Buffer const &, ostream & os,
+                       LatexRunParams const &) const
 {
        os << getCommand();
        return 0;
 }
 
 
-int InsetCommand::ascii(Buffer const *, ostream &, int) const
+int InsetCommand::ascii(Buffer const &, ostream &, int) const
 {
        return 0;
 }
 
 
-int InsetCommand::linuxdoc(Buffer const *, ostream &) const
+int InsetCommand::linuxdoc(Buffer const &, ostream &) const
 {
        return 0;
 }
 
 
-int InsetCommand::docbook(Buffer const *, ostream &, bool) const
+int InsetCommand::docbook(Buffer const &, ostream &, bool) const
 {
        return 0;
 }
@@ -67,37 +86,29 @@ int InsetCommand::docbook(Buffer const *, ostream &, bool) const
 
 dispatch_result InsetCommand::localDispatch(FuncRequest const & cmd)
 {
-       dispatch_result result = UNDISPATCHED;
-
        switch (cmd.action) {
        case LFUN_INSET_MODIFY: {
                InsetCommandParams p;
                InsetCommandMailer::string2params(cmd.argument, p);
                if (p.getCmdName().empty())
-                       break;
+                       return UNDISPATCHED;
 
                setParams(p);
                cmd.view()->updateInset(this);
-               result = DISPATCHED;
+               return DISPATCHED;
        }
-       break;
 
-       case LFUN_INSET_DIALOG_UPDATE: {
-               InsetCommandMailer mailer(cmd.argument, *this);
-               mailer.updateDialog(cmd.view());
-       }
-       break;
+       case LFUN_INSET_DIALOG_UPDATE:
+               InsetCommandMailer(cmd.argument, *this).updateDialog(cmd.view());
+               return DISPATCHED;
 
        case LFUN_MOUSE_RELEASE:
-               edit(cmd.view(), cmd.x, cmd.y, cmd.button());
-               result = DISPATCHED;
-               break;
+               return localDispatch(FuncRequest(cmd.view(), LFUN_INSET_EDIT));
 
        default:
-               break;
+               return UNDISPATCHED;
        }
 
-       return result;
 }
 
 
@@ -107,7 +118,7 @@ InsetCommandMailer::InsetCommandMailer(string const & name,
 {}
 
 
-string const InsetCommandMailer::inset2string() const
+string const InsetCommandMailer::inset2string(Buffer const &) const
 {
        return params2string(name(), inset_.params());
 }
@@ -116,9 +127,10 @@ string const InsetCommandMailer::inset2string() const
 void InsetCommandMailer::string2params(string const & in,
                                       InsetCommandParams & params)
 {
-       params.setCmdName(string());
-       params.setContents(string());
-       params.setOptions(string());
+       params = InsetCommandParams();
+
+       if (in.empty())
+               return;
 
        istringstream data(in);
        LyXLex lex(0,0);
@@ -143,14 +155,12 @@ void InsetCommandMailer::string2params(string const & in,
 }
 
 
-string const
-InsetCommandMailer::params2string(string const & name,
+string const InsetCommandMailer::params2string(string const & name,
                                  InsetCommandParams const & params)
 {
        ostringstream data;
        data << name << ' ';
        params.write(data);
        data << "\\end_inset\n";
-
        return data.str();
 }