X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView2.C;h=b58b1c3ca69174f352dac9b8b5d30db93e1f9121;hb=5bca2431091765b1552cbb5410b1f2c18bbcb9c1;hp=7a3162d1bb030b9d3685629d3e93dd154dd0e560;hpb=31b56dac8042735f75229ad480b3e98531c181ff;p=lyx.git diff --git a/src/BufferView2.C b/src/BufferView2.C index 7a3162d1bb..b58b1c3ca6 100644 --- a/src/BufferView2.C +++ b/src/BufferView2.C @@ -8,11 +8,11 @@ * * ====================================================== */ -#include - #include #include +#include + #include "BufferView.h" #include "buffer.h" #include "lyxcursor.h" @@ -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; @@ -84,10 +87,11 @@ bool BufferView::insertLyXFile(string const & filen) bool res = true; if (c == '#') { - lyxerr.debug() << "Will insert file with header" << endl; + lyxerr[Debug::INFO] << "Will insert file with header" << endl; res = buffer()->readFile(lex, text->cursor.par()); } else { - lyxerr.debug() << "Will insert file without header" << endl; + lyxerr[Debug::INFO] << "Will insert file without header" + << endl; res = buffer()->readLyXformat2(lex, text->cursor.par()); } @@ -98,7 +102,7 @@ bool BufferView::insertLyXFile(string const & filen) bool BufferView::removeAutoInsets() { - LyXParagraph * par = buffer()->paragraph; + Paragraph * par = buffer()->paragraph; LyXCursor tmpcursor = text->cursor; LyXCursor cursor; @@ -107,12 +111,12 @@ bool BufferView::removeAutoInsets() while (par) { // this has to be done before the delete - text->SetCursor(this, cursor, par, 0); - if (par->AutoDeleteInsets()){ + text->setCursor(this, cursor, par, 0); + if (par->autoDeleteInsets()){ a = true; - text->RedoParagraphs(this, cursor, + text->redoParagraphs(this, cursor, cursor.par()->next()); - text->FullRebreak(this); + text->fullRebreak(this); } par = par->next(); } @@ -121,7 +125,7 @@ bool BufferView::removeAutoInsets() if (tmpcursor.pos() > tmpcursor.par()->size()) tmpcursor.pos(tmpcursor.par()->size()); - text->SetCursorIntern(this, tmpcursor.par(), tmpcursor.pos()); + text->setCursorIntern(this, tmpcursor.par(), tmpcursor.pos()); return a; } @@ -135,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; @@ -148,25 +152,25 @@ void BufferView::insertErrors(TeXErrors & terr) buffer()->texrow.increasePos(tmpid, tmppos); } - LyXParagraph * texrowpar = 0; + Paragraph * texrowpar = 0; if (tmpid == -1) { - texrowpar = text->FirstParagraph(); + texrowpar = text->firstParagraph(); tmppos = 0; } else { - texrowpar = text->GetParFromID(tmpid); + texrowpar = buffer()->getParFromID(tmpid); } if (texrowpar == 0) continue; InsetError * new_inset = new InsetError(msgtxt); - text->SetCursorIntern(this, texrowpar, tmppos); - text->InsertInset(this, new_inset); - text->FullRebreak(this); + text->setCursorIntern(this, texrowpar, tmppos); + text->insertInset(this, new_inset); + text->fullRebreak(this); } // Restore the cursor position - text->SetCursorIntern(this, cursor.par(), cursor.pos()); + text->setCursorIntern(this, cursor.par(), cursor.pos()); } @@ -177,15 +181,15 @@ void BufferView::setCursorFromRow(int row) buffer()->texrow.getIdFromRow(row, tmpid, tmppos); - LyXParagraph * texrowpar; + Paragraph * texrowpar; if (tmpid == -1) { - texrowpar = text->FirstParagraph(); + texrowpar = text->firstParagraph(); tmppos = 0; } else { - texrowpar = text->GetParFromID(tmpid); + texrowpar = buffer()->getParFromID(tmpid); } - text->SetCursor(this, texrowpar, tmppos); + text->setCursor(this, texrowpar, tmppos); } @@ -209,7 +213,7 @@ bool BufferView::gotoLabel(string const & label) if (find(labels.begin(),labels.end(),label) != labels.end()) { beforeChange(text); - text->SetCursor(this, it.getPar(), it.getPos()); + text->setCursor(this, it.getPar(), it.getPos()); text->selection.cursor = text->cursor; update(text, BufferView::SELECT|BufferView::FITCUR); return true; @@ -226,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); @@ -247,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); @@ -262,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")); } @@ -282,22 +286,22 @@ void BufferView::pasteEnvironment() void BufferView::copy() { if (available()) { - text->CopySelection(this); + 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")); } @@ -313,35 +317,20 @@ void BufferView::paste() hideCursor(); // clear the selection toggleSelection(); - text->ClearSelection(this); + text->clearSelection(); update(text, BufferView::SELECT|BufferView::FITCUR); // paste - text->PasteSelection(this); + text->pasteSelection(this); update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); // 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) { @@ -350,7 +339,7 @@ string const BufferView::nextWord(float & value) return string(); } - return text->SelectNextWord(this, value); + return text->selectNextWord(this, value); } @@ -358,9 +347,11 @@ void BufferView::selectLastWord() { if (!available()) return; + LyXCursor cur = text->selection.cursor; hideCursor(); beforeChange(text); - text->SelectSelectedWord(this); + text->selection.cursor = cur; + text->selectSelectedWord(this); toggleSelection(false); update(text, BufferView::SELECT|BufferView::FITCUR); } @@ -372,8 +363,8 @@ void BufferView::endOfSpellCheck() hideCursor(); beforeChange(text); - text->SelectSelectedWord(this); - text->ClearSelection(this); + text->selectSelectedWord(this); + text->clearSelection(); update(text, BufferView::SELECT|BufferView::FITCUR); } @@ -382,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 @@ -410,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; } @@ -418,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) == - LyXParagraph::META_INSET) && - (cursor.par()->GetInset(cursor.pos() - 1) == - theLockingInset()->GetLockingInset())) - text->SetCursor(this, cursor, - cursor.par(), cursor.pos() - 1); + (cursor.par()->getChar(cursor.pos() - 1) == + Paragraph::META_INSET) && + (cursor.par()->getInset(cursor.pos() - 1) == + locking_inset)) + text->setCursor(this, cursor, + 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() @@ -438,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); } } @@ -448,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(); } } @@ -456,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(); } } @@ -466,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); @@ -485,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()); } @@ -501,18 +495,20 @@ bool BufferView::ChangeInsets(Inset::Code code, string const & from, string const & to) { bool flag = false; - LyXParagraph * 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 (LyXParagraph::inset_iterator it = par->inset_iterator_begin(); - it != par->inset_iterator_end(); ++it) { - if ((*it)->LyxCode() == code) { - InsetCommand * inset = static_cast(*it); + for (Paragraph::inset_iterator it2 = par->inset_iterator_begin(); + it2 != par->inset_iterator_end(); ++it2) { + if ((*it2)->lyxCode() == code) { + InsetCommand * inset = static_cast(*it2); if (inset->getContents() == from) { inset->setContents(to); flag2 = true; @@ -521,16 +517,18 @@ 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()); + text->setCursorIntern(this, cursor.par(), cursor.pos()); return flag; } @@ -602,6 +600,6 @@ LyXText * BufferView::getParentText(Inset * inset) const Language const * BufferView::getParentLanguage(Inset * inset) const { LyXText * text = getParentText(inset); - return text->cursor.par()->GetFontSettings(buffer()->params, + return text->cursor.par()->getFontSettings(buffer()->params, text->cursor.pos()).language(); }