The markDirty() and fitCursor() changes

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

diff --git a/src/insets/insetert.C b/src/insets/insetert.C
index 073b443d5ece776a9408ae377aa887047113349a..9261c351cd88125dced98a63822137158d001c0d 100644 (file)
--- a/src/insets/insetert.C
+++ b/src/insets/insetert.C
@@ -208,12 +208,14 @@ void InsetERT::write(Buffer const * buf, ostream & os) const
                        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;
@@ -353,16 +355,12 @@ int InsetERT::latex(Buffer const *, ostream & os, bool /*fragile*/,
                        // 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();
@@ -389,15 +387,11 @@ int InsetERT::linuxdoc(Buffer const *, ostream & os) const
        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();
@@ -418,15 +412,11 @@ int InsetERT::docbook(Buffer const *, ostream & os, bool) const
        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();
@@ -442,7 +432,7 @@ int InsetERT::docbook(Buffer const *, ostream & os, bool) const
 
 Inset::RESULT InsetERT::localDispatch(FuncRequest const & cmd)
 {
-       Inset::RESULT result = DISPATCHED_NOUPDATE;
+       Inset::RESULT result = UNDISPATCHED;
        BufferView * bv = cmd.view();
 
        if (inset.paragraph()->empty()) {
@@ -450,33 +440,34 @@ Inset::RESULT InsetERT::localDispatch(FuncRequest const & cmd)
        }
 
        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;
+               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:
@@ -576,7 +567,7 @@ int InsetERT::width(BufferView * bv, LyXFont const & font) const
 
 
 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);
@@ -598,18 +589,6 @@ void InsetERT::draw(BufferView * bv, LyXFont const & f,
        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;
@@ -617,12 +596,10 @@ void InsetERT::draw(BufferView * bv, LyXFont const & f,
        int const bl = baseline - ascent(bv, f) + ascent_collapsed();
 
        if (inlined()) {
-               inset.draw(bv, f, baseline, x, cleared);
+               inset.draw(bv, f, baseline, x);
        } else {
                draw_collapsed(pain, bl, old_x);
-               inset.draw(bv, f,
-                                  bl + descent_collapsed() + inset.ascent(bv, f),
-                                  x, cleared);
+               inset.draw(bv, f, bl + descent_collapsed() + inset.ascent(bv, f), x);
        }
        need_update = NONE;
 }
@@ -663,16 +640,18 @@ void InsetERT::status(BufferView * bv, ERTStatus const st) const
                                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;
 }
 
@@ -739,8 +718,10 @@ void InsetERT::update(BufferView * bv, LyXFont const & font,
 }
 
 
+string const InsetERTMailer::name_("ert");
+
 InsetERTMailer::InsetERTMailer(InsetERT & inset)
-       : name_("ert"), inset_(inset)
+       : inset_(inset)
 {}
 
 
@@ -754,15 +735,19 @@ void InsetERTMailer::string2params(string const & in,
                                   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);
 }