prevent crash when inserting minipage in table cell,

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

diff --git a/src/insets/insettext.C b/src/insets/insettext.C
index b6055329ad7e6bdc6b0b6e8471cc62430bda8680..78bb89071e290ff205c68048b367bec53a8d7550 100644 (file)
--- a/src/insets/insettext.C
+++ b/src/insets/insettext.C
@@ -252,8 +252,8 @@ void InsetText::read(Buffer const * buf, LyXLex & lex)
                        break;
                }
 
-               if (token == "\\the_end") {
-                       lex.printError("\\the_end read in inset! Error in document!");
+               if (token == "\\end_document") {
+                       lex.printError("\\end_document read in inset! Error in document!");
                        return;
                }
 
@@ -321,6 +321,8 @@ void InsetText::draw(PainterInfo & pi, int x, int baseline) const
                return;
        }
 
+       bv->hideCursor();
+
        if (!owner())
                x += scroll();
 
@@ -333,23 +335,23 @@ void InsetText::draw(PainterInfo & pi, int x, int baseline) const
        }
 
        if (the_locking_inset && cpar() == inset_par && cpos() == inset_pos) {
-               inset_x = cix(bv) - x + drawTextXOffset;
+               inset_x = cix() - x + drawTextXOffset;
                inset_y = ciy() + drawTextYOffset;
        }
 
        x += TEXT_TO_INSET_OFFSET;
 
-       RowList::iterator rowit = text_.rows().begin();
+       RowList::iterator rit = text_.rows().begin();
        RowList::iterator end = text_.rows().end();
 
-       int y_offset = baseline - rowit->ascent_of_text();
-       int ph = pain.paperHeight();
+       int y_offset = baseline - rit->ascent_of_text();
+       int y2 = pain.paperHeight();
        int first = 0;
        int y = y_offset;
-       while (rowit != end && y + rowit->height() <= 0) {
-               y += rowit->height();
-               first += rowit->height();
-               ++rowit;
+       while (rit != end && y + rit->height() <= 0) {
+               y += rit->height();
+               first += rit->height();
+               ++rit;
        }
        if (y_offset < 0) {
                text_.top_y(-y_offset);
@@ -360,28 +362,17 @@ void InsetText::draw(PainterInfo & pi, int x, int baseline) const
                first = 0;
        }
 
-       int yf = y_offset + first;
-       y = 0;
-
-       bv->hideCursor();
+       int yo = y_offset + first;
 
-       while (rowit != end && yf < ph) {
-               paintRows(*bv, text_, rowit,
-                       y + y_offset + first, int(x), y + text_.top_y());
-               y += rowit->height();
-               yf += rowit->height();
-               ++rowit;
-       }
+       paintRows(*bv, text_, rit, x, 0, yo, y2, yo);
 
        text_.clearPaint();
 
-       if (drawFrame_ == ALWAYS || (drawFrame_ == LOCKED && locked)) {
+       if (drawFrame_ == ALWAYS || (drawFrame_ == LOCKED && locked))
                drawFrame(pain, int(start_x));
-       }
 
-       if (need_update != INIT) {
+       if (need_update != INIT)
                need_update = NONE;
-       }
 }
 
 
@@ -515,10 +506,10 @@ void InsetText::lockInset(BufferView * bv)
 }
 
 
