X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView.C;h=8a7bee84b17775a0551cb9843ed534cf10371ba5;hb=5eb1059f506d5db92d85e93057e752422e014ec2;hp=4a3df4e4e042f1cd89904582d8ee946fc6888330;hpb=770092ed6b98556742e5576510de94c37bb07a4c;p=lyx.git diff --git a/src/BufferView.C b/src/BufferView.C index 4a3df4e4e0..8a7bee84b1 100644 --- a/src/BufferView.C +++ b/src/BufferView.C @@ -3,7 +3,7 @@ * Copyright 1995-2002 the LyX Team * Read the file COPYING * - * \author unknown + * \author Lars Gullik Bjønnes * \author John Levon */ @@ -12,7 +12,6 @@ #include "BufferView.h" #include "BufferView_pimpl.h" -#include "BufferView_pimpl.h" #include "LaTeX.h" #include "ParagraphParameters.h" #include "WordLangTuple.h" @@ -20,6 +19,7 @@ #include "bufferlist.h" #include "debug.h" #include "gettext.h" +#include "errorlist.h" #include "iterators.h" #include "language.h" #include "lyxcursor.h" @@ -27,6 +27,7 @@ #include "lyxtext.h" #include "undo_funcs.h" #include "changes.h" +#include "paragraph_funcs.h" #include "frontends/Alert.h" #include "frontends/Dialogs.h" @@ -35,21 +36,19 @@ #include "frontends/screen.h" #include "insets/insetcommand.h" // ChangeRefs -#include "insets/inseterror.h" #include "insets/updatableinset.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 "BoostFormat.h" #include extern BufferList bufferlist; using lyx::pos_type; +using namespace lyx::support; using std::pair; using std::endl; @@ -104,19 +103,30 @@ void BufferView::buffer(Buffer * b) } +bool BufferView::newFile(string const & fn, string const & tn, bool named) +{ + return pimpl_->newFile(fn, tn, named); +} + + +bool BufferView::loadLyXFile(string const & fn, bool tl) +{ + return pimpl_->loadLyXFile(fn, tl); +} + + void BufferView::reload() { string const fn = buffer()->fileName(); if (bufferlist.close(buffer(), false)) - buffer(bufferlist.loadLyXFile(fn)); + loadLyXFile(fn); } void BufferView::resize() { - if (pimpl_->buffer_) { + if (pimpl_->buffer_) pimpl_->resizeCurrentBuffer(); - } } @@ -222,30 +232,12 @@ int BufferView::workWidth() const } -void BufferView::showCursor() -{ - pimpl_->showCursor(); -} - - -void BufferView::hideCursor() -{ - pimpl_->hideCursor(); -} - - void BufferView::toggleSelection(bool b) { pimpl_->toggleSelection(b); } -void BufferView::toggleToggle() -{ - pimpl_->toggleToggle(); -} - - void BufferView::center() { pimpl_->center(); @@ -304,14 +296,8 @@ bool BufferView::insertLyXFile(string const & filen) if (!fi.readable()) { string const file = MakeDisplayPath(fname, 50); -#if USE_BOOST_FORMAT - boost::format fmt(_("The specified document\n%1$s\ncould not be read.")); - fmt % file; - string text = fmt.str(); -#else - string text = _("The specified document\n"); - text += file + _(" could not be read."); -#endif + string const text = + bformat(_("The specified document\n%1$s\ncould not be read."), file); Alert::error(_("Could not read document"), text); return false; } @@ -320,18 +306,9 @@ bool BufferView::insertLyXFile(string const & filen) ifstream ifs(fname.c_str()); if (!ifs) { - string const error = strerror(errno); string const file = MakeDisplayPath(fname, 50); -#if USE_BOOST_FORMAT - boost::format fmt(_("Could not open the specified document\n%1$s\ndue to the error: %2$s")); - fmt % file; - fmt % error; - string text = fmt.str(); -#else - string text = _("Could not open the specified document\n"); - text += file + _(" due to the error: "); - text += error; -#endif + string const text = + bformat(_("Could not open the specified document %1$s\n"), file); Alert::error(_("Could not open file"), text); return false; } @@ -343,6 +320,8 @@ bool BufferView::insertLyXFile(string const & filen) bool res = true; + text->breakParagraph(buffer()->paragraphs); + if (c == '#') { // FIXME: huh ? No we won't ! lyxerr[Debug::INFO] << "Will insert file with header" << endl; @@ -358,184 +337,20 @@ bool BufferView::insertLyXFile(string const & filen) } -bool BufferView::removeAutoInsets() -{ - // 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( - 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(); - } - - // 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(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"; - } - } - - InsetList::iterator pit = par->insetlist.begin(); - InsetList::iterator pend = par->insetlist.end(); - - while (pit != pend) { - if (pit.getInset()->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->insetlist.insetIterator(pos); - // and ensure we have a valid end iterator. - pend = par->insetlist.end(); - - if (cursor_par == par) { - // update the saved cursor position - if (cursor_pos > pos) - --cursor_pos; - } - } else { - ++pit; - } - } - if (removed) { - found = true; - text->redoParagraph(); - } - } - - // 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(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(); +void BufferView::showErrorList(string const & action) const +{ + if (getErrorList().size()) { + string const title = bformat(_("LyX: %1$s errors (%2$s)"), action, buffer()->fileName()); + owner()->getDialogs().show("errorlist", title); + pimpl_->errorlist_.clear(); } - - // restore the original cursor in its corrected location. - text->setCursorIntern(cursor_par, cursor_pos); - - return found; } -void BufferView::insertErrors(TeXErrors & terr) +ErrorList const & +BufferView::getErrorList() const { - // Save the cursor position - LyXCursor cursor = text->cursor; - - 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 tmppos = -1; - - if (buffer()->texrow.getIdFromRow(errorrow, tmpid, tmppos)) { - buffer()->texrow.increasePos(tmpid, tmppos); - } - - Paragraph * texrowpar = 0; - - if (tmpid == -1) { - texrowpar = text->ownerParagraph(); - tmppos = 0; - } else { - texrowpar = buffer()->getParFromID(tmpid); - } - - if (texrowpar == 0) - continue; - - freezeUndo(); - InsetError * new_inset = new InsetError(msgtxt); - text->setCursorIntern(texrowpar, tmppos); - text->insertInset(new_inset); - text->fullRebreak(); - unFreezeUndo(); - } - // Restore the cursor position - text->setCursorIntern(cursor.par(), cursor.pos()); + return pimpl_->errorlist_; } @@ -546,44 +361,39 @@ void BufferView::setCursorFromRow(int row) buffer()->texrow.getIdFromRow(row, tmpid, tmppos); - Paragraph * texrowpar; + ParagraphList::iterator texrowpar; if (tmpid == -1) { - texrowpar = text->ownerParagraph(); + texrowpar = text->ownerParagraphs().begin(); tmppos = 0; } else { - texrowpar = buffer()->getParFromID(tmpid); + texrowpar = buffer()->getParFromID(tmpid).pit(); } text->setCursor(texrowpar, tmppos); } -bool BufferView::insertInset(Inset * inset, string const & lout) +bool BufferView::insertInset(InsetOld * inset, string const & lout) { return pimpl_->insertInset(inset, lout); } -// This is also a buffer property (ale) -// Not so sure about that. a goto Label function can not be buffer local, just -// think how this will work in a multiwindow/buffer environment, all the -// cursors in all the views showing this buffer will move. (Lgb) -// OK, then no cursor action should be allowed in buffer. (ale) -bool BufferView::gotoLabel(string const & label) +void BufferView::gotoLabel(string const & label) { for (Buffer::inset_iterator it = buffer()->inset_iterator_begin(); it != buffer()->inset_iterator_end(); ++it) { - vector labels = it->getLabelList(); + vector labels; + it->getLabelList(labels); if (find(labels.begin(),labels.end(),label) != labels.end()) { beforeChange(text); text->setCursor(it.getPar(), it.getPos()); text->selection.cursor = text->cursor; update(text, BufferView::SELECT); - return true; + return; } } - return false; } @@ -593,7 +403,6 @@ void BufferView::undo() return; owner()->message(_("Undo")); - hideCursor(); beforeChange(text); update(text, BufferView::SELECT); if (!textUndo(this)) @@ -610,7 +419,6 @@ void BufferView::redo() return; owner()->message(_("Redo")); - hideCursor(); beforeChange(text); update(text, BufferView::SELECT); if (!textRedo(this)) @@ -621,25 +429,6 @@ void BufferView::redo() } -void BufferView::copyEnvironment() -{ - if (available()) { - text->copyEnvironmentType(); - owner()->message(_("Paragraph environment type copied")); - } -} - - -void BufferView::pasteEnvironment() -{ - if (available()) { - text->pasteEnvironmentType(); - owner()->message(_("Paragraph environment type set")); - update(text, BufferView::SELECT); - } -} - - // these functions are for the spellchecker WordLangTuple const BufferView::nextWord(float & value) { @@ -658,7 +447,6 @@ void BufferView::selectLastWord() return; LyXCursor cur = text->selection.cursor; - hideCursor(); beforeChange(text); text->selection.cursor = cur; text->selectSelectedWord(); @@ -671,7 +459,6 @@ void BufferView::endOfSpellCheck() { if (!available()) return; - hideCursor(); beforeChange(text); text->selectSelectedWord(); text->clearSelection(); @@ -685,7 +472,6 @@ void BufferView::replaceWord(string const & replacestring) return; LyXText * tt = getLyXText(); - hideCursor(); update(tt, BufferView::SELECT); // clear the selection (if there is any) @@ -721,9 +507,10 @@ bool BufferView::lockInset(UpdatableInset * 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 (text->cursor.pos() < text->cursor.par()->size() + && text->cursor.par()->getChar(text->cursor.pos()) == + Paragraph::META_INSET) { + InsetOld * in = text->cursor.par()->getInset(text->cursor.pos()); if (inset == in) { theLockingInset(inset); return true; @@ -737,14 +524,15 @@ bool BufferView::lockInset(UpdatableInset * inset) InsetList::iterator it = pit->insetlist.begin(); InsetList::iterator end = pit->insetlist.end(); for (; it != end; ++it) { - if (it.getInset() == inset) { - text->setCursorIntern(&*pit, it.getPos()); + if (it->inset == inset) { + text->setCursorIntern(pit, it->pos); theLockingInset(inset); return true; } - if (it.getInset()->getInsetFromID(id)) { - text->setCursorIntern(&*pit, it.getPos()); - it.getInset()->edit(this); + if (it->inset->getInsetFromID(id)) { + text->setCursorIntern(pit, it->pos); + FuncRequest cmd(this, LFUN_INSET_EDIT, "left"); + it->inset->localDispatch(cmd); return theLockingInset()->lockInsetInInset(this, inset); } } @@ -755,44 +543,6 @@ bool BufferView::lockInset(UpdatableInset * inset) } -void BufferView::showLockedInsetCursor(int x, int y, int asc, int desc) -{ - if (available() && theLockingInset() && !theLockingInset()->nodraw()) { - LyXCursor cursor = text->cursor; - Inset * locking_inset = theLockingInset()->getLockingInset(); - - if ((cursor.pos() - 1 >= 0) && - cursor.par()->isInset(cursor.pos() - 1) && - (cursor.par()->getInset(cursor.pos() - 1) == - locking_inset)) - text->setCursor(cursor, - cursor.par(), cursor.pos() - 1); - LyXScreen::Cursor_Shape shape = LyXScreen::BAR_SHAPE; - LyXText * txt = getLyXText(); - if (locking_inset->isTextInset() && - locking_inset->lyxCode() != Inset::ERT_CODE && - (txt->real_current_font.language() != - buffer()->params.language - || txt->real_current_font.isVisibleRightToLeft() - != buffer()->params.language->RightToLeft())) - shape = (txt->real_current_font.isVisibleRightToLeft()) - ? LyXScreen::REVERSED_L_SHAPE - : LyXScreen::L_SHAPE; - y += cursor.iy() + theLockingInset()->insetInInsetY(); - screen().showManualCursor(text, x, y, asc, desc, - shape); - } -} - - -void BufferView::hideLockedInsetCursor() -{ - if (theLockingInset() && available()) { - screen().hideCursor(); - } -} - - bool BufferView::fitLockedInsetCursor(int x, int y, int asc, int desc) { if (theLockingInset() && available()) { @@ -806,6 +556,12 @@ bool BufferView::fitLockedInsetCursor(int x, int y, int asc, int desc) } +void BufferView::hideCursor() +{ + screen().hideCursor(); +} + + int BufferView::unlockInset(UpdatableInset * inset) { if (!inset) @@ -831,25 +587,13 @@ int BufferView::unlockInset(UpdatableInset * inset) } -void BufferView::lockedInsetStoreUndo(Undo::undo_kind kind) -{ - if (!theLockingInset()) - return; // shouldn't happen - 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()); -} - - -void BufferView::updateInset(Inset * inset) +void BufferView::updateInset(InsetOld * inset) { pimpl_->updateInset(inset); } -bool BufferView::ChangeInsets(Inset::Code code, +bool BufferView::ChangeInsets(InsetOld::Code code, string const & from, string const & to) { bool need_update = false; @@ -861,12 +605,11 @@ bool BufferView::ChangeInsets(Inset::Code code, ParIterator end = buffer()->par_iterator_end(); for (ParIterator it = buffer()->par_iterator_begin(); it != end; ++it) { - Paragraph * par = *it; bool changed_inset = false; - for (InsetList::iterator it2 = par->insetlist.begin(); - it2 != par->insetlist.end(); ++it2) { - if (it2.getInset()->lyxCode() == code) { - InsetCommand * inset = static_cast(it2.getInset()); + for (InsetList::iterator it2 = it->insetlist.begin(); + it2 != it->insetlist.end(); ++it2) { + if (it2->inset->lyxCode() == code) { + InsetCommand * inset = static_cast(it2->inset); if (inset->getContents() == from) { inset->setContents(to); changed_inset = true; @@ -881,10 +624,9 @@ bool BufferView::ChangeInsets(Inset::Code code, // 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(par, 0); - text->redoParagraphs(text->cursor, - text->cursor.par()->next()); - text->fullRebreak(); + text->setCursorIntern(it.pit(), 0); + text->redoParagraph(text->cursor.par()); + text->partialRebreak(); } } } @@ -896,27 +638,13 @@ bool BufferView::ChangeInsets(Inset::Code code, bool BufferView::ChangeRefsIfUnique(string const & from, string const & to) { // Check if the label 'from' appears more than once - vector labels = buffer()->getLabelList(); + vector labels; + buffer()->getLabelList(labels); 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) -{ - typedef pair StringPair; - - vector keys; - buffer()->fillWithBibKeys(keys); - if (count_if(keys.begin(), keys.end(), - lyx::equal_1st_in_pair(from)) - > 1) - return false; - - return ChangeInsets(Inset::CITE_CODE, from, to); + return ChangeInsets(InsetOld::REF_CODE, from, to); } @@ -946,7 +674,7 @@ LyXText * BufferView::getLyXText() const } -LyXText * BufferView::getParentText(Inset * inset) const +LyXText * BufferView::getParentText(InsetOld * inset) const { if (inset->owner()) { LyXText * txt = inset->getLyXText(this); @@ -960,7 +688,7 @@ LyXText * BufferView::getParentText(Inset * inset) const } -Language const * BufferView::getParentLanguage(Inset * inset) const +Language const * BufferView::getParentLanguage(InsetOld * inset) const { LyXText * text = getParentText(inset); return text->cursor.par()->getFontSettings(buffer()->params, @@ -974,8 +702,9 @@ Encoding const * BufferView::getEncoding() const if (!t) return 0; - LyXCursor const & c= t->cursor; - LyXFont const font = c.par()->getFont(buffer()->params, c.pos()); + LyXCursor const & c = t->cursor; + LyXFont const font = c.par()->getFont(buffer()->params, c.pos(), + outerFont(c.par(), t->ownerParagraphs())); return font.language()->encoding(); }