#include "buffer.h"
#include "bufferparams.h"
+#include "BranchList.h"
#include "BufferView.h"
+#include "dispatchresult.h"
#include "funcrequest.h"
#include "gettext.h"
#include "LColor.h"
#include "support/std_sstream.h"
+
+using std::string;
using std::auto_ptr;
using std::istringstream;
using std::ostream;
}
-InsetBranch::InsetBranch(BufferParams const & bp, string const & label)
- : InsetCollapsable(bp)
+InsetBranch::InsetBranch(BufferParams const & bp,
+ InsetBranchParams const & params)
+ : InsetCollapsable(bp), params_(params)
{
- params_.branch = label;
- // Hack: stash the list of all allowable branch labels from this
- // buffer into inset's parm list as a "stowaway":
- params_.branchlist = bp.branchlist();
init();
}
InsetBranch::~InsetBranch()
{
- InsetBranchMailer mailer("branch", *this);
- mailer.hideDialog();
+ InsetBranchMailer(*this).hideDialog();
}
void InsetBranch::read(Buffer const & buf, LyXLex & lex)
{
- if (lex.isOK()) {
- lex.next();
- params_.branch = lex.getString();
- }
+ params_.read(lex);
InsetCollapsable::read(buf, lex);
setButtonLabel();
}
bool InsetBranch::showInsetDialog(BufferView * bv) const
{
- InsetBranchMailer("branch", const_cast<InsetBranch &>(*this)).showDialog(bv);
+ InsetBranchMailer(const_cast<InsetBranch &>(*this)).showDialog(bv);
return true;
}
-dispatch_result InsetBranch::localDispatch(FuncRequest const & cmd)
+DispatchResult
+InsetBranch::priv_dispatch(FuncRequest const & cmd,
+ idx_type & idx, pos_type & pos)
{
BufferView * bv = cmd.view();
switch (cmd.action) {
- case LFUN_INSET_MODIFY:
- {
+ case LFUN_INSET_MODIFY: {
InsetBranchParams params;
InsetBranchMailer::string2params(cmd.argument, params);
params_.branch = params.branch;
setButtonLabel();
- bv->updateInset(this);
- return DISPATCHED;
- }
- case LFUN_INSET_EDIT:
+ return DispatchResult(true, true);
+ }
+
+ case LFUN_MOUSE_PRESS:
if (cmd.button() != mouse_button::button3)
- return InsetCollapsable::localDispatch(cmd);
+ return InsetCollapsable::priv_dispatch(cmd, idx, pos);
+ return DispatchResult(false);
- return UNDISPATCHED;
case LFUN_INSET_DIALOG_UPDATE:
- InsetBranchMailer("branch", *this).updateDialog(bv);
- return DISPATCHED;
+ InsetBranchMailer(*this).updateDialog(bv);
+ return DispatchResult(true);
+
case LFUN_MOUSE_RELEASE:
if (cmd.button() == mouse_button::button3 && hitButton(cmd)) {
- InsetBranchMailer("branch", *this).showDialog(bv);
- return DISPATCHED;
+ InsetBranchMailer(*this).showDialog(bv);
+ return DispatchResult(true);
}
- // fallthrough:
+ return InsetCollapsable::priv_dispatch(cmd, idx, pos);
+
default:
- return InsetCollapsable::localDispatch(cmd);
+ return InsetCollapsable::priv_dispatch(cmd, idx, pos);
}
}
+namespace {
+
+struct SameBranch {
+ SameBranch(string const & branch_name) : bn(branch_name) {}
+ bool operator()(Branch const & branch) const
+ { return bn == branch.getBranch(); }
+private:
+ string bn;
+};
+
+} // namespace anon
+
+
+bool InsetBranch::isBranchSelected(BranchList const & branchlist) const
+{
+ BranchList::const_iterator it = branchlist.begin();
+ BranchList::const_iterator const end = branchlist.end();
+ it = std::find_if(it, end, SameBranch(params_.branch));
+ if (it == end)
+ return false;
+ return it->getSelected();
+}
+
+
int InsetBranch::latex(Buffer const & buf, ostream & os,
- LatexRunParams const & runparams) const
+ OutputParams const & runparams) const
{
- string const branch_sel = buf.params().branchlist().allSelected();
- if (branch_sel.find(params_.branch, 0) != string::npos)
- return inset.latex(buf, os, runparams);
- return 0;
+ return isBranchSelected(buf.params().branchlist()) ?
+ inset.latex(buf, os, runparams) : 0;
}
-int InsetBranch::linuxdoc(Buffer const &, std::ostream &) const
+int InsetBranch::linuxdoc(Buffer const & buf, std::ostream & os,
+ OutputParams const & runparams) const
{
- return 0;
+ return isBranchSelected(buf.params().branchlist()) ?
+ inset.linuxdoc(buf, os, runparams) : 0;
}
-int InsetBranch::docbook(Buffer const & buf, std::ostream & os, bool mixcont) const
+int InsetBranch::docbook(Buffer const & buf, std::ostream & os,
+ OutputParams const & runparams) const
{
- // untested - MV
- string const branch_sel = buf.params().branchlist().allSelected();
- if (branch_sel.find(params_.branch, 0) != string::npos)
- return inset.docbook(buf, os, mixcont);
- return 0;
+ return isBranchSelected(buf.params().branchlist()) ?
+ inset.docbook(buf, os, runparams) : 0;
}
-int InsetBranch::ascii(Buffer const & buf, std::ostream & os, int ll) const
+int InsetBranch::plaintext(Buffer const & buf, std::ostream & os,
+ OutputParams const & runparams) const
{
- string const branch_sel = buf.params().branchlist().allSelected();
- if (branch_sel.find(params_.branch, 0) != string::npos) {
- return inset.ascii(buf, os, ll);
- }
- return 0;
+ return isBranchSelected(buf.params().branchlist()) ?
+ inset.plaintext(buf, os, runparams): 0;
}
-InsetBranchMailer::InsetBranchMailer(string const & name,
- InsetBranch & inset)
- : name_(name), inset_(inset)
-{
-}
+string const InsetBranchMailer:: name_("branch");
+InsetBranchMailer::InsetBranchMailer(InsetBranch & inset)
+ : inset_(inset)
+{}
-string const InsetBranchMailer::inset2string(Buffer const & buf) const
+
+string const InsetBranchMailer::inset2string(Buffer const &) const
{
- InsetBranchParams params = inset_.params();
- params.branchlist = buf.params().branchlist();
- inset_.setParams(params);
- return params2string(name_, params);
+ return params2string(inset_.params());
}
-string const InsetBranchMailer::params2string(string const & name,
- InsetBranchParams const & params)
+string const InsetBranchMailer::params2string(InsetBranchParams const & params)
{
ostringstream data;
- data << name << ' ';
+ data << name_ << ' ';
params.write(data);
- // Add all_branches parameter to data:
- data << params.branchlist.allBranches() << "\n";
return data.str();
}
void InsetBranchMailer::string2params(string const & in,
- InsetBranchParams & params)
+ InsetBranchParams & params)
{
params = InsetBranchParams();
-
if (in.empty())
return;
istringstream data(in);
LyXLex lex(0,0);
lex.setStream(data);
+
+ string name;
+ lex >> name;
+ if (name != name_)
+ return print_mailer_error("InsetBranchMailer", in, 1, name_);
+
+ // This is part of the inset proper that is usually swallowed
+ // by LyXText::readInset
+ string id;
+ lex >> id;
+ if (!lex || id != "Branch")
+ return print_mailer_error("InsetBranchMailer", in, 2, "Branch");
+
params.read(lex);
- // Process all_branches here:
- if (lex.isOK()) {
- lex.next();
- params.branchlist.add(lex.getString());
- }
}
void InsetBranchParams::write(ostream & os) const
{
- os << "Branch" << " " << branch << "\n";
+ os << "Branch " << branch << '\n';
}
void InsetBranchParams::read(LyXLex & lex)
{
- if (lex.isOK()) {
- lex.next();
- string token = lex.getString();
- }
- if (lex.isOK()) {
- lex.next();
- string token = lex.getString();
- }
- if (lex.isOK()) {
- lex.next();
- branch = lex.getString();
- }
+ lex >> branch;
}