X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView2.C;h=da33665c2797885bfbff2d4212e47fc0091ec5f3;hb=d11fd01ce743c4974a96f241a99853f46078c80c;hp=6af288a3ab11ee1cdadb3942c325425156011991;hpb=55bf6460f304a4632af2136a62c8a82fb86053f3;p=lyx.git diff --git a/src/BufferView2.C b/src/BufferView2.C index 6af288a3ab..da33665c27 100644 --- a/src/BufferView2.C +++ b/src/BufferView2.C @@ -1,45 +1,52 @@ /* This file is part of - * ====================================================== - * + * ====================================================== + * * LyX, The Document Processor - * + * * Copyright 1995 Matthias Ettrich * Copyright 1995-2001 The LyX Team. * * ====================================================== */ -#include -#include - #include #include "BufferView.h" #include "buffer.h" #include "lyxcursor.h" #include "lyxtext.h" -#include "insets/inseterror.h" #include "LyXView.h" #include "bufferlist.h" -#include "support/FileInfo.h" #include "lyxscreen.h" -#include "support/filetools.h" -#include "lyx_gui_misc.h" #include "LaTeX.h" #include "BufferView_pimpl.h" -#include "insets/insetcommand.h" //ChangeRefs -#include "support/lyxfunctional.h" //equal_1st_in_pair #include "language.h" #include "gettext.h" #include "undo_funcs.h" +#include "debug.h" +#include "iterators.h" + +#include "frontends/Alert.h" + +#include "insets/insetcommand.h" //ChangeRefs +#include "insets/inseterror.h" + +#include "support/FileInfo.h" +#include "support/filetools.h" +#include "support/lyxfunctional.h" //equal_1st_in_pair +#include "support/types.h" +#include "support/lyxalgo.h" // lyx_count + +#include extern BufferList bufferlist; +using lyx::pos_type; + using std::pair; using std::endl; using std::ifstream; using std::vector; using std::find; -using std::count; using std::count_if; @@ -61,24 +68,24 @@ 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; } - + beforeChange(text); 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); @@ -88,7 +95,7 @@ bool BufferView::insertLyXFile(string const & filen) lyxerr[Debug::INFO] << "Will insert file with header" << endl; res = buffer()->readFile(lex, text->cursor.par()); } else { - lyxerr[Debug::INFO] << "Will insert file without header" + lyxerr[Debug::INFO] << "Will insert file without header" << endl; res = buffer()->readLyXformat2(lex, text->cursor.par()); } @@ -100,32 +107,136 @@ bool BufferView::insertLyXFile(string const & filen) bool BufferView::removeAutoInsets() { - Paragraph * par = buffer()->paragraph; - - LyXCursor tmpcursor = text->cursor; - LyXCursor cursor; + // keep track of which pos and par the cursor was on + Paragraph * cursor_par = text->cursor.par(); + Paragraph * cursor_par_prev = cursor_par ? cursor_par->previous() : 0; + Paragraph * cursor_par_next = cursor_par ? cursor_par->next() : 0; + pos_type cursor_pos = text->cursor.pos(); + + bool found = false; + + // Trap the deletion of the paragraph the cursor is in. + // Iterate until we find a paragraph that won't be immediately deleted. + // In reality this should mean we only execute the body of the while + // loop once at most. However for safety we iterate rather than just + // make this an if () conditional. + while ((cursor_par_prev || cursor_par_next) + && text->setCursor(this, + cursor_par_prev ? cursor_par_prev : cursor_par_next, + 0)) { + // We just removed cursor_par so have to fix the "cursor" + if (cursor_par_prev) { + // '.' = cursor_par + // a -> a. + // . + cursor_par = cursor_par_prev; + cursor_pos = cursor_par->size(); + } else { + // . -> .a + // a + cursor_par = cursor_par_next; + cursor_pos = 0; + } + cursor_par_prev = cursor_par->previous(); + cursor_par_next = cursor_par->next(); + } - bool a = false; + // Iterate through the paragraphs removing autoDelete insets as we go. + // If the paragraph ends up empty after all the autoDelete insets are + // removed that paragraph will be removed by the next setCursor() call. + ParIterator it = buffer()->par_iterator_begin(); + ParIterator end = buffer()->par_iterator_end(); + for (; it != end; ++it) { + Paragraph * par = *it; + Paragraph * par_prev = par ? par->previous() : 0; + bool removed = false; + + if (text->setCursor(this, par, 0) + && cursor_par == par_prev) { + // The previous setCursor line was deleted and that + // was the cursor_par line. This can only happen if an + // error box was the sole item on cursor_par. + // It is possible for cursor_par_prev to be stray if + // the line it pointed to only had a error box on it + // so we have to set it to a known correct value. + // This is often the same value it already had. + cursor_par_prev = par->previous(); + if (cursor_par_prev) { + // '|' = par, '.' = cursor_par, 'E' = error box + // First step below may occur before while{} + // a |a a a a. + // E -> .E -> |.E -> . -> |b + // . b b |b + // b + cursor_par = cursor_par_prev; + cursor_pos = cursor_par_prev->size(); + cursor_par_prev = cursor_par->previous(); + // cursor_par_next remains the same + } else if (cursor_par_next) { + // First step below may occur before while{} + // . + // E -> |.E -> |. -> . -> .|a + // a a a |a + cursor_par = cursor_par_next; + cursor_pos = 0; + // cursor_par_prev remains unset + cursor_par_next = cursor_par->next(); + } else { + // I can't find a way to trigger this + // so it should be unreachable code + // unless the buffer is corrupted. + lyxerr << "BufferView::removeAutoInsets() is bad\n"; + } + } - while (par) { - // this has to be done before the delete - text->setCursor(this, cursor, par, 0); - if (par->autoDeleteInsets()){ - a = true; - text->redoParagraphs(this, cursor, - cursor.par()->next()); - text->fullRebreak(this); + Paragraph::inset_iterator pit = par->inset_iterator_begin(); + Paragraph::inset_iterator pend = par->inset_iterator_end(); + while (pit != pend) { + if (pit->autoDelete()) { + removed = true; + pos_type const pos = pit.getPos(); + + par->erase(pos); + // We just invalidated par's inset iterators so + // we get the next valid iterator position + pit = par->InsetIterator(pos); + // and ensure we have a valid end iterator. + pend = par->inset_iterator_end(); + + if (cursor_par == par) { + // update the saved cursor position + if (cursor_pos > pos) + --cursor_pos; + } + } else { + ++pit; + } + } + if (removed) { + found = true; + text->redoParagraph(this); } - par = par->next(); } - // avoid forbidden cursor positions caused by error removing - if (tmpcursor.pos() > tmpcursor.par()->size()) - tmpcursor.pos(tmpcursor.par()->size()); + // It is possible that the last line is empty if it was cursor_par + // and/or only had an error inset on it. So we set the cursor to the + // start of the doc to force its removal and ensure a valid saved cursor + if (text->setCursor(this, text->ownerParagraph(), 0) + && 0 == cursor_par_next) { + cursor_par = cursor_par_prev; + cursor_pos = cursor_par->size(); + } else if (cursor_pos > cursor_par->size()) { + // Some C-Enter lines were removed by the setCursor call which + // then invalidated cursor_pos. It could still be "wrong" because + // the cursor may appear to have jumped but since we collapsed + // some C-Enter lines this should be a reasonable compromise. + cursor_pos = cursor_par->size(); + } - text->setCursorIntern(this, tmpcursor.par(), tmpcursor.pos()); + // restore the original cursor in its corrected location. + text->setCursorIntern(this, cursor_par, cursor_pos); - return a; + return found; } @@ -134,26 +245,26 @@ void BufferView::insertErrors(TeXErrors & terr) // Save the cursor position LyXCursor cursor = text->cursor; - for (TeXErrors::Errors::const_iterator cit = terr.begin(); - cit != terr.end(); - ++cit) { + TeXErrors::Errors::const_iterator cit = terr.begin(); + TeXErrors::Errors::const_iterator end = terr.end(); + for (; cit != end; ++cit) { 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; // Insert error string for row number - int tmpid = -1; + int tmpid = -1; int tmppos = -1; if (buffer()->texrow.getIdFromRow(errorrow, tmpid, tmppos)) { buffer()->texrow.increasePos(tmpid, tmppos); } - + Paragraph * texrowpar = 0; if (tmpid == -1) { - texrowpar = text->firstParagraph(); + texrowpar = text->ownerParagraph(); tmppos = 0; } else { texrowpar = buffer()->getParFromID(tmpid); @@ -174,7 +285,7 @@ void BufferView::insertErrors(TeXErrors & terr) void BufferView::setCursorFromRow(int row) { - int tmpid = -1; + int tmpid = -1; int tmppos = -1; buffer()->texrow.getIdFromRow(row, tmpid, tmppos); @@ -182,7 +293,7 @@ void BufferView::setCursorFromRow(int row) Paragraph * texrowpar; if (tmpid == -1) { - texrowpar = text->firstParagraph(); + texrowpar = text->ownerParagraph(); tmppos = 0; } else { texrowpar = buffer()->getParFromID(tmpid); @@ -229,7 +340,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(); @@ -239,11 +350,13 @@ void BufferView::menuUndo() void BufferView::menuRedo() { +#if 0 // this should not be here (Jug 20011206) if (theLockingInset()) { owner()->message(_("Redo not yet supported in math mode")); return; - } - + } +#endif + if (available()) { owner()->message(_("Redo")); hideCursor(); @@ -262,10 +375,6 @@ void BufferView::copyEnvironment() { if (available()) { text->copyEnvironmentType(); - // clear the selection, even if mark_set - toggleSelection(); - text->clearSelection(this); - update(text, BufferView::SELECT|BufferView::FITCUR); owner()->message(_("Paragraph environment type copied")); } } @@ -284,22 +393,18 @@ void BufferView::pasteEnvironment() void BufferView::copy() { if (available()) { - text->copySelection(this); - // clear the selection, even if mark_set - toggleSelection(); - text->clearSelection(this); - update(text, BufferView::SELECT|BufferView::FITCUR); + getLyXText()->copySelection(this); 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")); } @@ -308,28 +413,32 @@ void BufferView::cut() void BufferView::paste() { - if (!available()) return; + if (!available()) + return; owner()->message(_("Paste")); hideCursor(); // clear the selection toggleSelection(); - text->clearSelection(this); + text->clearSelection(); update(text, BufferView::SELECT|BufferView::FITCUR); - + // paste text->pasteSelection(this); update(text, BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE); - - // clear the selection +// why fake a selection only I think it should be a real one and not only +// a painted one (Jug 20020318). +#if 0 + // clear the selection toggleSelection(); - text->clearSelection(this); + text->clearSelection(); update(text, BufferView::SELECT|BufferView::FITCUR); +#endif } -/* these functions are for the spellchecker */ +/* these functions are for the spellchecker */ string const BufferView::nextWord(float & value) { if (!available()) { @@ -337,16 +446,18 @@ string const BufferView::nextWord(float & value) return string(); } - return text->selectNextWord(this, value); + return text->selectNextWordToSpellcheck(this, value); } - + 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); @@ -356,11 +467,11 @@ void BufferView::selectLastWord() void BufferView::endOfSpellCheck() { if (!available()) return; - + hideCursor(); beforeChange(text); text->selectSelectedWord(this); - text->clearSelection(this); + text->clearSelection(); update(text, BufferView::SELECT|BufferView::FITCUR); } @@ -372,15 +483,15 @@ void BufferView::replaceWord(string const & replacestring) LyXText * tt = getLyXText(); hideCursor(); update(tt, BufferView::SELECT|BufferView::FITCUR); - - /* clear the selection (if there is any) */ + + /* clear the selection (if there is any) */ toggleSelection(false); update(tt, BufferView::SELECT|BufferView::FITCUR); - - /* clear the selection (if there is any) */ + + /* clear the selection (if there is any) */ toggleSelection(false); tt->replaceSelectionWithString(this, replacestring); - + tt->setSelectionOverString(this, replacestring); // Go back so that replacement string is also spellchecked @@ -394,31 +505,66 @@ void BufferView::replaceWord(string const & replacestring) bool BufferView::lockInset(UpdatableInset * inset) { - if (!theLockingInset() && inset) { - theLockingInset(inset); + if (!inset) + return false; + // don't relock if we're already locked + if (theLockingInset() == inset) return true; - } else if (inset) { - return theLockingInset()->lockInsetInInset(this, inset); + if (!theLockingInset()) { + // first check if it's the inset under the cursor we want lock + // should be most of the time + char const c = text->cursor.par()->getChar(text->cursor.pos()); + if (c == Paragraph::META_INSET) { + Inset * in = text->cursor.par()->getInset(text->cursor.pos()); + if (inset == in) { + theLockingInset(inset); + return true; + } + } + // Then do a deep look of the inset and lock the right one + Paragraph * par = buffer()->paragraph; + int const id = inset->id(); + while(par) { + Paragraph::inset_iterator it = + par->inset_iterator_begin(); + Paragraph::inset_iterator const end = + par->inset_iterator_end(); + for (; it != end; ++it) { + if ((*it) == inset) { + text->setCursorIntern(this, par, it.getPos()); + theLockingInset(inset); + return true; + } + if ((*it)->getInsetFromID(id)) { + text->setCursorIntern(this, par, it.getPos()); + (*it)->edit(this); + return theLockingInset()->lockInsetInInset(this, inset); + } + } + par = par->next(); + } + return false; } - return false; + return theLockingInset()->lockInsetInInset(this, inset); } void BufferView::showLockedInsetCursor(int x, int y, int asc, int desc) { - if (theLockingInset() && available()) { + if (available() && theLockingInset() && !theLockingInset()->nodraw()) { 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); 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() @@ -453,13 +599,18 @@ void BufferView::fitLockedInsetCursor(int x, int y, int asc, int desc) int BufferView::unlockInset(UpdatableInset * inset) { + if (!inset) + return 0; if (inset && theLockingInset() == inset) { inset->insetUnlock(this); theLockingInset(0); + // make sure we update the combo ! + owner()->setLayout(getLyXText()->cursor.par()->layout()); finishUndo(); return 0; } else if (inset && theLockingInset() && theLockingInset()->unlockInsetInInset(this, inset)) { + // owner inset has updated the layout combo finishUndo(); return 0; } @@ -474,8 +625,8 @@ void BufferView::lockedInsetStoreUndo(Undo::undo_kind kind) if (kind == Undo::EDIT) // in this case insets would not be stored! kind = Undo::FINISH; setUndo(this, kind, - text->cursor.par(), - text->cursor.par()->next()); + text->cursor.par(), + text->cursor.par()->next()); } @@ -488,38 +639,44 @@ void BufferView::updateInset(Inset * inset, bool mark_dirty) bool BufferView::ChangeInsets(Inset::Code code, string const & from, string const & to) { - bool flag = false; - Paragraph * par = buffer()->paragraph; + bool need_update = false; LyXCursor cursor = text->cursor; LyXCursor tmpcursor = cursor; cursor.par(tmpcursor.par()); cursor.pos(tmpcursor.pos()); - while (par) { - 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(*it); + ParIterator end = buffer()->par_iterator_end(); + for (ParIterator it = buffer()->par_iterator_begin(); + it != end; ++it) { + Paragraph * par = *it; + bool changed_inset = false; + 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; + changed_inset = true; } } } - 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); + if (changed_inset) { + need_update = true; + + // FIXME + + // 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; + return need_update; } @@ -527,19 +684,22 @@ bool BufferView::ChangeRefsIfUnique(string const & from, string const & to) { // Check if the label 'from' appears more than once vector labels = buffer()->getLabelList(); - if (count(labels.begin(), labels.end(), from) > 1) + + if (lyx::count(labels.begin(), labels.end(), from) > 1) return false; return ChangeInsets(Inset::REF_CODE, from, to); } -bool BufferView::ChangeCitationsIfUnique(string const & from, string const & to) +bool BufferView::ChangeCitationsIfUnique(string const & from, + string const & to) { + typedef pair StringPair; - vector > keys = buffer()->getBibkeyList(); - if (count_if(keys.begin(), keys.end(), - lyx::equal_1st_in_pair(from)) + vector keys = buffer()->getBibkeyList(); + if (count_if(keys.begin(), keys.end(), + lyx::equal_1st_in_pair(from)) > 1) return false;