-void InsetText::lockInset(BufferView * bv, UpdatableInset * inset)
+void InsetText::lockInset(BufferView * /*bv*/, UpdatableInset * inset)
 {
        the_locking_inset = inset;
-       inset_x = cix(bv) - top_x + drawTextXOffset;
+       inset_x = cix() - top_x + drawTextXOffset;
        inset_y = ciy() + drawTextYOffset;
        inset_pos = cpos();
        inset_par = cpar();
@@ -571,7 +562,7 @@ bool InsetText::lockInsetInInset(BufferView * bv, UpdatableInset * inset)
        if (the_locking_inset && the_locking_inset == inset) {
                if (cpar() == inset_par && cpos() == inset_pos) {
                        lyxerr[Debug::INSETS] << "OK" << endl;
-                       inset_x = cix(bv) - top_x + drawTextXOffset;
+                       inset_x = cix() - top_x + drawTextXOffset;
                        inset_y = ciy() + drawTextYOffset;
                } else {
                        lyxerr[Debug::INSETS] << "cursor.pos != inset_pos" << endl;
@@ -629,11 +620,10 @@ bool InsetText::updateInsetInInset(BufferView * bv, InsetOld * inset)
                                return false;
                        found = tl_inset->updateInsetInInset(bv, inset);
                        ustat = FULL;
-               }
-               if (found)
+               } else {
                        text_.updateInset(tl_inset);
-               if (found)
                        setUpdateStatus(ustat);
+               }
                return found;
        }
        bool found = text_.updateInset(inset);
@@ -642,7 +632,7 @@ bool InsetText::updateInsetInInset(BufferView * bv, InsetOld * inset)
                if (the_locking_inset &&
                    cpar() == inset_par && cpos() == inset_pos)
                {
-                       inset_x = cix(bv) - top_x + drawTextXOffset;
+                       inset_x = cix() - top_x + drawTextXOffset;
                        inset_y = ciy() + drawTextYOffset;
                }
        }
@@ -801,11 +791,7 @@ void InsetText::lfunMouseMotion(FuncRequest const & cmd)
        if (cur == text_.cursor)
                return;
        text_.setSelection();
-       bool flag = (text_.toggle_cursor.par() != text_.toggle_end_cursor.par() ||
-                                text_.toggle_cursor.pos() != text_.toggle_end_cursor.pos());
-       if (flag) {
-               updateLocal(bv, SELECTION, false);
-       }
+       updateLocal(bv, SELECTION, false);
 }
 
 
@@ -825,7 +811,9 @@ InsetOld::RESULT InsetText::localDispatch(FuncRequest const & cmd)
 
                locked = true;
                the_locking_inset = 0;
-               inset_pos = inset_x = inset_y = 0;
+               inset_pos = 0;
+               inset_x = 0;
+               inset_y = 0;
                inset_boundary = false;
                inset_par = paragraphs.end();
                old_par = paragraphs.end();
@@ -835,11 +823,7 @@ InsetOld::RESULT InsetText::localDispatch(FuncRequest const & cmd)
                        if (cmd.argument == "left")
                                text_.setCursorIntern(paragraphs.begin(), 0);
                        else {
-                               ParagraphList::iterator it = paragraphs.begin();
-                               ParagraphList::iterator end = paragraphs.end();
-                               while (boost::next(it) != end)
-                                       ++it;
-               //              int const pos = (p->size() ? p->size()-1 : p->size());
+                               ParagraphList::iterator it = boost::prior(paragraphs.end());
                                text_.setCursor(it, it->size());
                        }
                } else {
@@ -1312,6 +1296,7 @@ int InsetText::ascii(Buffer const * buf, ostream & os, int linelen) const
        return lines;
 }
 
+
 int InsetText::linuxdoc(Buffer const * buf, ostream & os) const
 {
        ParagraphList::iterator pit = const_cast<ParagraphList&>(paragraphs).begin();
@@ -1332,6 +1317,7 @@ int InsetText::linuxdoc(Buffer const * buf, ostream & os) const
        return 0;
 }
 
+
 int InsetText::docbook(Buffer const * buf, ostream & os, bool mixcont) const
 {
        unsigned int lines = 0;
@@ -1499,7 +1485,7 @@ void InsetText::getCursor(BufferView & bv, int & x, int & y) const
                the_locking_inset->getCursor(bv, x, y);
                return;
        }
-       x = cx(&bv);
+       x = cx();
        y = cy() + InsetText::y();
 }
 
@@ -1510,7 +1496,7 @@ void InsetText::getCursorPos(BufferView * bv, int & x, int & y) const
                the_locking_inset->getCursorPos(bv, x, y);
                return;
        }
