J�rgen Spitzm�ller's tweak of the Paragraph dialog.

[lyx.git] / src / BufferView2.C

diff --git a/src/BufferView2.C b/src/BufferView2.C
index 0269bf9c36f18e556be6db216cd10ada24c4dfef..b58b1c3ca69174f352dac9b8b5d30db93e1f9121 100644 (file)
--- a/src/BufferView2.C
+++ b/src/BufferView2.C
@@ -30,6 +30,9 @@
 #include "support/lyxfunctional.h" //equal_1st_in_pair
 #include "language.h"
 #include "gettext.h"
+#include "undo_funcs.h"
+#include "debug.h"
+#include "iterators.h"
 
 extern BufferList bufferlist;
 
@@ -136,10 +139,10 @@ void BufferView::insertErrors(TeXErrors & terr)
        for (TeXErrors::Errors::const_iterator cit = terr.begin();
             cit != terr.end();
             ++cit) {
-               string const desctext((*cit).error_desc);
-               string const errortext((*cit).error_text);
+               string const desctext(cit->error_desc);
+               string const errortext(cit->error_text);
                string const msgtxt = desctext + '\n' + errortext;
-               int const errorrow = (*cit).error_in_line;
+               int const errorrow = cit->error_in_line;
 
                // Insert error string for row number
                int tmpid = -1; 
@@ -155,7 +158,7 @@ void BufferView::insertErrors(TeXErrors & terr)
                        texrowpar = text->firstParagraph();
                        tmppos = 0;
                } else {
-                       texrowpar = text->getParFromID(tmpid);
+                       texrowpar = buffer()->getParFromID(tmpid);
                }
 
                if (texrowpar == 0)
@@ -184,7 +187,7 @@ void BufferView::setCursorFromRow(int row)
                texrowpar = text->firstParagraph();
                tmppos = 0;
        } else {
-               texrowpar = text->getParFromID(tmpid);
+               texrowpar = buffer()->getParFromID(tmpid);
        }
        text->setCursor(this, texrowpar, tmppos);
 }
@@ -227,7 +230,7 @@ void BufferView::menuUndo()
                hideCursor();
                beforeChange(text);
                update(text, BufferView::SELECT|BufferView::FITCUR);
-               if (!text->textUndo(this))
+               if (!textUndo(this))
                        owner()->message(_("No forther undo information"));
                else
                        update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
@@ -248,7 +251,7 @@ void BufferView::menuRedo()
                hideCursor();
                beforeChange(text);
                update(text, BufferView::SELECT|BufferView::FITCUR);
-               if (!text->textRedo(this))
+               if (!textRedo(this))
                        owner()->message(_("No further redo information"));
                else
                        update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
@@ -263,7 +266,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"));
        }
@@ -286,19 +289,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"));
        }
@@ -314,7 +317,7 @@ void BufferView::paste()
        hideCursor();
        // clear the selection
        toggleSelection();
-       text->clearSelection(this);
+       text->clearSelection();
        update(text, BufferView::SELECT|BufferView::FITCUR);
        
        // paste
@@ -323,26 +326,11 @@ void BufferView::paste()
        
        // clear the selection 
        toggleSelection();
-       text->clearSelection(this);
+       text->clearSelection();
        update(text, BufferView::SELECT|BufferView::FITCUR);
 }
 
 
-
-
-void BufferView::insertCorrectQuote()
-{
-       char c;
-
-       if (text->cursor.pos())
-               c = text->cursor.par()->getChar(text->cursor.pos() - 1);
-       else 
-               c = ' ';
-
-       insertInset(new InsetQuotes(c, buffer()->params));
-}
-
-
 /* these functions are for the spellchecker */ 
 string const BufferView::nextWord(float & value)
 {
@@ -359,8 +347,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);
@@ -374,7 +364,7 @@ void BufferView::endOfSpellCheck()
        hideCursor();
        beforeChange(text);
        text->selectSelectedWord(this);
-       text->clearSelection(this);
+       text->clearSelection();
        update(text, BufferView::SELECT|BufferView::FITCUR);
 }
 
