* src/tabular.[Ch]: simplify plaintext methods, because there

[lyx.git] / src / BufferView.C

diff --git a/src/BufferView.C b/src/BufferView.C
index ff3b47924018f876f07d04a52d8774abce6ac1c8..29ad13b273bf25b7c66faf71ff4e2a3b177c8199 100644 (file)
--- a/src/BufferView.C
+++ b/src/BufferView.C
@@ -63,7 +63,6 @@
 #include "frontends/Alert.h"
 #include "frontends/FileDialog.h"
 #include "frontends/FontMetrics.h"
-#include "frontends/Selection.h"
 
 #include "graphics/Previews.h"
 
@@ -209,7 +208,8 @@ void BufferView::setBuffer(Buffer * b)
                        cursor_.resetAnchor();
                        cursor_.setCursor(buffer_->getCursor().asDocIterator(&(buffer_->inset())));
                        cursor_.setSelection();
-                       theSelection().haveSelection(cursor_.selection());
+                       // do not set selection to the new buffer because we
+                       // only paste recent selection.
                }
        }
 
@@ -598,7 +598,7 @@ void BufferView::switchKeyMap()
        if (!lyxrc.rtl_support)
                return;
 
-       if (getLyXText()->real_current_font.isRightToLeft()) {
+       if (cursor_.innerText()->real_current_font.isRightToLeft()) {
                if (intl_->keymap == Intl::PRIMARY)
                        intl_->keyMapSec();
        } else {
@@ -682,8 +682,7 @@ FuncStatus BufferView::getStatus(FuncRequest const & cmd)
 
        case LFUN_CHANGES_OUTPUT: {
                OutputParams runparams;
-               LaTeXFeatures features(*buffer_, buffer_->params(), runparams);
-               flag.enabled(buffer_ && features.isAvailable("dvipost"));
+               flag.enabled(buffer_ && LaTeXFeatures::isAvailable("dvipost"));
                flag.setOnOff(buffer_->params().outputChanges);
                break;
        }
@@ -878,25 +877,24 @@ Update::flags BufferView::dispatch(FuncRequest const & cmd)
                        showDialog("changes");
                break;
 
-       case LFUN_ALL_CHANGES_ACCEPT: {
+       case LFUN_ALL_CHANGES_ACCEPT:
+               // select complete document
                cursor_.reset(buffer_->inset());
-#ifdef WITH_WARNINGS
-#warning FIXME changes
-#endif
-               while (findNextChange(this))
-                       getLyXText()->acceptOrRejectChanges(cursor_, LyXText::ACCEPT);
+               cursor_.selHandle(true);
+               buffer_->text().cursorBottom(cursor_);
+               // accept everything in a single step to support atomic undo
+               buffer_->text().acceptOrRejectChanges(cursor_, LyXText::ACCEPT);
                break;
-       }
 
-       case LFUN_ALL_CHANGES_REJECT: {
+       case LFUN_ALL_CHANGES_REJECT:
+               // select complete document
                cursor_.reset(buffer_->inset());
-#ifdef WITH_WARNINGS
-#warning FIXME changes
-#endif
-               while (findNextChange(this))
-                       getLyXText()->acceptOrRejectChanges(cursor_, LyXText::REJECT);
+               cursor_.selHandle(true);
+               buffer_->text().cursorBottom(cursor_);
+               // reject everything in a single step to support atomic undo
+               // Note: reject does not work recursively; the user may have to repeat the operation
+               buffer_->text().acceptOrRejectChanges(cursor_, LyXText::REJECT);
                break;
-       }
 
        case LFUN_WORD_FIND:
                find(this, cmd);
@@ -1055,6 +1053,10 @@ void BufferView::clearSelection()
 {
        if (buffer_) {
                cursor_.clearSelection();
+               // Clear the selection buffer. Otherwise a subsequent
+               // middle-mouse-button paste would use the selection buffer,
+               // not the more current external selection.
+               cap::clearSelection();
                xsel_cache_.set = false;
                // The buffer did not really change, but this causes the
                // redraw we need because we cleared the selection above.
@@ -1224,22 +1226,6 @@ void BufferView::gotoLabel(docstring const & label)
 }
 
 
-LyXText * BufferView::getLyXText()
-{
-       LyXText * text = cursor_.innerText();
-       BOOST_ASSERT(text);
-       return text;
-}
-
-
-LyXText const * BufferView::getLyXText() const
-{
-       LyXText const * text = cursor_.innerText();
-       BOOST_ASSERT(text);
-       return text;
-}
-
-
 TextMetrics const & BufferView::textMetrics(LyXText const * t) const
 {
        return const_cast<BufferView *>(this)->textMetrics(t);
@@ -1339,8 +1325,6 @@ bool BufferView::mouseSetCursor(LCursor & cur)
 
        cursor_.setCursor(dit);
        cursor_.clearSelection();
-       // remember new position.
-       cursor_.setTargetX();
        finishUndo();
        return update;
 }
@@ -1359,7 +1343,7 @@ void BufferView::putSelectionAt(DocIterator const & cur,
                        cursor_.setSelection(cursor_, -length);
                } else
                        cursor_.setSelection(cursor_, length);
-               theSelection().haveSelection(cursor_.selection());
+               cap::saveSelection(cursor_);
        }
 }