-       x = cx(bv) - top_x - TEXT_TO_INSET_OFFSET;
+       x = cx() - top_x - TEXT_TO_INSET_OFFSET;
        y = cy() - TEXT_TO_INSET_OFFSET;
 }
 
@@ -1520,7 +1506,7 @@ int InsetText::insetInInsetY() const
        if (!the_locking_inset)
                return 0;
 
-       return (inset_y + the_locking_inset->insetInInsetY());
+       return inset_y + the_locking_inset->insetInInsetY();
 }
 
 
@@ -1530,12 +1516,13 @@ void InsetText::fitInsetCursor(BufferView * bv) const
                the_locking_inset->fitInsetCursor(bv);
                return;
        }
-       LyXFont const font = text_.getFont(bv->buffer(), cpar(), cpos());
+
+       LyXFont const font = text_.getFont(cpar(), cpos());
 
        int const asc = font_metrics::maxAscent(font);
        int const desc = font_metrics::maxDescent(font);
 
-       if (bv->fitLockedInsetCursor(cx(bv), cy(), asc, desc))
+       if (bv->fitLockedInsetCursor(cx(), cy(), asc, desc))
                need_update |= FULL;
 }
 
@@ -1727,19 +1714,15 @@ void InsetText::setFont(BufferView * bv, LyXFont const & font, bool toggleall,
 
 bool InsetText::checkAndActivateInset(BufferView * bv, bool front)
 {
-       if (cpar()->isInset(cpos())) {
-               InsetOld * inset =
-                       static_cast<UpdatableInset*>(cpar()->getInset(cpos()));
-               if (!isHighlyEditableInset(inset))
-                       return false;
-               FuncRequest cmd(bv, LFUN_INSET_EDIT, front ? "left" : "right");
-               inset->localDispatch(cmd);
-               if (!the_locking_inset)
-                       return false;
-               updateLocal(bv, CURSOR, false);
-               return true;
-       }
-       return false;
+       InsetOld * inset = cpar()->getInset(cpos());
+       if (!isHighlyEditableInset(inset))
+               return false;
+       FuncRequest cmd(bv, LFUN_INSET_EDIT, front ? "left" : "right");
+       inset->localDispatch(cmd);
+       if (!the_locking_inset)
+               return false;
+       updateLocal(bv, CURSOR, false);
+       return true;
 }
 
 
@@ -1758,21 +1741,20 @@ bool InsetText::checkAndActivateInset(BufferView * bv, int x, int y,
        if (button == mouse_button::none && !isHighlyEditableInset(inset))
                return false;
 
-       if (inset) {
-               if (x < 0)
-                       x = dim_.wid;
-               if (y < 0)
-                       y = dim_.des;
-               inset_x = cix(bv) - top_x + drawTextXOffset;
-               inset_y = ciy() + drawTextYOffset;
-               FuncRequest cmd(bv, LFUN_INSET_EDIT, x - inset_x, y - inset_y, button);
-               inset->localDispatch(cmd);
-               if (!the_locking_inset)
-                       return false;
-               updateLocal(bv, CURSOR, false);
-               return true;
-       }
-       return false;
+       if (!inset)
+               return false;
+       if (x < 0)
+               x = dim_.wid;
+       if (y < 0)
+               y = dim_.des;
+       inset_x = cix() - top_x + drawTextXOffset;
+       inset_y = ciy() + drawTextYOffset;
+       FuncRequest cmd(bv, LFUN_INSET_EDIT, x - inset_x, y - inset_y, button);
+       inset->localDispatch(cmd);
+       if (!the_locking_inset)
+               return false;
+       updateLocal(bv, CURSOR, false);
+       return true;
 }
 
 
@@ -1790,8 +1772,7 @@ void InsetText::setParagraphData(ParagraphList const & plist)
        ParagraphList::const_iterator end = plist.end();
        for (; it != end; ++it) {
                paragraphs.push_back(*it);
-               Paragraph & tmp = paragraphs.back();
-               tmp.setInsetOwner(this);
+               paragraphs.back().setInsetOwner(this);
        }
 
        reinitLyXText();
@@ -1854,12 +1835,11 @@ void InsetText::setFrameColor(BufferView * bv, LColor::color col)
 }
 
 
