]> git.lyx.org Git - lyx.git/blobdiff - src/BufferView_pimpl.C
fix some C++ parsing bugs
[lyx.git] / src / BufferView_pimpl.C
index c9489f0395454eb3f442329b66cfbee617c425e9..70c4e9e948639877b351a3491e3c5fb39eaa2a65 100644 (file)
@@ -11,7 +11,7 @@
 #include "BufferView_pimpl.h"
 #include "bufferlist.h"
 #include "bufferview_funcs.h"
-#include "commandtags.h"
+#include "lfuns.h"
 #include "debug.h"
 #include "factory.h"
 #include "FloatList.h"
@@ -111,7 +111,7 @@ BufferView::Pimpl::Pimpl(BufferView * bv, LyXView * owner,
        resizecon = workarea().workAreaResize
                .connect(boost::bind(&BufferView::Pimpl::workAreaResize, this));
        dispatchcon = workarea().dispatch
-               .connect(boost::bind(&BufferView::Pimpl::dispatch, this, _1));
+               .connect(boost::bind(&BufferView::Pimpl::workAreaDispatch, this, _1));
        kpresscon = workarea().workAreaKeyPress
                .connect(boost::bind(&BufferView::Pimpl::workAreaKeyPress, this, _1, _2));
        selectioncon = workarea().selectionRequested
@@ -308,13 +308,13 @@ int BufferView::Pimpl::resizeCurrentBuffer()
                // Mechanism when setting the cursor.
                bv_->text->selection.mark(mark_set);
                if (selection) {
-                       bv_->text->setCursor(bv_, selstartpar, selstartpos);
+                       bv_->text->setCursor(selstartpar, selstartpos);
                        bv_->text->selection.cursor = bv_->text->cursor;
-                       bv_->text->setCursor(bv_, selendpar, selendpos);
-                       bv_->text->setSelection(bv_);
-                       bv_->text->setCursor(bv_, par, pos);
+                       bv_->text->setCursor(selendpar, selendpos);
+                       bv_->text->setSelection();
+                       bv_->text->setCursor(par, pos);
                } else {
-                       bv_->text->setCursor(bv_, par, pos);
+                       bv_->text->setCursor(par, pos);
                        bv_->text->selection.cursor = bv_->text->cursor;
                        bv_->text->selection.set(false);
                }
@@ -376,9 +376,11 @@ void BufferView::Pimpl::scrollDocView(int value)
        int const last = static_cast<int>((bv_->text->top_y() + workarea().workHeight() - height));
 
        if (vbt->cursor.y() < first)
-               vbt->setCursorFromCoordinates(bv_, 0, first);
+               vbt->setCursorFromCoordinates(0, first);
        else if (vbt->cursor.y() > last)
-               vbt->setCursorFromCoordinates(bv_, 0, last);
+               vbt->setCursorFromCoordinates(0, last);
+
+       owner_->updateLayoutChoice();
 }
 
 
@@ -501,94 +503,43 @@ void BufferView::Pimpl::update()
 {
        if (!bv_->theLockingInset() || !bv_->theLockingInset()->nodraw()) {
                screen().update(*bv_);
-               bool fitc = false;
-               while (bv_->text->status() == LyXText::CHANGED_IN_DRAW) {
-                       bv_->text->fullRebreak(bv_);
-                       bv_->text->setCursor(bv_, bv_->text->cursor.par(),
-                                            bv_->text->cursor.pos());
-                       if (bv_->text->selection.set()) {
-                               bv_->text->setCursor(bv_, bv_->text->selection.start,
-                                                    bv_->text->selection.start.par(),
-                                                    bv_->text->selection.start.pos());
-                               bv_->text->setCursor(bv_, bv_->text->selection.end,
-                                                    bv_->text->selection.end.par(),
-                                                    bv_->text->selection.end.pos());
-                       }
-                       fitc = true;
-                       bv_->text->postPaint(*bv_, 0);
-                       screen().update(*bv_);
-               }
-
-               // do this here instead of in the screen::update because of
-               // the above loop!
                bv_->text->clearPaint();
-
-               if (fitc)
-                       fitCursor();
        }
 }
 
