]> git.lyx.org Git - lyx.git/blobdiff - src/insets/insettext.C
adjust
[lyx.git] / src / insets / insettext.C
index a17efbd2aea1d2275169292c75f2f8e0a7f107f6..3355374259fdf4c345b553e51ce725933b41c29f 100644 (file)
@@ -40,6 +40,7 @@
 #include "LColor.h"
 #include "support/textutils.h"
 #include "support/LAssert.h"
+#include "support/lstrings.h"
 #include "lyxrow.h"
 #include "lyxrc.h"
 #include "intl.h"
@@ -50,6 +51,7 @@
 #include "lyxfunc.h"
 #include "ParagraphParameters.h"
 #include "undo_funcs.h"
+#include "lyxfind.h"
 
 using std::ostream;
 using std::ifstream;
@@ -78,6 +80,7 @@ void InsetText::saveLyXTextState(LyXText * t) const
        sstate.selendboundary = t->selection.end.boundary();
        sstate.selection = t->selection.set();
        sstate.mark_set = t->selection.mark();
+       sstate.refresh = t->refresh_row != 0;
 }
 
 void InsetText::restoreLyXTextState(BufferView * bv, LyXText * t) const
@@ -100,6 +103,8 @@ void InsetText::restoreLyXTextState(BufferView * bv, LyXText * t) const
                        t->selection.cursor = t->cursor;
                        t->selection.set(false);
                }
+               if (sstate.refresh) {
+               }
        }
 }
 
@@ -115,6 +120,7 @@ InsetText::InsetText()
 {
        par = new Paragraph;
        init();
+       in_update = false;
 }
 
 
@@ -123,6 +129,7 @@ InsetText::InsetText(InsetText const & ins, bool same_id)
 {
        par = 0;
        init(&ins, same_id);
+       in_update = false;
        autoBreakRows = ins.autoBreakRows;
 }
 
@@ -152,15 +159,16 @@ void InsetText::init(InsetText const * ins, bool same_id)
        autoBreakRows = false;
        drawFrame_ = NEVER;
        xpos = 0.0;
+       frame_color = LColor::insetframe;
        if (ins) {
                setParagraphData(ins->par);
                autoBreakRows = ins->autoBreakRows;
                drawFrame_ = ins->drawFrame_;
+               frame_color = ins->frame_color;
                if (same_id)
                        id_ = ins->id_;
        }
        par->setInsetOwner(this);
-       frame_color = LColor::insetframe;
        locked = false;
        old_par = 0;
        last_drawn_width = -1;
@@ -187,24 +195,19 @@ InsetText::~InsetText()
 
 void InsetText::clear()
 {
-       cached_bview = 0;
-
-       // now also delete all caches this should be safe, hopefully
-       cache.clear();
-
        while (par) {
                Paragraph * tmp = par->next();
                delete par;
                par = tmp;
        }
        par = new Paragraph;
+       reinitLyXText();
 }
 
 
 Inset * InsetText::clone(Buffer const &, bool same_id) const
 {
-       InsetText * t = new InsetText(*this, same_id);
-       return t;
+       return  new InsetText(*this, same_id);
 }
 
 
@@ -231,13 +234,18 @@ void InsetText::read(Buffer const * buf, LyXLex & lex)
 
        clear();
        
