// same Paragraph one to the right and make a rebreak
void LyXText::insertChar(char c)
{
- recordUndo(Undo::INSERT, this, cursor().par(), cursor().par());
+ recordUndo(bv()->cursor(), Undo::INSERT);
// When the free-spacing option is set for the current layout,
// disable the double-space checking
if (cur.selBegin().par() == cur.par()) {
CursorSlice const & startc = cur.selBegin();
CursorSlice const & endc = cur.selEnd();
- recordUndo(Undo::INSERT, this, startc.par());
+ recordUndo(cur, Undo::INSERT, cur.anchor().par());
getPar(startc)->acceptChange(startc.pos(), endc.pos());
finishUndo();
cur.clearSelection();
if (cur.selBegin().par() == cur.selEnd().par()) {
CursorSlice const & startc = cur.selBegin();
CursorSlice const & endc = cur.selEnd();
- recordUndo(Undo::INSERT, this, startc.par());
+ recordUndo(cur, Undo::INSERT, cur.anchor().par());
getPar(startc)->rejectChange(startc.pos(), endc.pos());
finishUndo();
cur.clearSelection();
setCursor(to.par(), to.pos() + 1);
}
- recordUndo(Undo::ATOMIC, this, from.par(), to.par());
+ recordUndo(cur, Undo::ATOMIC, cur.anchor().par());
pos_type pos = from.pos();
int par = from.par();
cursorRight(true);
// if you had success make a backspace
- if (old_cursor.par() != cursor().par() || old_cursor.pos() !=
-cursor().pos()) {
- recordUndo(Undo::DELETE, this, old_cursor.par());
+ if (old_cursor.par() != cursor().par()
+ || old_cursor.pos() != cursor().pos()) {
+ recordUndo(bv()->cursor(), Undo::DELETE, old_cursor.par());
backspace();
}
}
}
if (cursor().par() != 0)
- recordUndo(Undo::DELETE, this, cursor().par() - 1, cursor().par());
+ recordUndo(bv()->cursor(), Undo::DELETE, cursor().par() - 1);
ParagraphList::iterator tmppit = cursorPar();
// We used to do cursorLeftIntern() here, but it is
} else {
// this is the code for a normal backspace, not pasting
// any paragraphs
- recordUndo(Undo::DELETE, this, cursor().par());
+ recordUndo(bv()->cursor(), Undo::DELETE);
// We used to do cursorLeftIntern() here, but it is
// not a good idea since it triggers the auto-delete
// mechanism. So we do a cursorLeftIntern()-lite,
}
-ParagraphList::iterator LyXText::firstPar() const
-{
- return paragraphs().begin();
-}
-
-
RowList::iterator LyXText::lastRow() const
{
return boost::prior(endRow());
}
-ParagraphList::iterator LyXText::lastPar() const
-{
- return boost::prior(endPar());
-}
-
-
RowList::iterator LyXText::endRow() const
{
return paragraphs().back().rows.end();
}
-ParagraphList::iterator LyXText::endPar() const
-{
- return paragraphs().end();
-}
-
-
void LyXText::nextRow(ParagraphList::iterator & pit,
RowList::iterator & rit) const
{
}
-namespace {
-
-int findText(LyXText const * text)
-{
- CursorBase & cur = text->bv()->cursor().cursor_;
- //lyxerr << "findText: text: " << text << " cursor: "
- // << text->bv()->cursor() << endl;
- for (int i = cur.size() - 1; i > 0; --i)
- if (cur[i].text() == text)
- return i;
- if (text->bv()->text() == text)
- return 0;
- lyxerr << "Trying to access text not touched by cursor" << endl;
- BOOST_ASSERT(false);
- return 0; // shut up compiler
-}
-
-}
-
-
CursorSlice & LyXText::cursor()
{
//lyxerr << "# accessing slice " << findText(this) << endl;
- return bv()->cursor().cursor_[findText(this)];
+ if (this != bv()->cursor().text()) {
+ lyxerr << "cursor: " << bv()->cursor()
+ << "\ntext: " << bv()->cursor().text()
+ << "\nthis: " << this << endl;
+ BOOST_ASSERT(false);
+ }
+ return bv()->cursor().current();
}
CursorSlice const & LyXText::cursor() const
{
- return bv()->cursor().cursor_[findText(this)];
-}
-
-
-CursorSlice & LyXText::anchor()
-{
- return bv()->cursor().anchor_[findText(this)];
-}
-
-
-CursorSlice const & LyXText::anchor() const
-{
- return bv()->cursor().anchor_[findText(this)];
+ if (this != bv()->cursor().text()) {
+ lyxerr << "cursor: " << bv()->cursor()
+ << "\ntext: " << bv()->cursor().text()
+ << "\nthis: " << this << endl;
+ BOOST_ASSERT(false);
+ }
+ return bv()->cursor().current();
}