X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView.C;h=2be15d5e9009e3e493bc6c649a330df6f615f08f;hb=37e82a546392d43f787826b85481a11f2a27af15;hp=a71692b6826903e34f4bfda7b9654aa0c4cc1200;hpb=44cd0fc9a1687cc63911c7f98d978594458e7813;p=lyx.git diff --git a/src/BufferView.C b/src/BufferView.C index a71692b682..2be15d5e90 100644 --- a/src/BufferView.C +++ b/src/BufferView.C @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Alfredo Braustein + * \author Alfredo Braunstein * \author Lars Gullik Bjønnes * \author John Levon * \author André Pönitz @@ -18,17 +18,24 @@ #include "buffer.h" #include "bufferlist.h" +#include "bufferparams.h" #include "BufferView_pimpl.h" +#include "CutAndPaste.h" +#include "coordcache.h" +#include "debug.h" #include "funcrequest.h" +#include "FuncStatus.h" #include "gettext.h" -#include "iterators.h" +#include "insetiterator.h" #include "language.h" #include "lyxlayout.h" #include "lyxtext.h" +#include "lyxtextclass.h" #include "paragraph.h" #include "paragraph_funcs.h" +#include "pariterator.h" #include "texrow.h" -#include "undo_funcs.h" +#include "undo.h" #include "WordLangTuple.h" #include "frontends/Alert.h" @@ -39,36 +46,39 @@ #include "insets/insetcommand.h" // ChangeRefs #include "insets/updatableinset.h" - -#include "support/filetools.h" -#include "support/lyxalgo.h" // lyx_count +#include "insets/insettext.h" using lyx::support::bformat; -using lyx::support::MakeAbsPath; +using lyx::cap::setSelectionRange; + +using std::distance; using std::find; using std::string; +using std::swap; using std::vector; extern BufferList bufferlist; -BufferView::BufferView(LyXView * owner, int xpos, int ypos, - int width, int height) - : pimpl_(new Pimpl(this, owner, xpos, ypos, width, height)) -{ - text = 0; -} +BufferView::BufferView(LyXView * owner, int width, int height) + : pimpl_(new Pimpl(*this, owner, width, height)) +{} BufferView::~BufferView() { - delete text; delete pimpl_; } +void BufferView::unsetXSel() +{ + pimpl_->xsel_cache_.set = false; +} + + Buffer * BufferView::buffer() const { return pimpl_->buffer_; @@ -93,15 +103,15 @@ Painter & BufferView::painter() const } -void BufferView::buffer(Buffer * b) +void BufferView::setBuffer(Buffer * b) { - pimpl_->buffer(b); + pimpl_->setBuffer(b); } -bool BufferView::newFile(string const & fn, string const & tn, bool named) +void BufferView::newFile(string const & fn, string const & tn, bool named) { - return pimpl_->newFile(fn, tn, named); + pimpl_->newFile(fn, tn, named); } @@ -132,9 +142,9 @@ bool BufferView::fitCursor() } -void BufferView::update() +void BufferView::update(bool fitcursor, bool forceupdate) { - pimpl_->update(); + pimpl_->update(fitcursor, forceupdate); } @@ -150,12 +160,6 @@ void BufferView::scrollDocView(int value) } -void BufferView::redoCurrentBuffer() -{ - pimpl_->redoCurrentBuffer(); -} - - bool BufferView::available() const { return pimpl_->available(); @@ -168,12 +172,6 @@ Change const BufferView::getCurrentChange() } -void BufferView::beforeChange(LyXText * text) -{ - pimpl_->beforeChange(text); -} - - void BufferView::savePosition(unsigned int i) { pimpl_->savePosition(i); @@ -198,12 +196,6 @@ void BufferView::switchKeyMap() } -void BufferView::insetUnlock() -{ - pimpl_->insetUnlock(); -} - - int BufferView::workWidth() const { return pimpl_->workarea().workWidth(); @@ -216,18 +208,6 @@ void BufferView::center() } -int BufferView::top_y() const -{ - return pimpl_->top_y(); -} - - -void BufferView::top_y(int y) -{ - pimpl_->top_y(y); -} - - string const BufferView::getClipboard() const { return pimpl_->workarea().getClipboard(); @@ -240,55 +220,36 @@ void BufferView::stuffClipboard(string const & stuff) const } -bool BufferView::dispatch(FuncRequest const & ev) +FuncStatus BufferView::getStatus(FuncRequest const & cmd) { - return pimpl_->dispatch(ev); + return pimpl_->getStatus(cmd); } -void BufferView::scroll(int lines) +bool BufferView::dispatch(FuncRequest const & ev) { - pimpl_->scroll(lines); + return pimpl_->dispatch(ev); } -// Inserts a file into current document -bool BufferView::insertLyXFile(string const & filen) - // - // Copyright CHT Software Service GmbH - // Uwe C. Schroeder - // - // Insert a LyXformat - file into current buffer - // - // Moved from lyx_cb.C (Lgb) +void BufferView::scroll(int lines) { - BOOST_ASSERT(!filen.empty()); - - string const fname = MakeAbsPath(filen); - - beforeChange(text); - - text->breakParagraph(buffer()->paragraphs()); - - bool res = buffer()->readFile(fname, text->cursor.par()); - - resize(); - return res; + pimpl_->scroll(lines); } void BufferView::showErrorList(string const & action) const { if (getErrorList().size()) { - string const title = bformat(_("LyX: %1$s errors (%2$s)"), action, buffer()->fileName()); + string const title = bformat(_("LyX: %1$s errors (%2$s)"), + action, buffer()->fileName()); owner()->getDialogs().show("errorlist", title); pimpl_->errorlist_.clear(); } } -ErrorList const & -BufferView::getErrorList() const +ErrorList const & BufferView::getErrorList() const { return pimpl_->errorlist_; } @@ -301,34 +262,22 @@ void BufferView::setCursorFromRow(int row) buffer()->texrow().getIdFromRow(row, tmpid, tmppos); - ParagraphList::iterator texrowpar; - - if (tmpid == -1) { - texrowpar = text->ownerParagraphs().begin(); - tmppos = 0; - } else { - texrowpar = buffer()->getParFromID(tmpid).pit(); - } - text->setCursor(texrowpar, tmppos); -} - - -bool BufferView::insertInset(InsetOld * inset, string const & lout) -{ - return pimpl_->insertInset(inset, lout); + if (tmpid == -1) + text()->setCursor(cursor(), 0, 0); + else + text()->setCursor(cursor(), buffer()->getParFromID(tmpid).pit(), tmppos); } void BufferView::gotoLabel(string const & label) { - for (Buffer::inset_iterator it = buffer()->inset_iterator_begin(); - it != buffer()->inset_iterator_end(); ++it) { + for (InsetIterator it = inset_iterator_begin(buffer()->inset()); it; ++it) { vector labels; it->getLabelList(*buffer(), labels); if (find(labels.begin(),labels.end(),label) != labels.end()) { - beforeChange(text); - text->setCursor(it.getPar(), it.getPos()); - text->selection.cursor = text->cursor; + cursor().clearSelection(); + text()->setCursor(cursor(), it.pit(), it.pos()); + cursor().resetAnchor(); update(); return; } @@ -336,248 +285,86 @@ void BufferView::gotoLabel(string const & label) } -void BufferView::undo() -{ - if (!available()) - return; - - owner()->message(_("Undo")); - beforeChange(text); - if (!textUndo(this)) - owner()->message(_("No further undo information")); - update(); - switchKeyMap(); -} - - -void BufferView::redo() -{ - if (!available()) - return; - - owner()->message(_("Redo")); - beforeChange(text); - if (!textRedo(this)) - owner()->message(_("No further redo information")); - update(); - switchKeyMap(); -} - - -// these functions are for the spellchecker -WordLangTuple const BufferView::nextWord(float & value) -{ - if (!available()) { - value = 1; - return WordLangTuple(); - } - - return text->selectNextWordToSpellcheck(value); -} - - -void BufferView::selectLastWord() -{ - if (!available()) - return; - - LyXCursor cur = text->selection.cursor; - beforeChange(text); - text->selection.cursor = cur; - text->selectSelectedWord(); - update(); -} - - -void BufferView::endOfSpellCheck() -{ - if (!available()) return; - - beforeChange(text); - text->selectSelectedWord(); - text->clearSelection(); - update(); -} - - -void BufferView::replaceWord(string const & replacestring) -{ - if (!available()) - return; - - LyXText * tt = getLyXText(); - - tt->replaceSelectionWithString(replacestring); - tt->setSelectionRange(replacestring.length()); - - // Go back so that replacement string is also spellchecked - for (string::size_type i = 0; i < replacestring.length() + 1; ++i) - tt->cursorLeft(this); - - // FIXME: should be done through LFUN - buffer()->markDirty(); - update(); -} - - -bool BufferView::lockInset(UpdatableInset * inset) +void BufferView::hideCursor() { - if (!inset) - return false; - // don't relock if we're already locked - if (theLockingInset() == inset) - return true; - if (!theLockingInset()) { - // first check if it's the inset under the cursor we want lock - // should be most of the time - 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; - } - } - // Then do a deep look of the inset and lock the right one - int const id = inset->id(); - ParagraphList::iterator pit = buffer()->paragraphs().begin(); - ParagraphList::iterator pend = buffer()->paragraphs().end(); - for (; pit != pend; ++pit) { - InsetList::iterator it = pit->insetlist.begin(); - InsetList::iterator end = pit->insetlist.end(); - for (; it != end; ++it) { - if (it->inset == inset) { - text->setCursorIntern(pit, it->pos); - theLockingInset(inset); - return true; - } - } - } - return false; - } - return theLockingInset()->lockInsetInInset(this, inset); + screen().hideCursor(); } -bool BufferView::fitLockedInsetCursor(int x, int y, int asc, int desc) +LyXText * BufferView::getLyXText() const { - if (theLockingInset() && available()) { - y += text->cursor.y() + theLockingInset()->insetInInsetY(); - if (screen().fitManualCursor(this, text, x, y, asc, desc)) { - updateScrollbar(); - return true; - } - } - return false; + LyXText * text = cursor().innerText(); + BOOST_ASSERT(text); + return text; } -void BufferView::hideCursor() +void BufferView::haveSelection(bool sel) { - screen().hideCursor(); + pimpl_->workarea().haveSelection(sel); } -int BufferView::unlockInset(UpdatableInset * inset) +int BufferView::workHeight() const { - 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()->name()); - // Tell the paragraph dialog that we changed paragraph - dispatch(FuncRequest(LFUN_PARAGRAPH_UPDATE)); - finishUndo(); - return 0; - } - if (inset && theLockingInset() && - theLockingInset()->unlockInsetInInset(this, inset)) { - // Tell the paragraph dialog that we changed paragraph - dispatch(FuncRequest(LFUN_PARAGRAPH_UPDATE)); - // owner inset has updated the layout combo - finishUndo(); - return 0; - } - return 1; + return pimpl_->workarea().workHeight(); } -void BufferView::updateInset(InsetOld const * inset) +LyXText * BufferView::text() const { - pimpl_->updateInset(inset); + return buffer() ? &buffer()->text() : 0; } -bool BufferView::ChangeRefsIfUnique(string const & from, string const & to) +void BufferView::setCursor(ParIterator const & par, lyx::pos_type pos) { - // Check if the label 'from' appears more than once - vector labels; - buffer()->getLabelList(labels); + for (int i = 0, n = par.size(); i < n; ++i) + par[i].inset().edit(cursor(), true); - if (lyx::count(labels.begin(), labels.end(), from) > 1) - return false; - - return pimpl_->ChangeInsets(InsetOld::REF_CODE, from, to); + cursor().setCursor(makeDocIterator(par, pos)); + cursor().selection() = false; } -UpdatableInset * BufferView::theLockingInset() const +void BufferView::putSelectionAt(DocIterator const & cur, + int length, bool backwards) { - // If NULL is not allowed we should put an Assert here. (Lgb) - if (text) - return text->the_locking_inset; - return 0; -} + ParIterator par(cur); + cursor().clearSelection(); -void BufferView::theLockingInset(UpdatableInset * inset) -{ - text->the_locking_inset = inset; -} + setCursor(par, cur.pos()); - -LyXText * BufferView::getLyXText() const -{ - if (theLockingInset()) { - LyXText * txt = theLockingInset()->getLyXText(this, true); - if (txt) - return txt; + if (length) { + if (backwards) { + cursor().pos() += length; + cursor().setSelection(cursor(), -length); + } else + cursor().setSelection(cursor(), length); } - return text; } -Language const * BufferView::getParentLanguage(InsetOld * inset) const +LCursor & BufferView::cursor() { - Paragraph const & par = ownerPar(*buffer(), inset); - return par.getFontSettings(buffer()->params(), - par.getPositionOfInset(inset)).language(); + return pimpl_->cursor_; } -Encoding const * BufferView::getEncoding() const +LCursor const & BufferView::cursor() const { - LyXText * t = getLyXText(); - if (!t) - return 0; - - LyXCursor const & c = t->cursor; - LyXFont const font = c.par()->getFont(buffer()->params(), c.pos(), - outerFont(c.par(), t->ownerParagraphs())); - return font.language()->encoding(); + return pimpl_->cursor_; } -void BufferView::haveSelection(bool sel) +lyx::pit_type BufferView::anchor_ref() const { - pimpl_->workarea().haveSelection(sel); + return pimpl_->anchor_ref_; } -int BufferView::workHeight() const +int BufferView::offset_ref() const { - return pimpl_->workarea().workHeight(); + return pimpl_->offset_ref_; }