Fixed cut&paste bugs and added freespacing for ERT Insets.

[lyx.git] / src / BufferView2.C

diff --git a/src/BufferView2.C b/src/BufferView2.C
index acef2517b3c85a6cc45215df04940ad08dd6ee44..0d5d4c10a418bd6a90f4c40242f5a36808a80994 100644 (file)
--- a/src/BufferView2.C
+++ b/src/BufferView2.C
@@ -23,7 +23,7 @@
 #include "support/FileInfo.h"
 #include "lyxscreen.h"
 #include "support/filetools.h"
-#include "lyx_gui_misc.h"
+#include "frontends/Alert.h"
 #include "LaTeX.h"
 #include "BufferView_pimpl.h"
 #include "insets/insetcommand.h" //ChangeRefs
@@ -32,6 +32,7 @@
 #include "gettext.h"
 #include "undo_funcs.h"
 #include "debug.h"
+#include "iterators.h"
 
 extern BufferList bufferlist;
 
@@ -62,7 +63,7 @@ bool BufferView::insertLyXFile(string const & filen)
        FileInfo const fi(fname);
 
        if (!fi.readable()) {
-               WriteAlert(_("Error!"),
+               Alert::alert(_("Error!"),
                           _("Specified file is unreadable: "),
                           MakeDisplayPath(fname, 50));
                return false;
@@ -72,13 +73,13 @@ bool BufferView::insertLyXFile(string const & filen)
 
        ifstream ifs(fname.c_str());
        if (!ifs) {
-               WriteAlert(_("Error!"),
+               Alert::alert(_("Error!"),
                           _("Cannot open specified file: "),
                           MakeDisplayPath(fname, 50));
                return false;
        }
        
-       char const c = ifs.peek();
+       int const c = ifs.peek();
        
        LyXLex lex(0, 0);
        lex.setStream(ifs);
@@ -230,7 +231,7 @@ void BufferView::menuUndo()
                beforeChange(text);
                update(text, BufferView::SELECT|BufferView::FITCUR);
                if (!textUndo(this))
-                       owner()->message(_("No forther undo information"));
+                       owner()->message(_("No further undo information"));
                else
                        update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                setState();
@@ -263,10 +264,6 @@ void BufferView::copyEnvironment()
 {
        if (available()) {
                text->copyEnvironmentType();
-               // clear the selection, even if mark_set
-               toggleSelection();
-               text->clearSelection();
-               update(text, BufferView::SELECT|BufferView::FITCUR);
                owner()->message(_("Paragraph environment type copied"));
        }
 }
@@ -286,21 +283,17 @@ void BufferView::copy()
 {
        if (available()) {
                text->copySelection(this);
-               // clear the selection, even if mark_set
-               toggleSelection();
-               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"));
        }
@@ -338,7 +331,7 @@ string const BufferView::nextWord(float & value)
                return string();
        }
 
-       return text->selectNextWord(this, value);
+       return text->selectNextWordToSpellcheck(this, value);
 }
 
   
@@ -346,8 +339,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);
@@ -395,6 +390,9 @@ void BufferView::replaceWord(string const & replacestring)
 
 bool BufferView::lockInset(UpdatableInset * inset)
 {
+       // don't relock if we're already locked
+       if (theLockingInset() == inset)
+               return true;
        if (!theLockingInset() && inset) {
                theLockingInset(inset);
                return true;
@@ -407,19 +405,20 @@ 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()->isInset(cursor.pos() - 1) &&
                    (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()
@@ -490,18 +489,20 @@ bool BufferView::ChangeInsets(Inset::Code code,
                              string const & from, string const & to)
 {
        bool flag = false;
-       Paragraph * par = buffer()->paragraph;
        LyXCursor cursor = text->cursor;
        LyXCursor tmpcursor = cursor;
        cursor.par(tmpcursor.par());
        cursor.pos(tmpcursor.pos());
 
-       while (par) {
+       ParIterator end = buffer()->par_iterator_end();
+       for (ParIterator it = buffer()->par_iterator_begin();
+            it != end; ++it) {
+               Paragraph * par = *it;
                bool flag2 = false;
-               for (Paragraph::inset_iterator it = par->inset_iterator_begin();
-                    it != par->inset_iterator_end(); ++it) {
-                       if ((*it)->lyxCode() == code) {
-                               InsetCommand * inset = static_cast<InsetCommand *>(*it);
+               for (Paragraph::inset_iterator it2 = par->inset_iterator_begin();
+                    it2 != par->inset_iterator_end(); ++it2) {
+                       if ((*it2)->lyxCode() == code) {
+                               InsetCommand * inset = static_cast<InsetCommand *>(*it2);
                                if (inset->getContents() == from) {
                                        inset->setContents(to);
                                        flag2 = true;
@@ -510,14 +511,16 @@ bool BufferView::ChangeInsets(Inset::Code code,
                }
                if (flag2) {
                        flag = true;
-                       // this is possible now, since SetCursor takes
-                       // care about footnotes
-                       text->setCursorIntern(this, par, 0);
-                       text->redoParagraphs(this, text->cursor,
-                                            text->cursor.par()->next());
-                       text->fullRebreak(this);
+#warning Fix me
+                       // The test it.size()==1 was needed to prevent crashes.
+                       // How to set the cursor corretly when it.size()>1 ??
+                       if (it.size() == 1) {
+                               text->setCursorIntern(this, par, 0);
+                               text->redoParagraphs(this, text->cursor,
+                                                    text->cursor.par()->next());
+                               text->fullRebreak(this);
+                       }
                }
-               par = par->next();
        }
        text->setCursorIntern(this, cursor.par(), cursor.pos());
        return flag;