@@ -383,24 +373,25 @@ void BufferView::replaceWord(string const & replacestring)
 {
        if (!available()) return;
 
+       LyXText * tt = getLyXText();
        hideCursor();
-       update(text, BufferView::SELECT|BufferView::FITCUR);
+       update(tt, BufferView::SELECT|BufferView::FITCUR);
    
        /* clear the selection (if there is any) */ 
        toggleSelection(false);
-       update(text, BufferView::SELECT|BufferView::FITCUR);
+       update(tt, BufferView::SELECT|BufferView::FITCUR);
    
        /* clear the selection (if there is any) */ 
        toggleSelection(false);
-       text->replaceSelectionWithString(this, replacestring);
+       tt->replaceSelectionWithString(this, replacestring);
    
-       text->setSelectionOverString(this, replacestring);
+       tt->setSelectionOverString(this, replacestring);
 
        // Go back so that replacement string is also spellchecked
        for (string::size_type i = 0; i < replacestring.length() + 1; ++i) {
-               text->cursorLeft(this);
+               tt->cursorLeft(this);
        }
-       update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+       update(tt, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
 }
 // End of spellchecker stuff
 
@@ -411,7 +402,7 @@ bool BufferView::lockInset(UpdatableInset * inset)
                theLockingInset(inset);
                return true;
        } else if (inset) {
-           return theLockingInset()->LockInsetInInset(this, inset);
+           return theLockingInset()->lockInsetInInset(this, inset);
        }
        return false;
 }
@@ -419,19 +410,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()
@@ -439,8 +432,8 @@ void BufferView::showLockedInsetCursor(int x, int y, int asc, int desc)
                        shape = (txt->real_current_font.isVisibleRightToLeft())
                                ? LyXScreen::REVERSED_L_SHAPE
                                : LyXScreen::L_SHAPE;
-               y += cursor.y() + theLockingInset()->InsetInInsetY();
-               pimpl_->screen_->ShowManualCursor(text, x, y, asc, desc,
+               y += cursor.y() + theLockingInset()->insetInInsetY();
+               pimpl_->screen_->showManualCursor(text, x, y, asc, desc,
                                                  shape);
        }
 }
@@ -449,7 +442,7 @@ void BufferView::showLockedInsetCursor(int x, int y, int asc, int desc)
 void BufferView::hideLockedInsetCursor()
 {
        if (theLockingInset() && available()) {
-               pimpl_->screen_->HideCursor();
+               pimpl_->screen_->hideCursor();
        }
 }
 
@@ -457,8 +450,8 @@ void BufferView::hideLockedInsetCursor()
 void BufferView::fitLockedInsetCursor(int x, int y, int asc, int desc)
 {
        if (theLockingInset() && available()) {
-               y += text->cursor.y() + theLockingInset()->InsetInInsetY();
-               if (pimpl_->screen_->FitManualCursor(text, this, x, y, asc, desc))
+               y += text->cursor.y() + theLockingInset()->insetInInsetY();
+               if (pimpl_->screen_->fitManualCursor(text, this, x, y, asc, desc))
                        updateScrollbar();
        }
 }
@@ -467,13 +460,13 @@ void BufferView::fitLockedInsetCursor(int x, int y, int asc, int desc)
 int BufferView::unlockInset(UpdatableInset * inset)
 {
        if (inset && theLockingInset() == inset) {
-               inset->InsetUnlock(this);
+               inset->insetUnlock(this);
                theLockingInset(0);
-               text->finishUndo();
+               finishUndo();
                return 0;
        } else if (inset && theLockingInset() &&
-                  theLockingInset()->UnlockInsetInInset(this, inset)) {
-               text->finishUndo();
+                  theLockingInset()->unlockInsetInInset(this, inset)) {
+               finishUndo();
                return 0;
        }
        return bufferlist.unlockInset(inset);
@@ -486,9 +479,9 @@ void BufferView::lockedInsetStoreUndo(Undo::undo_kind kind)
                return; // shouldn't happen
        if (kind == Undo::EDIT) // in this case insets would not be stored!
                kind = Undo::FINISH;
-       text->setUndo(buffer(), kind,
-                     text->cursor.par()->previous(), 
-                     text->cursor.par()->next());
+       setUndo(this, kind,
+               text->cursor.par(),
+               text->cursor.par()->next());
 }
 
 
@@ -502,18 +495,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;
@@ -522,14 +517,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;