Added new FINISED states FINISHED_RIGHT, FINISHED_UP, FINISHED_DOWN.

[lyx.git] / src / BufferView2.C

diff --git a/src/BufferView2.C b/src/BufferView2.C
index 6509b0684507cb6a489c257086e7d034da9786e6..3aac225fed9347551cb1e7eb8c430e3798658db7 100644 (file)
--- a/src/BufferView2.C
+++ b/src/BufferView2.C
@@ -265,7 +265,7 @@ void BufferView::copyEnvironment()
                text->copyEnvironmentType();
                // clear the selection, even if mark_set
                toggleSelection();
-               text->clearSelection(this);
+               text->clearSelection();
                update(text, BufferView::SELECT|BufferView::FITCUR);
                owner()->message(_("Paragraph environment type copied"));
        }
@@ -288,19 +288,19 @@ void BufferView::copy()
                text->copySelection(this);
                // clear the selection, even if mark_set
                toggleSelection();
-               text->clearSelection(this);
+               text->clearSelection();
                update(text, BufferView::SELECT|BufferView::FITCUR);
                owner()->message(_("Copy"));
        }
 }
 
 
-void BufferView::cut()
+void BufferView::cut(bool realcut)
 {
        if (available()) {
                hideCursor();
                update(text, BufferView::SELECT|BufferView::FITCUR);
-               text->cutSelection(this);
+               text->cutSelection(this, true, realcut);
                update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                owner()->message(_("Cut"));
        }
@@ -316,7 +316,7 @@ void BufferView::paste()
        hideCursor();
        // clear the selection
        toggleSelection();
-       text->clearSelection(this);
+       text->clearSelection();
        update(text, BufferView::SELECT|BufferView::FITCUR);
        
        // paste
@@ -325,7 +325,7 @@ void BufferView::paste()
        
        // clear the selection 
        toggleSelection();
-       text->clearSelection(this);
+       text->clearSelection();
        update(text, BufferView::SELECT|BufferView::FITCUR);
 }
 
@@ -346,8 +346,10 @@ void BufferView::selectLastWord()
 {
        if (!available()) return;
    
+       LyXCursor cur = text->selection.cursor;
        hideCursor();
        beforeChange(text);
+       text->selection.cursor = cur;
        text->selectSelectedWord(this);
        toggleSelection(false);
        update(text, BufferView::SELECT|BufferView::FITCUR);
@@ -361,7 +363,7 @@ void BufferView::endOfSpellCheck()
        hideCursor();
        beforeChange(text);
        text->selectSelectedWord(this);
-       text->clearSelection(this);
+       text->clearSelection();
        update(text, BufferView::SELECT|BufferView::FITCUR);
 }
 
@@ -407,19 +409,21 @@ bool BufferView::lockInset(UpdatableInset * inset)
 
 void BufferView::showLockedInsetCursor(int x, int y, int asc, int desc)
 {
-       if (theLockingInset() && available()) {
+       if (available() && theLockingInset()) {
                LyXCursor cursor = text->cursor;
+               Inset * locking_inset = theLockingInset()->getLockingInset();
+
                if ((cursor.pos() - 1 >= 0) &&
                    (cursor.par()->getChar(cursor.pos() - 1) ==
                     Paragraph::META_INSET) &&
                    (cursor.par()->getInset(cursor.pos() - 1) ==
-                    theLockingInset()->getLockingInset()))
+                    locking_inset))
                        text->setCursor(this, cursor,
-                                       cursor.par(), cursor.pos() - 1);
+                                       cursor.par(), cursor.pos() - 1);
                LyXScreen::Cursor_Shape shape = LyXScreen::BAR_SHAPE;
                LyXText * txt = getLyXText();
-               if (theLockingInset()->getLockingInset()->lyxCode() ==
-                   Inset::TEXT_CODE &&
+               if (locking_inset->isTextInset() &&
+                   locking_inset->lyxCode() != Inset::ERT_CODE &&
                    (txt->real_current_font.language() !=
                     buffer()->params.language
                     || txt->real_current_font.isVisibleRightToLeft()