X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferView.C;h=2be15d5e9009e3e493bc6c649a330df6f615f08f;hb=37e82a546392d43f787826b85481a11f2a27af15;hp=97def2dfae54995202995168892613aceb88b3fd;hpb=741064fa584d5f209a4b74bb4302c7d2fc1ea9dc;p=lyx.git diff --git a/src/BufferView.C b/src/BufferView.C index 97def2dfae..2be15d5e90 100644 --- a/src/BufferView.C +++ b/src/BufferView.C @@ -18,16 +18,22 @@ #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.h" #include "WordLangTuple.h" @@ -40,25 +46,24 @@ #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)), - x_target_(0) +BufferView::BufferView(LyXView * owner, int width, int height) + : pimpl_(new Pimpl(*this, owner, width, height)) {} @@ -68,6 +73,12 @@ BufferView::~BufferView() } +void BufferView::unsetXSel() +{ + pimpl_->xsel_cache_.set = false; +} + + Buffer * BufferView::buffer() const { return pimpl_->buffer_; @@ -92,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); } @@ -131,9 +142,9 @@ bool BufferView::fitCursor() } -void BufferView::update() +void BufferView::update(bool fitcursor, bool forceupdate) { - pimpl_->update(); + pimpl_->update(fitcursor, forceupdate); } @@ -149,12 +160,6 @@ void BufferView::scrollDocView(int value) } -void BufferView::redoCurrentBuffer() -{ - pimpl_->redoCurrentBuffer(); -} - - bool BufferView::available() const { return pimpl_->available(); @@ -203,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(); @@ -227,38 +220,21 @@ 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); - - text()->clearSelection(); - text()->breakParagraph(buffer()->paragraphs()); - - bool res = buffer()->readFile(fname, text()->cursorPar()); - resize(); - return res; + pimpl_->scroll(lines); } @@ -287,30 +263,21 @@ void BufferView::setCursorFromRow(int row) buffer()->texrow().getIdFromRow(row, tmpid, tmppos); if (tmpid == -1) - text()->setCursor(0, 0); + text()->setCursor(cursor(), 0, 0); else - text()->setCursor(buffer()->getParFromID(tmpid).pit(), tmppos); -} - - -bool BufferView::insertInset(InsetOld * inset, string const & lout) -{ - return pimpl_->insertInset(inset, lout); + 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()) { - text()->clearSelection(); - text()->setCursor( - std::distance(text()->ownerParagraphs().begin(), it.getPar()), - it.getPos()); - text()->selection.cursor = text()->cursor; + cursor().clearSelection(); + text()->setCursor(cursor(), it.pit(), it.pos()); + cursor().resetAnchor(); update(); return; } @@ -318,115 +285,64 @@ void BufferView::gotoLabel(string const & label) } -void BufferView::undo() -{ - if (!available()) - return; - - owner()->message(_("Undo")); - text()->clearSelection(); - if (!textUndo(this)) - owner()->message(_("No further undo information")); - update(); - switchKeyMap(); -} - - -void BufferView::redo() -{ - if (!available()) - return; - - owner()->message(_("Redo")); - text()->clearSelection(); - if (!textRedo(this)) - owner()->message(_("No further redo information")); - update(); - switchKeyMap(); -} - - -void BufferView::replaceWord(string const & replacestring) -{ - if (!available()) - return; - - LyXText * t = getLyXText(); - - t->replaceSelectionWithString(replacestring); - t->setSelectionRange(replacestring.length()); - - // Go back so that replacement string is also spellchecked - for (string::size_type i = 0; i < replacestring.length() + 1; ++i) - t->cursorLeft(this); - - // FIXME: should be done through LFUN - buffer()->markDirty(); - update(); -} - - void BufferView::hideCursor() { screen().hideCursor(); } -bool BufferView::ChangeRefsIfUnique(string const & from, string const & to) +LyXText * BufferView::getLyXText() const { - // Check if the label 'from' appears more than once - vector labels; - buffer()->getLabelList(labels); - - if (lyx::count(labels.begin(), labels.end(), from) > 1) - return false; - - return pimpl_->ChangeInsets(InsetOld::REF_CODE, from, to); + LyXText * text = cursor().innerText(); + BOOST_ASSERT(text); + return text; } -UpdatableInset * BufferView::innerInset() const +void BufferView::haveSelection(bool sel) { - return static_cast(cursor().innerInset()); + pimpl_->workarea().haveSelection(sel); } -LyXText * BufferView::getLyXText() const +int BufferView::workHeight() const { - return cursor().innerText(); + return pimpl_->workarea().workHeight(); } -Language const * BufferView::getParentLanguage(InsetOld * inset) const +LyXText * BufferView::text() const { - Paragraph const & par = ownerPar(*buffer(), inset); - return par.getFontSettings(buffer()->params(), - par.getPositionOfInset(inset)).language(); + return buffer() ? &buffer()->text() : 0; } -Encoding const * BufferView::getEncoding() const +void BufferView::setCursor(ParIterator const & par, lyx::pos_type pos) { - LyXText * t = getLyXText(); - if (!t) - return 0; - return t->cursorPar()->getFont( - buffer()->params(), - t->cursor.pos(), - outerFont(t->cursorPar(), t->ownerParagraphs()) - ).language()->encoding(); + for (int i = 0, n = par.size(); i < n; ++i) + par[i].inset().edit(cursor(), true); + + cursor().setCursor(makeDocIterator(par, pos)); + cursor().selection() = false; } -void BufferView::haveSelection(bool sel) +void BufferView::putSelectionAt(DocIterator const & cur, + int length, bool backwards) { - pimpl_->workarea().haveSelection(sel); -} + ParIterator par(cur); + cursor().clearSelection(); -int BufferView::workHeight() const -{ - return pimpl_->workarea().workHeight(); + setCursor(par, cur.pos()); + + if (length) { + if (backwards) { + cursor().pos() += length; + cursor().setSelection(cursor(), -length); + } else + cursor().setSelection(cursor(), length); + } } @@ -442,25 +358,13 @@ LCursor const & BufferView::cursor() const } -void BufferView::x_target(int x) +lyx::pit_type BufferView::anchor_ref() const { - x_target_ = x; + return pimpl_->anchor_ref_; } -int BufferView::x_target() const -{ - return x_target_; -} - - -void BufferView::updateParagraphDialog() -{ - pimpl_->updateParagraphDialog(); -} - - -LyXText * BufferView::text() const +int BufferView::offset_ref() const { - return pimpl_->buffer_ ? &pimpl_->buffer_->text() : 0; + return pimpl_->offset_ref_; }