#include "CutAndPaste.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"
#include "insets/updatableinset.h"
#include "insets/insettext.h"
-#include "support/filetools.h"
-#include "support/lyxalgo.h" // lyx_count
-
using lyx::support::bformat;
-using lyx::support::MakeAbsPath;
using lyx::cap::setSelectionRange;
extern BufferList bufferlist;
-BufferView::BufferView(LyXView * owner, int xpos, int ypos,
- int width, int height)
- : pimpl_(new Pimpl(*this, owner, xpos, ypos, width, height))
+BufferView::BufferView(LyXView * owner, int width, int height)
+ : pimpl_(new Pimpl(*this, owner, width, height))
{}
}
-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);
-
- cursor().clearSelection();
- text()->breakParagraph(cursor());
-
- BOOST_ASSERT(cursor().inTexted());
- bool res = buffer()->readFile(fname, cursor().par());
- resize();
- return res;
+ pimpl_->scroll(lines);
}
if (tmpid == -1)
text()->setCursor(cursor(), 0, 0);
else
- text()->setCursor(cursor(), buffer()->getParFromID(tmpid).pit(),
- tmppos);
+ 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<string> labels;
it->getLabelList(*buffer(), labels);
if (find(labels.begin(),labels.end(),label) != labels.end()) {
cursor().clearSelection();
- text()->setCursor(cursor(), it.getPar(), it.getPos());
+ text()->setCursor(cursor(), it.pit(), it.pos());
cursor().resetAnchor();
update();
return;
}
-Language const * BufferView::getParentLanguage(InsetOld * inset) const
-{
- Paragraph const & par = ownerPar(*buffer(), inset);
- return par.getFontSettings(buffer()->params(),
- par.getPositionOfInset(inset)).language();
-}
-
-
void BufferView::haveSelection(bool sel)
{
pimpl_->workarea().haveSelection(sel);
void BufferView::setCursor(ParIterator const & par, lyx::pos_type pos)
{
- LCursor & cur = cursor();
- cur.reset(buffer()->inset());
- ParIterator::PosHolder const & positions = par.positions();
- int const last = par.size() - 1;
+ int const last = par.size();
for (int i = 0; i < last; ++i)
- (*positions[i].it)->inset->edit(cur, true);
- cur.resetAnchor();
- par.text(*buffer())->setCursor(cur, par.pit(), pos);
-}
+ par[i].inset().edit(cursor(), true);
+ cursor().setCursor(makeDocIterator(par, pos));
+ cursor().selection() = false;
+ par.bottom().text()->redoParagraph(par.bottom().pit());
+}
-/*
-if the fitCursor call refers to some point in never-explored-land, then we
-don't have y information in insets there, then we cannot even do an update
-to get it (because we need the y infomation for setting top_y first). So
-this is solved in putSelectionAt with:
-
-- setting top_y to the y of the outerPar (that has good info)
-- calling update
-- calling cursor().updatePos()
-- then call fitCursor()
-
-Ab.
-*/
-void BufferView::putSelectionAt(DocumentIterator const & cur,
- int length, bool backwards)
+void BufferView::putSelectionAt(DocIterator const & cur,
+ int length, bool backwards)
{
ParIterator par(cur);
cursor().clearSelection();
- LyXText * text = par.text(*buffer());
setCursor(par, cur.pos());
-
- // hack for the chicken and egg problem
- if (par.inset())
- top_y(text->getPar(par.outerPar()).y);
- update();
- text->setCursor(cursor(), cur.par(), cur.pos());
- cursor().updatePos();
if (length) {
- setSelectionRange(cursor(), length);
- cursor().setSelection();
if (backwards) {
- DocumentIterator const it = cursor();
- cursor().setCursor(cursor().anchor_, false);
- cursor().anchor_ = it;
- }
+ cursor().pos() += length;
+ cursor().setSelection(cursor(), -length);
+ } else
+ cursor().setSelection(cursor(), length);
}
-
- fitCursor();
- update();
}