-int InsetText::cx(BufferView * bv) const
+int InsetText::cx() const
 {
        int x = text_.cursor.x() + top_x + TEXT_TO_INSET_OFFSET;
        if (the_locking_inset) {
-               LyXFont font = text_.getFont(bv->buffer(), text_.cursor.par(),
-                                           text_.cursor.pos());
+               LyXFont font = text_.getFont(text_.cursor.par(), text_.cursor.pos());
                if (font.isVisibleRightToLeft())
                        x -= the_locking_inset->width();
        }
@@ -1867,12 +1847,11 @@ int InsetText::cx(BufferView * bv) const
 }
 
 
-int InsetText::cix(BufferView * bv) const
+int InsetText::cix() const
 {
        int x = text_.cursor.ix() + top_x + TEXT_TO_INSET_OFFSET;
        if (the_locking_inset) {
-               LyXFont font = text_.getFont(bv->buffer(), text_.cursor.par(),
-                                           text_.cursor.pos());
+               LyXFont font = text_.getFont(text_.cursor.par(), text_.cursor.pos());
                if (font.isVisibleRightToLeft())
                        x -= the_locking_inset->width();
        }
@@ -1973,7 +1952,7 @@ void InsetText::resizeLyXText(BufferView * bv, bool /*force*/) const
        // seems to be unneeded
 #if 1
        if (the_locking_inset) {
-               inset_x = cix(bv) - top_x + drawTextXOffset;
+               inset_x = cix() - top_x + drawTextXOffset;
                inset_y = ciy() + drawTextYOffset;
        }
 
@@ -2005,7 +1984,7 @@ void InsetText::reinitLyXText() const
        text_.init(bv);
        restoreLyXTextState();
        if (the_locking_inset) {
-               inset_x = cix(bv) - top_x + drawTextXOffset;
+               inset_x = cix() - top_x + drawTextXOffset;
                inset_y = ciy() + drawTextYOffset;
        }
        text_.top_y(bv->screen().topCursorVisible(&text_));
@@ -2153,19 +2132,18 @@ void InsetText::selectSelectedWord(BufferView * bv)
 
 void InsetText::toggleSelection(BufferView * bv, bool kill_selection)
 {
-       if (the_locking_inset) {
+       if (the_locking_inset)
                the_locking_inset->toggleSelection(bv, kill_selection);
-       }
 
        int x = top_x + TEXT_TO_INSET_OFFSET;
 
-       RowList::iterator rowit = text_.rows().begin();
+       RowList::iterator rit = text_.rows().begin();
        RowList::iterator end = text_.rows().end();
-       int y_offset = top_baseline - rowit->ascent_of_text();
+       int y_offset = top_baseline - rit->ascent_of_text();
        int y = y_offset;
-       while ((rowit != end) && ((y + rowit->height()) <= 0)) {
-               y += rowit->height();
-               ++rowit;
+       while (rit != end && y + rit->height() <= 0) {
+               y += rit->height();
+               ++rit;
        }
        if (y_offset < 0)
                y_offset = y;
@@ -2219,9 +2197,10 @@ bool InsetText::searchForward(BufferView * bv, string const & str,
                text_.setSelectionRange(str.length());
                updateLocal(bv, SELECTION, false);
        }
-       return (result != lyx::find::SR_NOT_FOUND);
+       return result != lyx::find::SR_NOT_FOUND;
 }
 
+
 bool InsetText::searchBackward(BufferView * bv, string const & str,
                               bool cs, bool mw)
 {
@@ -2250,7 +2229,7 @@ bool InsetText::searchBackward(BufferView * bv, string const & str,
                text_.setSelectionRange(str.length());
                updateLocal(bv, SELECTION, false);
        }
-       return (result != lyx::find::SR_NOT_FOUND);
+       return result != lyx::find::SR_NOT_FOUND;
 }