-       while (lex.IsOK()) {
+       while (lex.isOK()) {
                lex.nextToken();
-               token = lex.GetString();
+               token = lex.getString();
                if (token.empty())
                        continue;
-               if (token == "\\end_inset")
+               if (token == "\\end_inset") {
+#ifndef NO_COMPABILITY
+                       const_cast<Buffer*>(buf)->insertErtContents(par, pos, font, false);
+#endif
                        break;
+               }
+               
                if (const_cast<Buffer*>(buf)->
                        parseSingleLyXformat2Token(lex, par, return_par,
                                                   token, pos, depth, font)) {
@@ -290,16 +298,28 @@ int InsetText::descent(BufferView * bv, LyXFont const &) const
 
 int InsetText::width(BufferView * bv, LyXFont const &) const
 {
-       insetWidth = max(textWidth(bv),
-                        (int)getLyXText(bv)->width + (2 * TEXT_TO_INSET_OFFSET));
+       insetWidth = max(textWidth(bv), (int)getLyXText(bv)->width) +
+               (2 * TEXT_TO_INSET_OFFSET);
+       insetWidth = max(insetWidth, 10);
        return insetWidth;
 }
 
 
-int InsetText::textWidth(BufferView * bv) const
+int InsetText::textWidth(BufferView * bv, bool fordraw) const
 {
-       int const w = getMaxWidth(bv, this);
-       return w;
+       int w;
+       if (!autoBreakRows) {
+               w = -1;
+       } else {
+               w = getMaxWidth(bv, this);
+       }
+       if (fordraw) {
+               return max(w - (2 * TEXT_TO_INSET_OFFSET),
+                          (int)getLyXText(bv)->width);
+       } else if (w < 0) {
+           return -1;
+       }
+       return w - (2 * TEXT_TO_INSET_OFFSET);
 }
 
 
@@ -310,33 +330,45 @@ void InsetText::draw(BufferView * bv, LyXFont const & f,
                return;
 
        Painter & pain = bv->painter();
+       
+       // this is the first thing we have to ask because if the x pos
+       // changed we have to do a complete rebreak of the text as we
+       // may have few space to draw in. Well we should check on this too
+       int old_x = top_x;
+       if (top_x != int(x)) {
+               top_x = int(x);
+               int nw = getMaxWidth(bv, this);
+               if (nw > 0 && old_max_width != nw) {
+                       need_update = INIT;
+                       old_max_width = nw;
+                       bv->text->status(bv, LyXText::CHANGED_IN_DRAW);
+                       return;
+               } else {
+                       top_x = old_x;
+               }
+       }
+
+       // repaint the background if needed
+       if (cleared && backgroundColor() != LColor::background) {
+               top_x = int(x);
+               clearInset(pain, baseline, cleared);
+               top_x = old_x;
+       }
 
        // no draw is necessary !!!
        if ((drawFrame_ == LOCKED) && !locked && !par->size()) {
                top_x = int(x);
                top_baseline = baseline;
                x += width(bv, f);
-               if (!cleared && (need_update & CLEAR_FRAME))
+               if (need_update & CLEAR_FRAME)
                        clearFrame(pain, cleared);
-               else if (cleared)
-                       frame_is_visible = false;
                need_update = NONE;
                return;
        }
 
        xpos = x;
-#if 0
-       UpdatableInset::draw(bv, f, baseline, x, cleared);
-#else
        if (!owner())
                x += static_cast<float>(scroll());
-#endif
-#if 0
-       // update insetWidth and insetHeight with dummy calls
-       (void)ascent(bv, f);
-       (void)descent(bv, f);
-       (void)width(bv, f);
-#endif
 
        // if top_x differs we have a rule down and we don't have to clear anything
        if (!cleared && (top_x == int(x)) &&
@@ -344,43 +376,37 @@ void InsetText::draw(BufferView * bv, LyXFont const & f,
                 (last_drawn_width!=insetWidth))) {
                clearInset(pain, baseline, cleared);
        }
+
+       top_x = int(x);
        if (cleared)
                frame_is_visible = false;
 
-       if (!cleared && (need_update == NONE))
+       if (!cleared && (need_update == NONE)) {
+               if (locked)
+                       drawFrame(pain, cleared);
                return;
-
-       if (top_x != int(x)) {
-               if ((getMaxWidth(bv, this) > 0) &&
-                       (getLyXText(bv)->width != old_max_width)) {
-                       resizeLyXText(bv);
-                       need_update |= FULL;
-                       old_max_width = getLyXText(bv)->width;
-                       bv->text->status(bv, LyXText::CHANGED_IN_DRAW);
-               }
-               top_x = int(x);
-               clearInset(pain, baseline, cleared);
        }
 
-//     lyxerr << "InsetText::draw[" << this << "](" << need_update << ":" << int(x) << ":" << top_x << ")\n";
+       top_baseline = baseline;
+       top_y = baseline - ascent(bv, f);
+       last_width = width(bv, f);
+       last_height = ascent(bv, f) + descent(bv, f);
 
        if (cleared || (last_drawn_width != insetWidth)) {
+               if (!cleared) 
+                       clearInset(pain, baseline, cleared);
                need_update |= FULL;
                last_drawn_width = insetWidth;
        }
 
-       top_baseline = baseline;
-       top_y = baseline - ascent(bv, f);
-       last_width = width(bv, f);
-       last_height = ascent(bv, f) + descent(bv, f);
-
        if (the_locking_inset && (cpar(bv) == inset_par)
                && (cpos(bv) == inset_pos)) {
                inset_x = cx(bv) - top_x + drawTextXOffset;
                inset_y = cy(bv) + drawTextYOffset;
        }
        if (!cleared && (need_update == CURSOR)
-               && !getLyXText(bv)->selection.set()) {
+               && !getLyXText(bv)->selection.set())
+       {
                drawFrame(pain, cleared);
                x += last_width; // was width(bv, f);
                need_update = NONE;
@@ -407,7 +433,7 @@ void InsetText::draw(BufferView * bv, LyXFont const & f,
        if (y_offset < 0)
                y_offset = y;
        lt->first = first;
-       if (cleared) {
+       if (cleared || (need_update&(INIT|FULL))) {
                int yf = y_offset;
                y = 0;
                while ((row != 0) && (yf < ph)) {
@@ -420,7 +446,7 @@ void InsetText::draw(BufferView * bv, LyXFont const & f,
        } else if (!locked) {
                if (need_update & CURSOR) {
                        bv->screen()->toggleSelection(lt, bv, true, y_offset,int(x));
-                       lt->clearSelection(bv);
+                       lt->clearSelection();
                        lt->selection.cursor = lt->cursor;
                }
                bv->screen()->update(lt, bv, y_offset, int(x));
@@ -430,7 +456,7 @@ void InsetText::draw(BufferView * bv, LyXFont const & f,
                        bv->screen()->toggleToggle(lt, bv, y_offset, int(x));
                else if (need_update & CURSOR) {
                        bv->screen()->toggleSelection(lt, bv, true, y_offset,int(x));
-                       lt->clearSelection(bv);
+                       lt->clearSelection();
                        lt->selection.cursor = lt->cursor;
                }
                bv->screen()->update(lt, bv, y_offset, int(x));
@@ -456,9 +482,13 @@ void InsetText::draw(BufferView * bv, LyXFont const & f,
 
 void InsetText::drawFrame(Painter & pain, bool cleared) const
 {
+       static int const ttoD2 = TEXT_TO_INSET_OFFSET / 2;
        if (!frame_is_visible || cleared) {
-               pain.rectangle(top_x + 1, top_baseline - insetAscent + 1,
-                              insetWidth - 1, insetAscent + insetDescent - 1,
+               frame_x = top_x + ttoD2;
+               frame_y = top_baseline - insetAscent + ttoD2;
+               frame_w = last_width - TEXT_TO_INSET_OFFSET;
+               frame_h = insetAscent + insetDescent - TEXT_TO_INSET_OFFSET;
+               pain.rectangle(frame_x, frame_y, frame_w, frame_h,
                               frame_color);
                frame_is_visible = true;
        }
@@ -469,9 +499,8 @@ void InsetText::clearFrame(Painter & pain, bool cleared) const
 {
        if (frame_is_visible) {
                if (!cleared) {
-                       pain.rectangle(top_x + 1, top_baseline - insetAscent + 1,
-                                      insetWidth - 1, insetAscent + insetDescent - 1,
-                                      LColor::background);
+                       pain.rectangle(frame_x, frame_y, frame_w, frame_h,
+                                      backgroundColor());
                }
                frame_is_visible = false;
        }
@@ -480,11 +509,15 @@ void InsetText::clearFrame(Painter & pain, bool cleared) const
 
 void InsetText::update(BufferView * bv, LyXFont const & font, bool reinit)
 {
+       if (in_update)
+               return;
+       in_update = true;
        if (reinit) {
                need_update |= INIT;
                resizeLyXText(bv);
                if (owner())
                        owner()->update(bv, font, true);
+               in_update = false;
                return;
        }
        if (the_locking_inset) {
@@ -505,6 +538,7 @@ void InsetText::update(BufferView * bv, LyXFont const & font, bool reinit)
                need_update |= FULL;
                if (clear)
                        lt = 0;
+               in_update = false;
                return;
        }
        if ((need_update & CURSOR_PAR) && (lt->status() == LyXText::UNCHANGED) &&
@@ -516,6 +550,7 @@ void InsetText::update(BufferView * bv, LyXFont const & font, bool reinit)
                need_update |= FULL;
        if (clear)
                lt = 0;
+       in_update = false;
 }
 
 
@@ -527,20 +562,29 @@ void InsetText::setUpdateStatus(BufferView * bv, int what) const
                clear = true;
        }
        need_update |= what;
-       if (lt->status() == LyXText::NEED_MORE_REFRESH)
+       // we have to redraw us full if our LyXText NEEDS_MORE_REFRES or
+       // if we don't break row so that we only have one row to update!
+       if ((lt->status() == LyXText::NEED_MORE_REFRESH) ||
+           (!autoBreakRows &&
+            (lt->status() == LyXText::NEED_VERY_LITTLE_REFRESH)))
+       {
                need_update |= FULL;
-       else if (lt->status() == LyXText::NEED_VERY_LITTLE_REFRESH)
+       } else if (lt->status() == LyXText::NEED_VERY_LITTLE_REFRESH) {
                need_update |= CURSOR_PAR;
+       }
 
        // this to not draw a selection when we redraw all of it!
-       if ((need_update & (INIT|FULL)) && (need_update & CURSOR))
-               lt->clearSelection(bv);
+       if (need_update & CURSOR && !(need_update & SELECTION)) {
+               if (lt->selection.set())
+                       need_update = FULL;
+               lt->clearSelection();
+       }
        if (clear)
                lt = 0;
 }
 
 
-void InsetText::updateLocal(BufferView * bv, int what, bool mark_dirty)
+void InsetText::updateLocal(BufferView * bv, int what, bool mark_dirty) const
 {
        bool clear = false;
        if (!lt) {
@@ -549,11 +593,13 @@ void InsetText::updateLocal(BufferView * bv, int what, bool mark_dirty)
        }
        lt->fullRebreak(bv);
        setUpdateStatus(bv, what);
-       if ((need_update != CURSOR) || (lt->status() != LyXText::UNCHANGED) ||
-               lt->selection.set())
+       if (((need_update != CURSOR) && (need_update != NONE)) ||
+           (lt->status() != LyXText::UNCHANGED) || lt->selection.set())
        {
-               bv->updateInset(this, mark_dirty);
+               bv->updateInset(const_cast<InsetText *>(this), mark_dirty);
        }
+       if (need_update == CURSOR)
+               need_update = NONE;
        bv->owner()->showState();
        if (old_par != cpar(bv)) {
                bv->owner()->setLayout(cpar(bv)->getLayout());
@@ -572,7 +618,6 @@ string const InsetText::editMessage() const
 
 void InsetText::edit(BufferView * bv, int x, int y, unsigned int button)
 {
-//    par->SetInsetOwner(this);
        UpdatableInset::edit(bv, x, y, button);
        
        if (!bv->lockInset(this)) {
@@ -595,7 +640,53 @@ void InsetText::edit(BufferView * bv, int x, int y, unsigned int button)
        if (!checkAndActivateInset(bv, x, tmp_y, button))
                lt->setCursorFromCoordinates(bv, x - drawTextXOffset,
                                            y + insetAscent);
-       lt->selection.cursor = lt->cursor;
+       lt->clearSelection();
+       finishUndo();
+       showInsetCursor(bv);
+       updateLocal(bv, CURSOR, false);
+
+       // If the inset is empty set the language of the current font to the
+       // language to the surronding text (if different).
+       if (par->size() == 0 && !par->next() &&
+               bv->getParentLanguage(this) != lt->current_font.language()) {
+               LyXFont font(LyXFont::ALL_IGNORE);
+               font.setLanguage(bv->getParentLanguage(this));
+               setFont(bv, font, false);
+       }
+       if (clear)
+               lt = 0;
+}
+
+
+void InsetText::edit(BufferView * bv, bool front)
+{
+       UpdatableInset::edit(bv, front);
+       
+       if (!bv->lockInset(this)) {
+               lyxerr[Debug::INSETS] << "Cannot lock inset" << endl;
+               return;
+       }
+       locked = true;
+       the_locking_inset = 0;
+       inset_pos = inset_x = inset_y = 0;
+       inset_boundary = false;
+       inset_par = 0;
+       old_par = 0;
+       bool clear = false;
+       if (!lt) {
+               lt = getLyXText(bv);
+               clear = true;
+       }
+       if (front)
+               lt->setCursor(bv, par, 0);
+       else {
+               Paragraph * p = par;
+               while(p->next())
+                       p = p->next();
+               int const pos = (p->size() ? p->size()-1 : p->size());
+               lt->setCursor(bv, p, pos);
+       }
+       lt->clearSelection();
        finishUndo();
        showInsetCursor(bv);
        updateLocal(bv, CURSOR, false);
@@ -622,14 +713,18 @@ void InsetText::insetUnlock(BufferView * bv)
        hideInsetCursor(bv);
        no_selection = false;
        locked = false;
-       int code = CURSOR|CLEAR_FRAME;
+       int code;
+       if (drawFrame_ == LOCKED)
+               code = CURSOR|CLEAR_FRAME;
+       else 
+               code = CURSOR;
        bool clear = false;
        if (!lt) {
                lt = getLyXText(bv);
                clear = true;
        }
        if (lt->selection.set()) {
-               lt->clearSelection(bv);
+               lt->clearSelection();
                code = FULL;
        } else if (owner()) {
                bv->owner()->setLayout(owner()->getLyXText(bv)
@@ -706,7 +801,6 @@ bool InsetText::updateInsetInInset(BufferView * bv, Inset * inset)
                setUpdateStatus(bv, CURSOR_PAR);
                return the_locking_inset->updateInsetInInset(bv, inset);
        }
-//    updateLocal(bv, FULL, false);
        if (getLyXText(bv)->updateInset(bv, inset))
                updateLocal(bv, CURSOR_PAR, false);
        if (cpar(bv) == inset_par && cpos(bv) == inset_pos) {
@@ -772,10 +866,18 @@ void InsetText::insetButtonPress(BufferView * bv, int x, int y, int button)
                        localDispatch(bv, LFUN_COPY, "");
                        paste_internally = true;
                }
-               getLyXText(bv)->setCursorFromCoordinates(bv, x-drawTextXOffset,
-                                                        y + insetAscent);
-               getLyXText(bv)->selection.cursor = getLyXText(bv)->cursor;
-               updateLocal(bv, CURSOR, false);
+               bool clear = false;
+               if (!lt) {
+                       lt = getLyXText(bv);
+                       clear = true;
+               }
+               lt->setCursorFromCoordinates(bv, x-drawTextXOffset, y + insetAscent);
+               if (lt->selection.set()) {
+                       lt->clearSelection();
+                       updateLocal(bv, FULL, false);
+               } else {
+                       lt->clearSelection();
+               }
                bv->owner()->setLayout(cpar(bv)->getLayout());
                old_par = cpar(bv);
                // Insert primary selection with middle mouse
@@ -788,6 +890,8 @@ void InsetText::insetButtonPress(BufferView * bv, int x, int y, int button)
                                localDispatch(bv, LFUN_PASTESELECTION,
                                              "paragraph");
                }
+               if (clear)
+                       lt = 0;
        }
        showInsetCursor(bv);
        no_selection = false;
@@ -930,17 +1034,9 @@ InsetText::localDispatch(BufferView * bv,
                                        lt->cutSelection(bv, false);
                                }
                        }
-                       lt->clearSelection(bv);
+                       lt->clearSelection();
                        for (string::size_type i = 0; i < arg.length(); ++i) {
-                               if (greek_kb_flag) {
-                                       if (!math_insert_greek(bv, arg[i])) {
-                                               bv->owner()->getIntl()->getTrans().TranslateAndInsert(arg[i], lt);
-                                       } else if (!the_locking_inset) {
-                                               (void)moveRight(bv, false);
-                                       }
-                               } else {
-                                       bv->owner()->getIntl()->getTrans().TranslateAndInsert(arg[i], lt);
-                               }
+                               bv->owner()->getIntl()->getTrans().TranslateAndInsert(arg[i], lt);
                        }
                }
                lt->selection.cursor = lt->cursor;
@@ -1308,7 +1404,7 @@ void InsetText::toggleInsetCursor(BufferView * bv)
 void InsetText::showInsetCursor(BufferView * bv, bool show)
 {
        if (the_locking_inset) {
-               the_locking_inset->showInsetCursor(bv);
+               the_locking_inset->showInsetCursor(bv, show);
                return;
        }
        if (!isCursorVisible()) {
@@ -1337,6 +1433,22 @@ void InsetText::hideInsetCursor(BufferView * bv)
 }
 
 
+void InsetText::fitInsetCursor(BufferView * bv) const
+{
+       if (the_locking_inset) {
+               the_locking_inset->fitInsetCursor(bv);
+               return;
+       }
+       LyXFont const font =
+               getLyXText(bv)->getFont(bv->buffer(), cpar(bv), cpos(bv));
+       
+       int const asc = lyxfont::maxAscent(font);
+       int const desc = lyxfont::maxDescent(font);
+
+       bv->fitLockedInsetCursor(cx(bv), cy(bv), asc, desc);
+}
+
+
 UpdatableInset::RESULT
 InsetText::moveRight(BufferView * bv, bool activate_inset, bool selecting)
 {
@@ -1410,7 +1522,7 @@ InsetText::moveDown(BufferView * bv)
 bool InsetText::insertInset(BufferView * bv, Inset * inset)
 {
        if (the_locking_inset) {
-               if (the_locking_inset->insertInsetAllowed(inset))
+               if (the_locking_inset->insetAllowed(inset))
                        return the_locking_inset->insertInset(bv, inset);
                return false;
        }
@@ -1423,10 +1535,12 @@ bool InsetText::insertInset(BufferView * bv, Inset * inset)
                clear = true;
        }
        lt->insertInset(bv, inset);
+#if 0
        if ((cpar(bv)->getChar(cpos(bv)) != Paragraph::META_INSET) ||
                (cpar(bv)->getInset(cpos(bv)) != inset))
                lt->cursorLeft(bv);
-       bv->fitCursor(lt);
+#endif
+       bv->fitCursor();
        updateLocal(bv, CURSOR_PAR|CURSOR, true);
        showInsetCursor(bv);
        if (clear)
@@ -1435,17 +1549,10 @@ bool InsetText::insertInset(BufferView * bv, Inset * inset)
 }
 
 
-bool InsetText::insertInsetAllowed(Inset * in) const
+bool InsetText::insetAllowed(Inset::Code code) const
 {
        if (the_locking_inset)
-               return the_locking_inset->insertInsetAllowed(in);
-       return true;
-}
-
-bool InsetText::insertInsetAllowed(Inset::Code code) const
-{
-       if (the_locking_inset)
-               return the_locking_inset->insertInsetAllowed(code);
+               return the_locking_inset->insetAllowed(code);
        return true;
 }
 
@@ -1500,6 +1607,10 @@ void InsetText::setFont(BufferView * bv, LyXFont const & font, bool toggleall,
                the_locking_inset->setFont(bv, font, toggleall, selectall);
                return;
        }
+       if ((!par->next() && !par->size()) || !cpar(bv)->size()) {
+               getLyXText(bv)->setFont(bv, font, toggleall);
+               return;
+       }
        bool clear = false;
        if (!lt) {
                lt = getLyXText(bv);
@@ -1510,14 +1621,10 @@ void InsetText::setFont(BufferView * bv, LyXFont const & font, bool toggleall,
        }
        if (selectall)
                selectAll(bv);
-#if 1
        lt->toggleFree(bv, font, toggleall);
-#else
-       lt->setFont(bv, font, toggleall);
-#endif
        if (selectall)
-               lt->clearSelection(bv);
-       bv->fitCursor(lt);
+               lt->clearSelection();
+       bv->fitCursor();
        if (selectall || lt->selection.set())
                updateLocal(bv, FULL, true);
        else
@@ -1594,17 +1701,11 @@ int InsetText::getMaxWidth(BufferView * bv, UpdatableInset const * inset) const
        }
        w -= (2 * TEXT_TO_INSET_OFFSET);
        return w - top_x;
-//    return  w - (2*TEXT_TO_INSET_OFFSET);
 }
 
 
 void InsetText::setParagraphData(Paragraph * p)
 {
-       cached_bview = 0;
-
-       // now also delete all caches this should be safe, hopefully
-       cache.clear();
-
        while (par) {
                Paragraph * tmp = par->next();
                delete par;
@@ -1621,8 +1722,7 @@ void InsetText::setParagraphData(Paragraph * p)
                np = np->next();
                np->setInsetOwner(this);
        }
-
-       need_update = INIT;
+       reinitLyXText();
 }
 
 
@@ -1642,6 +1742,7 @@ void InsetText::setAutoBreakRows(bool flag)
                need_update = FULL;
                if (!flag)
                        removeNewlines();
+               reinitLyXText();
        }
 }
 
@@ -1729,25 +1830,24 @@ LyXText * InsetText::getLyXText(BufferView const * lbv,
        
        cached_bview = bv;
        Cache::iterator it = cache.find(bv);
-       
-       if (it != cache.end() && (lt || !it->second.remove)) {
-               lyx::Assert(it->second.text.get());
-                       
-               cached_text = it->second.text;
-               if (recursive && the_locking_inset) {
-                       return the_locking_inset->getLyXText(bv);
-               }
-               return cached_text.get();
-       } else if (it->second.remove) {
-               if (locked) {
-                       saveLyXTextState(it->second.text.get());
-               } else {
-                       sstate.lpar = 0;
+
+       if (it != cache.end()) {
+               if (lt || !it->second.remove) {
+                       lyx::Assert(it->second.text.get());
+                       cached_text = it->second.text;
+                       if (recursive && the_locking_inset) {
+                               return the_locking_inset->getLyXText(bv, true);
+                       }
+                       return cached_text.get();
+               } else if (it->second.remove) {
+                       if (locked) {
+                               saveLyXTextState(it->second.text.get());
+                       } else {
+                               sstate.lpar = 0;
+                       }
                }
-               cache.erase(bv);
-//             raise(SIGSTOP);
        }
-
+       
        cached_text.reset(new LyXText(const_cast<InsetText *>(this)));
        cached_text->init(bv);
        restoreLyXTextState(bv, cached_text.get());
@@ -1798,24 +1898,58 @@ void InsetText::resizeLyXText(BufferView * bv, bool force) const
        }
        lyx::Assert(it->second.text.get());
 
-       deleteLyXText(bv, (the_locking_inset == 0) || force);
+       LyXText * t = it->second.text.get();
+       saveLyXTextState(t);
+       for (Paragraph * p = par; p; p = p->next()) {
+               p->resizeInsetsLyXText(bv);
+       }
+       t->init(bv, true);
+       restoreLyXTextState(bv, t);
+       if (the_locking_inset) {
+               inset_x = cx(bv) - top_x + drawTextXOffset;
+               inset_y = cy(bv) + drawTextYOffset;
+       }
 
        if (bv->screen()) {
-                       LyXText * t = getLyXText(bv);
                        t->first = bv->screen()->topCursorVisible(t);
        }
-       
+       if (!owner())
+               updateLocal(bv, FULL, false);
+       else
+               need_update |= FULL;
        // this will scroll the screen such that the cursor becomes visible 
        bv->updateScrollbar();
-       if (the_locking_inset) {
-               /// then resize all LyXText in text-insets
-               inset_x = cx(bv) - top_x + drawTextXOffset;
-               inset_y = cy(bv) + drawTextYOffset;
+}
+
+
+void InsetText::reinitLyXText() const
+{
+       for(Cache::iterator it = cache.begin(); it != cache.end(); ++it) {
+               lyx::Assert(it->second.text.get());
+
+               LyXText * t = it->second.text.get();
+               BufferView * bv = it->first;
+
+               saveLyXTextState(t);
                for (Paragraph * p = par; p; p = p->next()) {
                        p->resizeInsetsLyXText(bv);
                }
+               t->init(bv, true);
+               restoreLyXTextState(bv, t);
+               if (the_locking_inset) {
+                       inset_x = cx(bv) - top_x + drawTextXOffset;
+                       inset_y = cy(bv) + drawTextYOffset;
+               }
+               if (bv->screen()) {
+                       t->first = bv->screen()->topCursorVisible(t);
+               }
+               if (!owner())
+                       updateLocal(bv, FULL, false);
+               else
+                       need_update = FULL;
+               // this will scroll the screen such that the cursor becomes visible 
+               bv->updateScrollbar();
        }
-       need_update = FULL;
 }
 
 
@@ -1866,13 +2000,13 @@ void InsetText::selectAll(BufferView * bv)
 
 void InsetText::clearSelection(BufferView * bv)
 {
-       getLyXText(bv)->clearSelection(bv);
+       getLyXText(bv)->clearSelection();
 }
 
 
 void InsetText::clearInset(Painter & pain, int baseline, bool & cleared) const
 {
-       int w =  insetWidth;
+       int w = insetWidth;
        int h = insetAscent + insetDescent;
        int ty = baseline - insetAscent;
        
@@ -1884,14 +2018,17 @@ void InsetText::clearInset(Painter & pain, int baseline, bool & cleared) const
                h = pain.paperHeight();
        if ((top_x + drawTextXOffset + w) > pain.paperWidth())
                w = pain.paperWidth();
-       pain.fillRectangle(top_x+drawTextXOffset, ty, w, h);
+//     w -= TEXT_TO_INSET_OFFSET;
+       pain.fillRectangle(top_x, ty, w+1, h+1, backgroundColor());
        cleared = true;
        need_update = FULL;
+       frame_is_visible = false;
 }
 
 
 Paragraph * InsetText::getParFromID(int id) const
 {
+#if 0
        Paragraph * result = par;
        Paragraph * ires = 0;
        while (result && result->id() != id) {
@@ -1900,6 +2037,22 @@ Paragraph * InsetText::getParFromID(int id) const
                result = result->next();
        }
        return result;
+#else
+       Paragraph * tmp = par;
+       while (tmp) {
+               int tmp_id = tmp->id();
+               lyxerr << "Looking at paragraph: " << tmp_id << endl;
+               if (tmp->id() == id) {
+                       return tmp;
+               }
+               Paragraph * tmp2 = tmp->getParFromID(id);
+               if (tmp2 != 0) {
+                       return tmp2;
+               }
+               tmp = tmp->next();
+       }
+       return 0;
+#endif
 }
 
 
@@ -1966,7 +2119,7 @@ Inset * InsetText::getInsetFromID(int id_arg) const
 }
 
 
-string InsetText::selectNextWord(BufferView * bv, float & value) const
+string const InsetText::selectNextWord(BufferView * bv, float & value) const
 {
        bool clear = false;
        string str;
@@ -2033,7 +2186,60 @@ void InsetText::toggleSelection(BufferView * bv, bool kill_selection)
        if (y_offset < 0)
                y_offset = y;
        
+       if (need_update & SELECTION)
+               need_update = NONE;
        bv->screen()->toggleSelection(lt, bv, kill_selection, y_offset, x);
        if (clear)
                lt = 0;
 }
+
+
+bool InsetText::searchForward(BufferView * bv, string const & str,
+                              bool const & cs, bool const & mw)
+{
+       if (the_locking_inset) {
+               if (the_locking_inset->searchForward(bv, str, cs, mw))
+                       return true;
+               bool clear = false;
+               if (!lt) {
+                       lt = getLyXText(bv);
+                       clear = true;
+               }
+               Paragraph * lpar = lt->cursor.par();
+               Paragraph::size_type pos = lt->cursor.pos();
+               if (pos < lpar->size() - 1)
+                       ++pos;
+               else {
+                       pos = 0;
+                       lpar = lpar->next();
+               }
+               if (!lpar) {
+                       if (clear)
+                               lt = 0;
+                       return false;
+               }
+               lt->setCursor(bv, lpar, pos);
+               if (clear)
+                       lt = 0;
+       }
+       if (LyXFind(bv, str, true, true, cs , mw)) {
+               return true;
+       }
+       // we have to unlock ourself in this function by default!
+       bv->unlockInset(const_cast<InsetText *>(this));
+       return false;
+}
+
+bool InsetText::searchBackward(BufferView * bv, string const & str,
+                               bool const & cs, bool const & mw)
+{
+       if (the_locking_inset)
+               if (the_locking_inset->searchBackward(bv, str, cs, mw))
+                       return true;
+       if (LyXFind(bv, str, false, true, cs, mw)) {
+               return true;
+       }
+       // we have to unlock ourself in this function by default!
+       bv->unlockInset(const_cast<InsetText *>(this));
+       return false;
+}