Paragraph::value_type c = par->getChar(i);
switch (c) {
case Paragraph::META_INSET:
- case Paragraph::META_HFILL:
- lyxerr << "Element is not allowed in insertERT"
- << endl;
- case Paragraph::META_NEWLINE:
- os << "\n\\newline \n";
+ if (par->getInset(i)->lyxCode() != Inset::NEWLINE_CODE) {
+ lyxerr << "Element is not allowed in insertERT"
+ << endl;
+ } else {
+ par->getInset(i)->write(buf, os);
+ }
break;
+
case '\\':
os << "\n\\backslash \n";
break;
void InsetERT::setFont(BufferView *, LyXFont const &, bool, bool selectall)
{
+#ifdef WITH_WARNINGS
+#warning FIXME. More UI stupidity...
+#endif
// if selectall is activated then the fontchange was an outside general
// fontchange and this messages is not needed
if (!selectall)
- Alert::alert(_("Impossible operation!"),
- _("Not permitted to change font-types inside ERT-insets!"),
- _("Sorry."));
+ Alert::error(_("Cannot change font"),
+ _("You cannot change font settings inside TeX code."));
}
// ignore all struck out text
if (isDeletedText(*par, i))
continue;
-
- Paragraph::value_type c = par->getChar(i);
- switch (c) {
- case Paragraph::META_NEWLINE:
+
+ if (par->isNewline(i)) {
os << '\n';
++lines;
- break;
- default:
- os << c;
- break;
+ } else {
+ os << par->getChar(i);
}
}
par = par->next();
while (par) {
pos_type siz = par->size();
for (pos_type i = 0; i < siz; ++i) {
- Paragraph::value_type c = par->getChar(i);
- switch (c) {
- case Paragraph::META_NEWLINE:
+ if (par->isNewline(i)) {
os << '\n';
++lines;
- break;
- default:
- os << c;
- break;
+ } else {
+ os << par->getChar(i);
}
}
par = par->next();
while (par) {
pos_type siz = par->size();
for (pos_type i = 0; i < siz; ++i) {
- Paragraph::value_type c = par->getChar(i);
- switch (c) {
- case Paragraph::META_NEWLINE:
+ if (par->isNewline(i)) {
os << '\n';
++lines;
- break;
- default:
- os << c;
- break;
+ } else {
+ os << par->getChar(i);
}
}
par = par->next();
Inset::RESULT InsetERT::localDispatch(FuncRequest const & cmd)
{
- Inset::RESULT result = DISPATCHED_NOUPDATE;
+ Inset::RESULT result = UNDISPATCHED;
BufferView * bv = cmd.view();
if (inset.paragraph()->empty()) {
}
switch (cmd.action) {
- case LFUN_ERT_APPLY: {
- if (!bv)
- return UNDISPATCHED;
-
+ case LFUN_INSET_MODIFY: {
InsetERT::ERTStatus status_;
InsetERTMailer::string2params(cmd.argument, status_);
status(bv, status_);
- bv->updateInset(this, true);
- return DISPATCHED;
+
+ /* FIXME: I refuse to believe we have to live
+ * with ugliness like this ! Note that this
+ * rebreak *is* needed. Consider a change from
+ * Open (needfullrow) to Inlined (only the space
+ * taken by the text).
+ */
+ LyXText * t = inset.getLyXText(cmd.view());
+ t->need_break_row = t->rows().begin();
+ t->fullRebreak();
+ t->setCursorIntern(t->cursor.par(), t->cursor.pos());
+ inset.update(cmd.view(), true);
+ bv->updateInset(this);
+ result = DISPATCHED;
}
break;
-
+
case LFUN_MOUSE_PRESS:
lfunMousePress(cmd);
- return DISPATCHED;
+ result = DISPATCHED;
+ break;
case LFUN_MOUSE_MOTION:
lfunMouseMotion(cmd);
- return DISPATCHED;
+ result = DISPATCHED;
+ break;
case LFUN_MOUSE_RELEASE:
lfunMouseRelease(cmd);
- return DISPATCHED;
+ result = DISPATCHED;
+ break;
case LFUN_LAYOUT:
bv->owner()->setLayout(inset.paragraph()->layout()->name());
+ result = DISPATCHED_NOUPDATE;
break;
default:
void InsetERT::draw(BufferView * bv, LyXFont const & f,
- int baseline, float & x, bool cleared) const
+ int baseline, float & x) const
{
- lyx::Assert(bv);
- cache(bv);
-
- Painter & pain = bv->painter();
-
- button_length = width_collapsed();
- button_top_y = -ascent(bv, f);
- button_bottom_y = -ascent(bv, f) + ascent_collapsed() +
- descent_collapsed();
-
- if (!isOpen()) {
- draw_collapsed(pain, baseline, x);
- return;
- }
-
- float old_x = x;
-
- if (!owner())
- x += static_cast<float>(scroll());
-
- if (!cleared && (inset.need_update == InsetText::FULL ||
- inset.need_update == InsetText::INIT ||
- top_x != int(x) ||
- top_baseline != baseline))
- {
- // we don't need anymore to clear here we just have to tell
- // the underlying LyXText that it should do the RowClear!
- inset.setUpdateStatus(bv, InsetText::FULL);
- bv->text->status(bv, LyXText::CHANGED_IN_DRAW);
- return;
- }
-
- top_x = int(x);
- topx_set = true;
- top_baseline = baseline;
-
- int const bl = baseline - ascent(bv, f) + ascent_collapsed();
-
- if (inlined()) {
- inset.draw(bv, f, baseline, x, cleared);
- } else {
- draw_collapsed(pain, bl, old_x);
- inset.draw(bv, f,
- bl + descent_collapsed() + inset.ascent(bv, f),
- x, cleared);
- }
- need_update = NONE;
+ InsetCollapsable::draw(bv, f, baseline, x, inlined());
}
{
if (st != status_) {
status_ = st;
- need_update = FULL;
switch (st) {
case Inlined:
if (bv)
bv->unlockInset(const_cast<InsetERT *>(this));
break;
}
- if (bv)
- bv->updateInset(const_cast<InsetERT *>(this), false);
+ if (bv) {
+ bv->updateInset(const_cast<InsetERT *>(this));
+ bv->buffer()->markDirty();
+ }
}
}
-bool InsetERT::showInsetDialog(BufferView *) const
+bool InsetERT::showInsetDialog(BufferView * bv) const
{
InsetERTMailer mailer(const_cast<InsetERT &>(*this));
- mailer.showDialog();
+ mailer.showDialog(bv);
return true;
}
if (status_ != Inlined || w < 0)
return w;
LyXText * text = inset.getLyXText(bv);
- int rw = text->firstRow()->width();
+ int rw = text->rows().begin()->width();
if (!rw)
rw = w;
rw += 40;
- if (!text->firstRow()->next() && rw < w)
+ if (text->rows().size() == 1 && rw < w)
return -1;
return w;
}
-void InsetERT::update(BufferView * bv, LyXFont const & font,
- bool reinit)
+void InsetERT::update(BufferView * bv, bool reinit)
{
if (inset.need_update & InsetText::INIT ||
- inset.need_update & InsetText::FULL)
- {
+ inset.need_update & InsetText::FULL) {
setButtonLabel();
}
- InsetCollapsable::update(bv, font, reinit);
+
+ InsetCollapsable::update(bv, reinit);
}
+string const InsetERTMailer::name_("ert");
+
InsetERTMailer::InsetERTMailer(InsetERT & inset)
- : name_("ert"), inset_(inset)
+ : inset_(inset)
{}
InsetERT::ERTStatus & status)
{
status = InsetERT::Collapsed;
- if (in.empty())
+
+ string name;
+ string body = split(in, name, ' ');
+
+ if (body.empty())
return;
- status = static_cast<InsetERT::ERTStatus>(strToInt(in));
+ status = static_cast<InsetERT::ERTStatus>(strToInt(body));
}
string const
InsetERTMailer::params2string(InsetERT::ERTStatus status)
{
- return tostr(status);
+ return name_ + ' ' + tostr(status);
}
projects / lyx.git / blobdiff