-// Values used when calling update:
-// -3 - update
-// -2 - update, move sel_cursor if selection, fitcursor
-// -1 - update, move sel_cursor if selection, fitcursor, mark dirty
-//  0 - update, move sel_cursor if selection, fitcursor
-//  1 - update, move sel_cursor if selection, fitcursor, mark dirty
-//  3 - update, move sel_cursor if selection
-//
-// update -
-// a simple redraw of the parts that need refresh
-//
-// move sel_cursor if selection -
-// the text's sel_cursor is moved if there is selection is progress
-//
-// fitcursor -
-// fitCursor() is called and the scrollbar updated
-//
-// mark dirty -
-// the buffer is marked dirty.
-//
-// enum {
-//       UPDATE = 0,
-//       SELECT = 1,
-//       FITCUR = 2,
-//       CHANGE = 4
-// };
-//
-// UPDATE_ONLY = UPDATE;
-// UPDATE_SELECT = UPDATE | SELECT;
-// UPDATE_SELECT_MOVE = UPDATE | SELECT | FITCUR;
-// UPDATE_SELECT_MOVE_AFTER_CHANGE = UPDATE | SELECT | FITCUR | CHANGE;
-//
-// update(-3) -> update(0)         -> update(0) -> update(UPDATE)
-// update(-2) -> update(1 + 2)     -> update(3) -> update(SELECT|FITCUR)
-// update(-1) -> update(1 + 2 + 4) -> update(7) -> update(SELECT|FITCUR|CHANGE)
-// update(1)  -> update(1 + 2 + 4) -> update(7) -> update(SELECT|FITCUR|CHANGE)
-// update(3)  -> update(1)         -> update(1) -> update(SELECT)
 
 void BufferView::Pimpl::update(LyXText * text, BufferView::UpdateCodes f)
 {
-       owner_->updateLayoutChoice();
-
        if (!text->selection.set() && (f & SELECT)) {
                text->selection.cursor = text->cursor;
        }
 
-       text->fullRebreak(bv_);
+       text->fullRebreak();
 
        if (text->inset_owner) {
                text->inset_owner->setUpdateStatus(bv_, InsetText::NONE);
-               updateInset(text->inset_owner, false);
+               updateInset(text->inset_owner);
        } else {
                update();
        }
+}
+
 
