#include "buffer.h"
#include "bufferparams.h"
#include "BufferView.h"
+#include "cursor.h"
#include "debug.h"
#include "dispatchresult.h"
#include "encoding.h"
using lyx::support::lowercase;
using lyx::support::uppercase;
+using std::advance;
+using std::distance;
using std::max;
using std::endl;
using std::string;
{
LyXTextClass const & tclass = bv()->buffer()->params().getLyXTextClass();
- return
+ return
RIGHT_MARGIN
+ font_metrics::signedWidth(tclass.rightmargin(),
tclass.defaultfont())
// are taken from the layoutfont. Nicer on the screen :)
LyXLayout_ptr const & layout = pit->layout();
- // as max get the first character of this row then it can increase but not
- // decrease the height. Just some point to start with so we don't have to
- // do the assignment below too often.
+ // as max get the first character of this row then it can
+ // increase but not decrease the height. Just some point to
+ // start with so we don't have to do the assignment below too
+ // often.
LyXFont font = getFont(pit, row.pos());
LyXFont::FONT_SIZE const tmpsize = font.size();
font = getLayoutFont(pit);
{
// allow only if at start or end, or all previous is new text
ParagraphList::iterator cpit = cursorPar();
- if (cursor.pos() && cursor.pos() != cpit->size()
- && cpit->isChangeEdited(0, cursor.pos()))
+ if (cursor().pos() && cursor().pos() != cpit->size()
+ && cpit->isChangeEdited(0, cursor().pos()))
return;
LyXTextClass const & tclass =
bv()->buffer()->params().getLyXTextClass();
LyXLayout_ptr const & layout = cpit->layout();
- // this is only allowed, if the current paragraph is not empty or caption
- // and if it has not the keepempty flag active
+ // this is only allowed, if the current paragraph is not empty
+ // or caption and if it has not the keepempty flag active
if (cpit->empty() && !cpit->allowEmpty()
&& layout->labeltype != LABEL_SENSITIVE)
return;
- recUndo(cursor.par());
+ // a layout change may affect also the following paragraph
+ recUndo(cursor().par(), parOffset(undoSpan(cpit)) - 1);
// Always break behind a space
- //
// It is better to erase the space (Dekel)
- if (cursor.pos() < cpit->size() && cpit->isLineSeparator(cursor.pos()))
- cpit->erase(cursor.pos());
+ if (cursor().pos() < cpit->size() && cpit->isLineSeparator(cursor().pos()))
+ cpit->erase(cursor().pos());
// break the paragraph
if (keep_layout)
// but we can fix this in 1.3.0 (Jug 20020509)
bool const isempty = cpit->allowEmpty() && cpit->empty();
::breakParagraph(bv()->buffer()->params(), paragraphs, cpit,
- cursor.pos(), keep_layout);
+ cursor().pos(), keep_layout);
-#warning Trouble Point! (Lgb)
- // When ::breakParagraph is called from within an inset we must
- // ensure that the correct ParagraphList is used. Today that is not
- // the case and the Buffer::paragraphs is used. Not good. (Lgb)
cpit = cursorPar();
ParagraphList::iterator next_par = boost::next(cpit);
// well this is the caption hack since one caption is really enough
if (layout->labeltype == LABEL_SENSITIVE) {
- if (!cursor.pos())
+ if (!cursor().pos())
// set to standard-layout
cpit->applyLayout(tclass.defaultLayout());
else
// move one row up!
// This touches only the screen-update. Otherwise we would may have
// an empty row on the screen
- RowList::iterator crit = cpit->getRow(cursor.pos());
- if (cursor.pos() && crit->pos() == cursor.pos()
- && !cpit->isNewline(cursor.pos() - 1))
+ RowList::iterator crit = cpit->getRow(cursor().pos());
+ if (cursor().pos() && crit->pos() == cursor().pos()
+ && !cpit->isNewline(cursor().pos() - 1))
{
cursorLeft(bv());
}
// This check is necessary. Otherwise the new empty paragraph will
// be deleted automatically. And it is more friendly for the user!
- if (cursor.pos() || isempty)
+ if (cursor().pos() || isempty)
setCursor(next_par, 0);
else
setCursor(cpit, 0);
// convenience function
void LyXText::redoParagraph()
{
- clearSelection();
+ bv()->cursor().clearSelection();
redoParagraph(cursorPar());
- setCursorIntern(cursor.par(), cursor.pos());
+ setCursorIntern(cursor().par(), cursor().pos());
}
// 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 (current_font.number() == LyXFont::ON) {
if (!IsDigit(c) && !contains(number_operators, c) &&
!(contains(number_seperators, c) &&
- cursor.pos() >= 1 &&
- cursor.pos() < cursorPar()->size() &&
- getFont(cursorPar(), cursor.pos()).number() == LyXFont::ON &&
- getFont(cursorPar(), cursor.pos() - 1).number() == LyXFont::ON)
+ cursor().pos() >= 1 &&
+ cursor().pos() < cursorPar()->size() &&
+ getFont(cursorPar(), cursor().pos()).number() == LyXFont::ON &&
+ getFont(cursorPar(), cursor().pos() - 1).number() == LyXFont::ON)
)
number(); // Set current_font.number to OFF
} else if (IsDigit(c) &&
real_current_font.isVisibleRightToLeft()) {
number(); // Set current_font.number to ON
- if (cursor.pos() > 0) {
- char const c = cursorPar()->getChar(cursor.pos() - 1);
+ if (cursor().pos() > 0) {
+ char const c = cursorPar()->getChar(cursor().pos() - 1);
if (contains(number_unary_operators, c) &&
- (cursor.pos() == 1 ||
- cursorPar()->isSeparator(cursor.pos() - 2) ||
- cursorPar()->isNewline(cursor.pos() - 2))
+ (cursor().pos() == 1 ||
+ cursorPar()->isSeparator(cursor().pos() - 2) ||
+ cursorPar()->isNewline(cursor().pos() - 2))
) {
setCharFont(
cursorPar(),
- cursor.pos() - 1,
+ cursor().pos() - 1,
current_font);
} else if (contains(number_seperators, c) &&
- cursor.pos() >= 2 &&
+ cursor().pos() >= 2 &&
getFont(
cursorPar(),
- cursor.pos() - 2).number() == LyXFont::ON) {
+ cursor().pos() - 2).number() == LyXFont::ON) {
setCharFont(
cursorPar(),
- cursor.pos() - 1,
+ cursor().pos() - 1,
current_font);
}
}
LyXFont rawtmpfont = current_font;
if (!freeSpacing && IsLineSeparatorChar(c)) {
- if ((cursor.pos() > 0
- && cursorPar()->isLineSeparator(cursor.pos() - 1))
- || (cursor.pos() > 0
- && cursorPar()->isNewline(cursor.pos() - 1))
- || (cursor.pos() == 0)) {
+ if ((cursor().pos() > 0
+ && cursorPar()->isLineSeparator(cursor().pos() - 1))
+ || (cursor().pos() > 0
+ && cursorPar()->isNewline(cursor().pos() - 1))
+ || (cursor().pos() == 0)) {
static bool sent_space_message = false;
if (!sent_space_message) {
- if (cursor.pos() == 0)
+ if (cursor().pos() == 0)
bv()->owner()->message(_("You cannot insert a space at the beginning of a paragraph. Please read the Tutorial."));
else
bv()->owner()->message(_("You cannot type two spaces this way. Please read the Tutorial."));
// Here case LyXText::InsertInset already inserted the character
if (c != Paragraph::META_INSET)
- cursorPar()->insertChar(cursor.pos(), c);
+ cursorPar()->insertChar(cursor().pos(), c);
- setCharFont(cursorPar(), cursor.pos(), rawtmpfont);
+ setCharFont(cursorPar(), cursor().pos(), rawtmpfont);
current_font = rawtmpfont;
real_current_font = realtmpfont;
redoParagraph(cursorPar());
- setCursor(cursor.par(), cursor.pos() + 1, false, cursor.boundary());
+ setCursor(cursor().par(), cursor().pos() + 1, false, cursor().boundary());
charInserted();
}
int const ns = numberOfSeparators(*pit, row);
bool disp_inset = false;
if (row.endpos() < pit->size()) {
- InsetOld * in = pit->getInset(row.endpos());
+ InsetBase * in = pit->getInset(row.endpos());
if (in)
disp_inset = in->display();
}
void LyXText::cursorRightOneWord()
{
- cursorRightOneWord(cursor);
- setCursor(cursorPar(), cursor.pos());
+ cursorRightOneWord(cursor());
+ setCursor(cursorPar(), cursor().pos());
}
// of prior word, not to end of next prior word.
void LyXText::cursorLeftOneWord()
{
- LyXCursor tmpcursor = cursor;
+ CursorSlice tmpcursor = cursor();
cursorLeftOneWord(tmpcursor);
setCursor(getPar(tmpcursor), tmpcursor.pos());
}
void LyXText::selectWord(word_location loc)
{
- LyXCursor from = cursor;
- LyXCursor to = cursor;
+ CursorSlice from = cursor();
+ CursorSlice to = cursor();
getWord(from, to, loc);
- if (cursor != from)
+ if (cursor() != from)
setCursor(from.par(), from.pos());
if (to == from)
return;
- selection.cursor = cursor;
+ bv()->cursor().resetAnchor();
setCursor(to.par(), to.pos());
- setSelection();
+ bv()->cursor().setSelection();
}
// selection is currently set
bool LyXText::selectWordWhenUnderCursor(word_location loc)
{
- if (!selection.set()) {
- selectWord(loc);
- return selection.set();
- }
- return false;
+ if (bv()->cursor().selection())
+ return false;
+ selectWord(loc);
+ return bv()->cursor().selection();
}
void LyXText::acceptChange()
{
- if (!selection.set() && cursorPar()->size())
+ LCursor & cur = bv()->cursor();
+ if (!cur.selection() && cursorPar()->size())
return;
- if (selection.start.par() == selection.end.par()) {
- LyXCursor & startc = selection.start;
- LyXCursor & endc = selection.end;
- recordUndo(Undo::INSERT, this, startc.par());
+ if (cur.selBegin().par() == cur.par()) {
+ CursorSlice const & startc = cur.selBegin();
+ CursorSlice const & endc = cur.selEnd();
+ recordUndo(cur, Undo::INSERT, cur.anchor().par());
getPar(startc)->acceptChange(startc.pos(), endc.pos());
finishUndo();
- clearSelection();
+ cur.clearSelection();
redoParagraph(getPar(startc));
setCursorIntern(startc.par(), 0);
}
void LyXText::rejectChange()
{
- if (!selection.set() && cursorPar()->size())
+ LCursor & cur = bv()->cursor();
+ if (!cur.selection() && cursorPar()->size())
return;
- if (selection.start.par() == selection.end.par()) {
- LyXCursor & startc = selection.start;
- LyXCursor & endc = selection.end;
- recordUndo(Undo::INSERT, this, startc.par());
+ if (cur.selBegin().par() == cur.selEnd().par()) {
+ CursorSlice const & startc = cur.selBegin();
+ CursorSlice const & endc = cur.selEnd();
+ recordUndo(cur, Undo::INSERT, cur.anchor().par());
getPar(startc)->rejectChange(startc.pos(), endc.pos());
finishUndo();
- clearSelection();
+ cur.clearSelection();
redoParagraph(getPar(startc));
setCursorIntern(startc.par(), 0);
}
// Delete from cursor up to the end of the current or next word.
void LyXText::deleteWordForward()
{
+ LCursor & cur = bv()->cursor();
if (cursorPar()->empty())
- cursorRight(bv());
+ cursorRight(true);
else {
- LyXCursor tmpcursor = cursor;
- selection.set(true); // to avoid deletion
+ CursorSlice tmpcursor = cursor();
+ cur.selection() = true; // to avoid deletion
cursorRightOneWord();
setCursor(tmpcursor, tmpcursor.par(), tmpcursor.pos());
- selection.cursor = cursor;
- cursor = tmpcursor;
- setSelection();
+ cur.resetAnchor();
+ cursor() = tmpcursor;
+ cur.setSelection();
cutSelection(true, false);
}
}
// Delete from cursor to start of current or prior word.
void LyXText::deleteWordBackward()
{
+ LCursor & cur = bv()->cursor();
if (cursorPar()->empty())
- cursorLeft(bv());
+ cursorLeft(true);
else {
- LyXCursor tmpcursor = cursor;
- selection.set(true); // to avoid deletion
+ CursorSlice tmpcursor = cursor();
+ cur.selection() = true; // to avoid deletion
cursorLeftOneWord();
setCursor(tmpcursor, tmpcursor.par(), tmpcursor.pos());
- selection.cursor = cursor;
- cursor = tmpcursor;
- setSelection();
+ cur.resetAnchor();
+ cursor() = tmpcursor;
+ cur.setSelection();
cutSelection(true, false);
}
}
// Kill to end of line.
void LyXText::deleteLineForward()
{
+ LCursor & cur = bv()->cursor();
if (cursorPar()->empty()) {
// Paragraph is empty, so we just go to the right
- cursorRight(bv());
+ cursorRight(true);
} else {
- LyXCursor tmpcursor = cursor;
- // We can't store the row over a regular setCursor
- // so we set it to 0 and reset it afterwards.
- selection.set(true); // to avoid deletion
+ CursorSlice tmpcursor = cursor();
+ cur.selection() = true; // to avoid deletion
cursorEnd();
setCursor(tmpcursor, tmpcursor.par(), tmpcursor.pos());
- selection.cursor = cursor;
- cursor = tmpcursor;
- setSelection();
+ cur.resetAnchor();
+ cursor() = tmpcursor;
+ cur.setSelection();
// What is this test for ??? (JMarc)
- if (!selection.set())
+ if (!cur.selection())
deleteWordForward();
else
cutSelection(true, false);
void LyXText::changeCase(LyXText::TextCase action)
{
- LyXCursor from;
- LyXCursor to;
+ LCursor & cur = bv()->cursor();
+ CursorSlice from;
+ CursorSlice to;
- if (selection.set()) {
- from = selection.start;
- to = selection.end;
+ if (cur.selection()) {
+ from = cur.selBegin();
+ to = cur.selEnd();
} else {
- from = cursor;
+ from = cursor();
getWord(from, to, lyx::PARTIAL_WORD);
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();
void LyXText::Delete()
{
// this is a very easy implementation
- LyXCursor old_cursor = cursor;
+ CursorSlice old_cursor = cursor();
// just move to the right
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();
}
}
ParagraphList::iterator pit = cursorPar();
pos_type lastpos = pit->size();
- if (cursor.pos() == 0) {
- // The cursor is at the beginning of a paragraph,
- // so the the backspace will collapse two paragraphs into one.
+ if (cursor().pos() == 0) {
+ // The cursor is at the beginning of a paragraph, so
+ // the the backspace will collapse two paragraphs into
+ // one.
// but it's not allowed unless it's new
if (pit->isChangeEdited(0, pit->size()))
// we may paste some paragraphs
// is it an empty paragraph?
-
if (lastpos == 0 || (lastpos == 1 && pit->isSeparator(0))) {
// This is an empty paragraph and we delete it just
// by moving the cursor one step
// left and let the DeleteEmptyParagraphMechanism
// handle the actual deletion of the paragraph.
- if (cursor.par()) {
+ if (cursor().par()) {
cursorLeft(bv());
// the layout things can change the height of a row !
redoParagraph();
}
}
- if (cursor.par() != 0)
- recordUndo(Undo::DELETE, this, cursor.par() - 1, cursor.par());
+ if (cursor().par() != 0)
+ recordUndo(bv()->cursor(), Undo::DELETE, cursor().par() - 1);
ParagraphList::iterator tmppit = cursorPar();
// 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,
// without the dreaded mechanism. (JMarc)
- if (cursor.par() != 0) {
+ if (cursor().par() != 0) {
// steps into the above paragraph.
- setCursorIntern(cursor.par() - 1,
- getPar(cursor.par() - 1)->size(),
+ setCursorIntern(cursor().par() - 1,
+ getPar(cursor().par() - 1)->size(),
false);
}
&& cpit->getAlign() == tmppit->getAlign()) {
mergeParagraph(bufparams, buf.paragraphs(), cpit);
- if (cursor.pos() && cpit->isSeparator(cursor.pos() - 1))
- cursor.pos(cursor.pos() - 1);
+ if (cursor().pos() && cpit->isSeparator(cursor().pos() - 1))
+ cursor().pos(cursor().pos() - 1);
// the counters may have changed
updateCounters();
- setCursor(cursor.par(), cursor.pos(), false);
+ setCursor(cursor().par(), cursor().pos(), false);
}
} 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,
// without the dreaded mechanism. (JMarc)
- setCursorIntern(cursor.par(), cursor.pos() - 1,
- false, cursor.boundary());
- cursorPar()->erase(cursor.pos());
+ setCursorIntern(cursor().par(), cursor().pos() - 1,
+ false, cursor().boundary());
+ cursorPar()->erase(cursor().pos());
}
lastpos = cursorPar()->size();
- if (cursor.pos() == lastpos)
+ if (cursor().pos() == lastpos)
setCurrentFont();
redoParagraph();
- setCursor(cursor.par(), cursor.pos(), false, cursor.boundary());
+ setCursor(cursor().par(), cursor().pos(), false, cursor().boundary());
}
ParagraphList::iterator LyXText::cursorPar() const
{
- return getPar(cursor.par());
+ //lyxerr << "### cursorPar: cursor: " << bv()->cursor() << endl;
+ //lyxerr << "xxx cursorPar: cursor: " << cursor() << endl;
+ return getPar(cursor().par());
}
RowList::iterator LyXText::cursorRow() const
{
- return cursorPar()->getRow(cursor.pos());
+ return cursorPar()->getRow(cursor().pos());
}
-ParagraphList::iterator LyXText::getPar(LyXCursor const & cur) const
+ParagraphList::iterator LyXText::getPar(CursorSlice const & cur) const
{
return getPar(cur.par());
}
ParagraphList::iterator LyXText::getPar(int par) const
{
+ //lyxerr << "getPar: " << par << " from " << paragraphs().size() << endl;
BOOST_ASSERT(par >= 0);
BOOST_ASSERT(par < int(paragraphs().size()));
ParagraphList::iterator pit = paragraphs().begin();
- std::advance(pit, par);
+ advance(pit, par);
return pit;
}
RowList::iterator
LyXText::getRowNearY(int y, ParagraphList::iterator & pit) const
{
- //lyxerr << "getRowNearY: y " << y << endl;
#if 1
ParagraphList::iterator const
pend = boost::prior(paragraphs().end());
}
-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
{
string LyXText::selectionAsString(Buffer const & buffer, bool label) const
{
- if (!selection.set())
+ LCursor & cur = bv()->cursor();
+ if (!cur.selection())
return string();
// should be const ...
- ParagraphList::iterator startpit = getPar(selection.start);
- ParagraphList::iterator endpit = getPar(selection.end);
- size_t const startpos = selection.start.pos();
- size_t const endpos = selection.end.pos();
+ ParagraphList::iterator startpit = getPar(cur.selBegin());
+ ParagraphList::iterator endpit = getPar(cur.selEnd());
+ size_t const startpos = cur.selBegin().pos();
+ size_t const endpos = cur.selEnd().pos();
if (startpit == endpit)
return startpit->asString(buffer, startpos, endpos, label);
int LyXText::parOffset(ParagraphList::iterator pit) const
{
- return std::distance(paragraphs().begin(), pit);
+ return distance(paragraphs().begin(), pit);
}
void LyXText::fullRebreak()
{
redoParagraphs(paragraphs().begin(), paragraphs().end());
- redoCursor();
- selection.cursor = cursor;
+ bv()->cursor().resetAnchor();
}
// only used for inset right now. should also be used for main text
-void LyXText::draw(PainterInfo &, int x, int y) const
+void LyXText::draw(PainterInfo & pi, int x, int y) const
{
xo_ = x;
yo_ = y;
- paintTextInset(*bv(), *this, x, y);
+ paintTextInset(*this, pi, x, y);
}
}
-void LyXText::cursorLeftOneWord(LyXCursor & cursor)
+void LyXText::cursorLeftOneWord(CursorSlice & cur)
{
// treat HFills, floats and Insets as words
ParagraphList::iterator pit = cursorPar();
- size_t pos = cursor.pos();
+ size_t pos = cur.pos();
while (pos &&
(pit->isSeparator(pos - 1) ||
--pos;
}
- cursor.par(parOffset(pit));
- cursor.pos(pos);
+ cur.par(parOffset(pit));
+ cur.pos(pos);
}
-void LyXText::cursorRightOneWord(LyXCursor & cursor)
+void LyXText::cursorRightOneWord(CursorSlice & cur)
{
// treat floats, HFills and Insets as words
ParagraphList::iterator pit = cursorPar();
- pos_type pos = cursor.pos();
+ pos_type pos = cur.pos();
if (pos == pit->size() &&
boost::next(pit) != paragraphs().end()) {
}
}
- cursor.par(parOffset(pit));
- cursor.pos(pos);
+ cur.par(parOffset(pit));
+ cur.pos(pos);
}
-void LyXText::getWord(LyXCursor & from, LyXCursor & to, word_location const loc)
+void LyXText::getWord(CursorSlice & from, CursorSlice & to, word_location const loc)
{
ParagraphList::iterator from_par = getPar(from);
- ParagraphList::iterator to_par = getPar(to);
switch (loc) {
case lyx::WHOLE_WORD_STRICT:
if (from.pos() == 0 || from.pos() == from_par->size()
break;
}
to = from;
+ ParagraphList::iterator to_par = getPar(to);
while (to.pos() < to_par->size()
&& !to_par->isSeparator(to.pos())
&& !to_par->isKomma(to.pos())
bool LyXText::read(Buffer const & buf, LyXLex & lex)
-{
+{
static Change current_change;
bool the_end_read = false;
}
return the_end_read;
}
+
+
+int LyXText::ascent() const
+{
+ return firstRow()->ascent_of_text();
+}
+
+
+int LyXText::descent() const
+{
+ return height - firstRow()->ascent_of_text();
+}
+
+
+int LyXText::cursorX(CursorSlice const & cur) const
+{
+ ParagraphList::iterator pit = getPar(cur);
+ if (pit->rows.empty())
+ return xo_;
+ Row const & row = *pit->getRow(cur.pos());
+ pos_type pos = cur.pos();
+ pos_type cursor_vpos = 0;
+ double x = row.x();
+ double fill_separator = row.fill_separator();
+ double fill_hfill = row.fill_hfill();
+ double fill_label_hfill = row.fill_label_hfill();
+ pos_type const row_pos = row.pos();
+ pos_type const end = row.endpos();
+
+ if (end <= row_pos)
+ cursor_vpos = row_pos;
+ else if (pos >= end)
+ cursor_vpos = (pit->isRightToLeftPar(bv()->buffer()->params()))
+ ? row_pos : end;
+ else if (pos > row_pos && pos >= end)
+ // Place cursor after char at (logical) position pos - 1
+ cursor_vpos = (bidi.level(pos - 1) % 2 == 0)
+ ? bidi.log2vis(pos - 1) + 1 : bidi.log2vis(pos - 1);
+ else
+ // Place cursor before char at (logical) position pos
+ cursor_vpos = (bidi.level(pos) % 2 == 0)
+ ? bidi.log2vis(pos) : bidi.log2vis(pos) + 1;
+
+ pos_type body_pos = pit->beginOfBody();
+ if (body_pos > 0 &&
+ (body_pos > end || !pit->isLineSeparator(body_pos - 1)))
+ body_pos = 0;
+
+ for (pos_type vpos = row_pos; vpos < cursor_vpos; ++vpos) {
+ pos_type pos = bidi.vis2log(vpos);
+ if (body_pos > 0 && pos == body_pos - 1) {
+ x += fill_label_hfill
+ + font_metrics::width(pit->layout()->labelsep,
+ getLabelFont(pit));
+ if (pit->isLineSeparator(body_pos - 1))
+ x -= singleWidth(pit, body_pos - 1);
+ }
+
+ if (hfillExpansion(*pit, row, pos)) {
+ x += singleWidth(pit, pos);
+ if (pos >= body_pos)
+ x += fill_hfill;
+ else
+ x += fill_label_hfill;
+ } else if (pit->isSeparator(pos)) {
+ x += singleWidth(pit, pos);
+ if (pos >= body_pos)
+ x += fill_separator;
+ } else
+ x += singleWidth(pit, pos);
+ }
+ return xo_ + int(x);
+}
+
+
+int LyXText::cursorY(CursorSlice const & cur) const
+{
+ Paragraph & par = *getPar(cur);
+ Row & row = *par.getRow(cur.pos());
+ return yo_ + par.y + row.y_offset() + row.baseline();
+}
+
+
+CursorSlice & LyXText::cursor()
+{
+ //lyxerr << "# accessing slice " << findText(this) << endl;
+ 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
+{
+ if (this != bv()->cursor().text()) {
+ lyxerr << "cursor: " << bv()->cursor()
+ << "\ntext: " << bv()->cursor().text()
+ << "\nthis: " << this << endl;
+ BOOST_ASSERT(false);
+ }
+ return bv()->cursor().current();
+}
projects / lyx.git / blobdiff