Partially revert r34995, which broke math output. Not sure why yet....

[lyx.git] / src / BufferView.cpp

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 74152382887da3693edc317eaa5aea7515e5ffdb..076bff7af85021370adc4487d92167dd71ae189e 100644 (file)
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -221,7 +221,7 @@ struct BufferView::Private
                anchor_pit_(0), anchor_ypos_(0),
                inlineCompletionUniqueChars_(0),
                last_inset_(0), mouse_position_cache_(),
-               bookmark_edit_position_(0), gui_(0)
+               bookmark_edit_position_(-1), gui_(0)
        {}
 
        ///
@@ -413,6 +413,8 @@ void BufferView::processUpdateFlags(Update::flags flags)
                << ", singlepar = " << (flags & Update::SinglePar)
                << "]  buffer: " << &buffer_);
 
+       // FIXME Does this really need doing here? It's done in updateBuffer, and
+       // if the Buffer doesn't need updating, then do the macros?
        buffer_.updateMacros();
 
        // Now do the first drawing step if needed. This consists on updating
@@ -568,7 +570,7 @@ docstring BufferView::contextMenu(int x, int y) const
 }
 
 
-void BufferView::scrollDocView(int value)
+void BufferView::scrollDocView(int value, bool update)
 {
        int const offset = value - d->scrollbarParameters_.position;
 
@@ -587,7 +589,7 @@ void BufferView::scrollDocView(int value)
        // cut off at the top
        if (value <= d->scrollbarParameters_.min) {
                DocIterator dit = doc_iterator_begin(&buffer_);
-               showCursor(dit, false);
+               showCursor(dit, false, update);
                LYXERR(Debug::SCROLLING, "scroll to top");
                return;
        }
@@ -596,7 +598,7 @@ void BufferView::scrollDocView(int value)
        if (value >= d->scrollbarParameters_.max) {
                DocIterator dit = doc_iterator_end(&buffer_);
                dit.backwardPos();
-               showCursor(dit, false);
+               showCursor(dit, false, update);
                LYXERR(Debug::SCROLLING, "scroll to bottom");
                return;
        }
@@ -614,14 +616,14 @@ void BufferView::scrollDocView(int value)
                // It seems we didn't find the correct pit so stay on the safe side and
                // scroll to bottom.
                LYXERR0("scrolling position not found!");
-               scrollDocView(d->scrollbarParameters_.max);
+               scrollDocView(d->scrollbarParameters_.max, update);
                return;
        }
 
        DocIterator dit = doc_iterator_begin(&buffer_);
        dit.pit() = i;
        LYXERR(Debug::SCROLLING, "value = " << value << " -> scroll to pit " << i);
-       showCursor(dit, false);
+       showCursor(dit, false, update);
 }
 
 
@@ -806,19 +808,20 @@ int BufferView::workWidth() const
 
 void BufferView::recenter()
 {
-       showCursor(d->cursor_, true);
+       showCursor(d->cursor_, true, true);
 }
 
 
 void BufferView::showCursor()
 {
-       showCursor(d->cursor_, false);
+       showCursor(d->cursor_, false, true);
 }
 
 