-       if ((f & FITCUR)) {
-               fitCursor();
+void BufferView::Pimpl::update(BufferView::UpdateCodes f)
+{
+       LyXText * text = bv_->text;
+
+       if (!text->selection.set() && (f & SELECT)) {
+               text->selection.cursor = text->cursor;
        }
 
-       if ((f & CHANGE)) {
-               buffer_->markDirty();
+       text->fullRebreak();
+
+       if (text->inset_owner) {
+               text->inset_owner->setUpdateStatus(bv_, InsetText::NONE);
+               updateInset(text->inset_owner);
+       } else {
+               update();
        }
 }
 
@@ -680,10 +631,10 @@ void BufferView::Pimpl::restorePosition(unsigned int i)
        if (!par)
                return;
 
-       bv_->text->setCursor(bv_, par,
+       bv_->text->setCursor(par,
                             min(par->size(), saved_positions[i].par_pos));
 
-       update(bv_->text, BufferView::SELECT | BufferView::FITCUR);
+       update(BufferView::SELECT);
        if (i > 0) {
                ostringstream str;
 #if USE_BOOST_FORMAT
@@ -776,6 +727,8 @@ void BufferView::Pimpl::center()
                new_y = t->cursor.y() - half_height;
        }
 
+       // FIXME: look at this comment again ...
+
        // FIXME: can we do this w/o calling screen directly ?
        // This updates top_y() but means the fitCursor() call
        // from the update(FITCUR) doesn't realise that we might
@@ -787,7 +740,7 @@ void BufferView::Pimpl::center()
        // pretty obfuscated way of updating t->top_y()
        screen().draw(t, bv_, new_y);
 
-       update(t, BufferView::SELECT | BufferView::FITCUR);
+       update(BufferView::SELECT);
 }
 
 
@@ -939,8 +892,8 @@ void BufferView::Pimpl::trackChanges()
                // we cannot allow undos beyond the freeze point
                buf->undostack.clear();
        } else {
-               bv_->update(bv_->text, BufferView::SELECT | BufferView::FITCUR);
-               bv_->text->setCursor(bv_, &(*buf->paragraphs.begin()), 0);
+               update(BufferView::SELECT);
+               bv_->text->setCursor(&(*buf->paragraphs.begin()), 0);
 #warning changes FIXME
                //moveCursorUpdate(false);
 
@@ -961,6 +914,23 @@ void BufferView::Pimpl::trackChanges()
 }
 
 
+// Doesn't go through lyxfunc, so we need to update the
+// layout choice etc. ourselves
+bool BufferView::Pimpl::workAreaDispatch(FuncRequest const & ev_in)
+{
+       // e.g. Qt mouse press when no buffer
+       if (!available())
+               return false;
+
+       bool const res = dispatch(ev_in);
+
+       bv_->owner()->updateLayoutChoice();
+       bv_->fitCursor();
+
+       return res;
+}
+
+
 bool BufferView::Pimpl::dispatch(FuncRequest const & ev_in)
 {
        // Make sure that the cached BufferView is correct.
@@ -975,10 +945,6 @@ bool BufferView::Pimpl::dispatch(FuncRequest const & ev_in)
                << " button[" << ev.button() << ']'
                << endl;
 
-       // e.g. Qt mouse press when no buffer
-       if (!buffer_)
-               return false;
-
        LyXTextClass const & tclass = buffer_->params.getLyXTextClass();
 
        switch (ev.action) {
@@ -1131,10 +1097,7 @@ bool BufferView::Pimpl::dispatch(FuncRequest const & ev_in)
                        owner_->getLyXFunc().handleKeyFunc(ev.action);
                        owner_->getIntl().getTransManager()
                                .TranslateAndInsert(ev.argument[0], bv_->getLyXText());
-                       update(bv_->getLyXText(),
-                              BufferView::SELECT
-                              | BufferView::FITCUR
-                              | BufferView::CHANGE);
+                       update(bv_->getLyXText(), BufferView::SELECT);
                }
                break;
 
@@ -1152,33 +1115,40 @@ bool BufferView::Pimpl::dispatch(FuncRequest const & ev_in)
        case LFUN_INSET_APPLY: {
                string const name = ev.getArg(0);
 
-               InsetBase * base = owner_->getDialogs().getOpenInset(name);
-               if (base) {
+               InsetBase * inset = owner_->getDialogs().getOpenInset(name);
+               if (inset) {
                        // This works both for 'original' and 'mathed' insets.
                        // Note that the localDispatch performs updateInset
                        // also.
                        FuncRequest fr(bv_, LFUN_INSET_MODIFY, ev.argument);
-                       base->localDispatch(fr);
+                       inset->localDispatch(fr);
                } else {
-                       Inset * inset = createInset(ev);
-                       if (inset && insertInset(inset)) {
-                               updateInset(inset, true);
-                       } else {
-                               delete inset;
-                       }
+                       FuncRequest fr(bv_, LFUN_INSET_INSERT, ev.argument);
+                       dispatch(fr);
                }
+       }
+       break;
+
+       case LFUN_INSET_INSERT: {
+               Inset * inset = createInset(ev);
+               if (inset && insertInset(inset)) {
+                       updateInset(inset);
 
-               if (name == "bibitem") {
-                       // We need to do a redraw because the maximum
-                       // InsetBibitem width could have changed
+                       string const name = ev.getArg(0);
+                       if (name == "bibitem") {
+                               // We need to do a redraw because the maximum
+                               // InsetBibitem width could have changed
 #warning please check you mean repaint() not update(),
 #warning and whether the repaint() is needed at all
-                       bv_->repaint();
-                       bv_->fitCursor();
+                               bv_->repaint();
+                               bv_->fitCursor();
+                       }
+               } else {
+                       delete inset;
                }
        }
        break;
-
+       
        case LFUN_FLOAT_LIST:
                if (tclass.floats().typeExist(ev.argument)) {
                        Inset * inset = new InsetFloatList(ev.argument);
@@ -1224,7 +1194,7 @@ bool BufferView::Pimpl::dispatch(FuncRequest const & ev_in)
        case LFUN_PARAGRAPH_APPLY:
                setParagraphParams(*bv_, ev.argument);
                break;
-               
+
        case LFUN_THESAURUS_ENTRY:
        {
                string arg = ev.argument;
@@ -1236,13 +1206,13 @@ bool BufferView::Pimpl::dispatch(FuncRequest const & ev_in)
                        // FIXME
                        if (arg.size() > 100 || arg.empty()) {
                                // Get word or selection
-                               bv_->getLyXText()->selectWordWhenUnderCursor(bv_, LyXText::WHOLE_WORD);
+                               bv_->getLyXText()->selectWordWhenUnderCursor(LyXText::WHOLE_WORD);
                                arg = bv_->getLyXText()->selectionAsString(buffer_, false);
                                // FIXME: where is getLyXText()->unselect(bv_) ?
                        }
                }
 
-               bv_->owner()->getDialogs().showThesaurus(arg);
+               bv_->owner()->getDialogs().show("thesaurus", arg);
        }
                break;
 
@@ -1255,44 +1225,40 @@ bool BufferView::Pimpl::dispatch(FuncRequest const & ev_in)
                break;
 
        case LFUN_ACCEPT_ALL_CHANGES: {
-               bv_->update(bv_->text, BufferView::SELECT | BufferView::FITCUR);
-               bv_->text->setCursor(bv_, &(*bv_->buffer()->paragraphs.begin()), 0);
+               update(BufferView::SELECT);
+               bv_->text->setCursor(&(*bv_->buffer()->paragraphs.begin()), 0);
 #warning FIXME changes
                //moveCursorUpdate(false);
 
                while (lyxfind::findNextChange(bv_)) {
-                       bv_->getLyXText()->acceptChange(bv_);
+                       bv_->getLyXText()->acceptChange();
                }
-               update(bv_->text,
-                       BufferView::SELECT | BufferView::FITCUR | BufferView::CHANGE);
+               update(BufferView::SELECT);
                break;
        }
 
        case LFUN_REJECT_ALL_CHANGES: {
-               bv_->update(bv_->text, BufferView::SELECT | BufferView::FITCUR);
-               bv_->text->setCursor(bv_, &(*bv_->buffer()->paragraphs.begin()), 0);
+               update(BufferView::SELECT);
+               bv_->text->setCursor(&(*bv_->buffer()->paragraphs.begin()), 0);
 #warning FIXME changes
                //moveCursorUpdate(false);
 
                while (lyxfind::findNextChange(bv_)) {
-                       bv_->getLyXText()->rejectChange(bv_);
+                       bv_->getLyXText()->rejectChange();
                }
-               update(bv_->text,
-                       BufferView::SELECT | BufferView::FITCUR | BufferView::CHANGE);
+               update(BufferView::SELECT);
                break;
        }
 
        case LFUN_ACCEPT_CHANGE: {
-               bv_->getLyXText()->acceptChange(bv_);
-               update(bv_->text,
-                       BufferView::SELECT | BufferView::FITCUR | BufferView::CHANGE);
+               bv_->getLyXText()->acceptChange();
+               update(BufferView::SELECT);
                break;
        }
 
        case LFUN_REJECT_CHANGE: {
-               bv_->getLyXText()->rejectChange(bv_);
-               update(bv_->text,
-                       BufferView::SELECT | BufferView::FITCUR | BufferView::CHANGE);
+               bv_->getLyXText()->rejectChange();
+               update(BufferView::SELECT);
                break;
        }
 
@@ -1324,15 +1290,15 @@ bool BufferView::Pimpl::insertInset(Inset * inset, string const & lout)
 
        beforeChange(bv_->text);
        if (!lout.empty()) {
-               update(bv_->text, BufferView::SELECT|BufferView::FITCUR);
-               bv_->text->breakParagraph(bv_, bv_->buffer()->paragraphs);
-               update(bv_->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+               update(BufferView::SELECT);
+               bv_->text->breakParagraph(bv_->buffer()->paragraphs);
+               update(BufferView::SELECT);
 
                if (!bv_->text->cursor.par()->empty()) {
                        bv_->text->cursorLeft(bv_);
 
-                       bv_->text->breakParagraph(bv_, bv_->buffer()->paragraphs);
-                       update(bv_->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+                       bv_->text->breakParagraph(bv_->buffer()->paragraphs);
+                       update(BufferView::SELECT);
                }
 
                string lres = lout;
@@ -1349,27 +1315,27 @@ bool BufferView::Pimpl::insertInset(Inset * inset, string const & lout)
                        lay = tclass.defaultLayoutName();
                }
 
-               bv_->text->setLayout(bv_, lay);
+               bv_->text->setLayout(lay);
 
-               bv_->text->setParagraph(bv_, 0, 0,
+               bv_->text->setParagraph(0, 0,
                                   0, 0,
                                   VSpace(VSpace::NONE), VSpace(VSpace::NONE),
                                   Spacing(),
                                   LYX_ALIGN_LAYOUT,
                                   string(),
                                   0);
-               update(bv_->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+               update(BufferView::SELECT);
        }
 
-       bv_->text->insertInset(bv_, inset);
-       update(bv_->text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+       bv_->text->insertInset(inset);
+       update(BufferView::SELECT);
 
        unFreezeUndo();
        return true;
 }
 
 
-void BufferView::Pimpl::updateInset(Inset * inset, bool mark_dirty)
+void BufferView::Pimpl::updateInset(Inset * inset)
 {
        if (!inset || !available())
                return;
@@ -1377,20 +1343,14 @@ void BufferView::Pimpl::updateInset(Inset * inset, bool mark_dirty)
        // first check for locking insets
        if (bv_->theLockingInset()) {
                if (bv_->theLockingInset() == inset) {
-                       if (bv_->text->updateInset(bv_, inset)) {
+                       if (bv_->text->updateInset(inset)) {
                                update();
-                               if (mark_dirty) {
-                                       buffer_->markDirty();
-                               }
                                updateScrollbar();
                                return;
                        }
                } else if (bv_->theLockingInset()->updateInsetInInset(bv_, inset)) {
-                       if (bv_->text->updateInset(bv_,  bv_->theLockingInset())) {
+                       if (bv_->text->updateInset(bv_->theLockingInset())) {
                                update();
-                               if (mark_dirty) {
-                                       buffer_->markDirty();
-                               }
                                updateScrollbar();
                                return;
                        }
@@ -1405,22 +1365,15 @@ void BufferView::Pimpl::updateInset(Inset * inset, bool mark_dirty)
                tl_inset = tl_inset->owner();
        hideCursor();
        if (tl_inset == inset) {
-               update(bv_->text, BufferView::UPDATE);
-               if (bv_->text->updateInset(bv_, inset)) {
-                       if (mark_dirty) {
-                               update(bv_->text,
-                                      BufferView::SELECT
-                                      | BufferView::FITCUR
-                                      | BufferView::CHANGE);
-                       } else {
-                               update(bv_->text, SELECT);
-                       }
+               update(BufferView::UPDATE);
+               if (bv_->text->updateInset(inset)) {
+                       update(BufferView::SELECT);
                        return;
                }
        } else if (static_cast<UpdatableInset *>(tl_inset)
                           ->updateInsetInInset(bv_, inset))
        {
-               if (bv_->text->updateInset(bv_, tl_inset)) {
+               if (bv_->text->updateInset(tl_inset)) {
                        update();
                        updateScrollbar();
                }