-void BufferView::showCursor(DocIterator const & dit, bool recenter)
+void BufferView::showCursor(DocIterator const & dit,
+       bool recenter, bool update)
 {
-       if (scrollToCursor(dit, recenter)) {
+       if (scrollToCursor(dit, recenter) && update) {
                buffer_.changed(true);
                updateHoveredInset();
        }
@@ -934,7 +937,6 @@ void BufferView::updateDocumentClass(DocumentClass const * const olddc)
        setCursor(backcur.asDocIterator(&buffer_));
 
        buffer_.errors("Class Switch");
-       buffer_.updateBuffer();
 }
 
 /** Return the change status at cursor position, taking in account the
@@ -1202,6 +1204,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                // It is then better to make sure that all dialogs are in sync with
                // current document settings.
                dr.update(Update::Force | Update::FitCursor);
+               dr.forceBufferUpdate();
                break;
        }
                
@@ -1213,6 +1216,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                buffer_.params().makeDocumentClass();
                updateDocumentClass(oldClass);
                dr.update(Update::Force | Update::FitCursor);
+               dr.forceBufferUpdate();
                break;
        }
 
@@ -1230,6 +1234,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                buffer_.params().makeDocumentClass();
                updateDocumentClass(oldClass);
                dr.update(Update::Force | Update::FitCursor);
+               dr.forceBufferUpdate();
                break;
        }
 
@@ -1253,6 +1258,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                buffer_.params().makeDocumentClass();
                updateDocumentClass(oldDocClass);
                dr.update(Update::Force | Update::FitCursor);
+               dr.forceBufferUpdate();
                break;
        }
 
@@ -1269,6 +1275,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                buffer_.params().makeDocumentClass();
                updateDocumentClass(oldClass);
                dr.update(Update::Force | Update::FitCursor);
+               dr.forceBufferUpdate();
                break;
        }
 
@@ -1279,6 +1286,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                        dr.setMessage(_("No further undo information"));
                else
                        dr.update(Update::Force | Update::FitCursor);
+               dr.forceBufferUpdate();
                break;
 
        case LFUN_REDO:
@@ -1288,6 +1296,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                        dr.setMessage(_("No further redo information"));
                else
                        dr.update(Update::Force | Update::FitCursor);
+               dr.forceBufferUpdate();
                break;
 
        case LFUN_FONT_STATE:
@@ -1401,6 +1410,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
        case LFUN_CHANGES_MERGE:
                if (findNextChange(this) || findPreviousChange(this)) {
                        dr.update(Update::Force | Update::FitCursor);
+                       dr.forceBufferUpdate();
                        showDialog("changes");
                }
                break;
@@ -1414,6 +1424,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                buffer_.text().acceptOrRejectChanges(cur, Text::ACCEPT);
                // FIXME: Move this LFUN to Buffer so that we don't have to do this:
                dr.update(Update::Force | Update::FitCursor);
+               dr.forceBufferUpdate();
                break;
 
        case LFUN_ALL_CHANGES_REJECT:
@@ -1426,6 +1437,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                buffer_.text().acceptOrRejectChanges(cur, Text::REJECT);
                // FIXME: Move this LFUN to Buffer so that we don't have to do this:
                dr.update(Update::Force | Update::FitCursor);
+               dr.forceBufferUpdate();
                break;
 
        case LFUN_WORD_FIND_FORWARD:
@@ -1480,6 +1492,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                        }
                }
                replace(this, cmd, has_deleted);
+               dr.forceBufferUpdate();
                break;
        }
 
@@ -1624,13 +1637,16 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                //FIXME: what to do with cur.x_target()?
                bool update = in_texted && cur.bv().checkDepm(cur, old);
                cur.finishUndo();
-               if (update)
+               if (update) {
                        dr.update(Update::Force | Update::FitCursor);
+                       dr.forceBufferUpdate();
+               }
                break;
        }
 
        case LFUN_SCROLL:
                lfunScroll(cmd);
+               dr.forceBufferUpdate();
                break;
 
        case LFUN_SCREEN_UP_SELECT: {
@@ -1707,6 +1723,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                cur = savecur;
                cur.fixIfBroken();
                dr.update(Update::Force);
+               dr.forceBufferUpdate();
 
                if (iterations >= max_iter) {
                        dr.setError(true);
@@ -1809,6 +1826,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                FuncRequest fr(LFUN_INSET_MODIFY, cmd.argument());
                inset->dispatch(cur, fr);
                dr.update(Update::SinglePar | Update::FitCursor);
+               dr.forceBufferUpdate();
                break;
        }
 
@@ -2226,7 +2244,7 @@ bool BufferView::checkDepm(Cursor & cur, Cursor & old)
 
        d->cursor_ = cur;
 
-       buffer_.updateBuffer();
+       cur.forceBufferUpdate();
        buffer_.changed(true);
        return true;
 }
@@ -2270,6 +2288,8 @@ bool BufferView::mouseSetCursor(Cursor & cur, bool select)
 
        d->cursor_.finishUndo();
        d->cursor_.setCurrentFont();
+       if (update)
+               cur.forceBufferUpdate();
        return update;
 }
 
@@ -2831,9 +2851,9 @@ void BufferView::setInlineCompletion(Cursor & cur, DocIterator const & pos,
        // set update flags
        if (changed) {
                if (singlePar && !(cur.result().update() & Update::Force))
-                       cur.updateFlags(cur.result().update() | Update::SinglePar);
+                       cur.screenUpdateFlags(cur.result().update() | Update::SinglePar);
                else
-                       cur.updateFlags(cur.result().update() | Update::Force);
+                       cur.screenUpdateFlags(cur.result().update() | Update::Force);
        }
 }