X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCursor.cpp;h=70d31860f662fde0fb094a809f60eabbf2d5a24b;hb=ac3f391b46d25784f3129e24658b73c4bc15febf;hp=e41ea638b64590a1d74cb797906486c7b8ac9788;hpb=5dfa0c0381173e8dd4bb5c873be65853ad7b8240;p=lyx.git diff --git a/src/Cursor.cpp b/src/Cursor.cpp index e41ea638b6..70d31860f6 100644 --- a/src/Cursor.cpp +++ b/src/Cursor.cpp @@ -36,7 +36,7 @@ #include "TextMetrics.h" #include "TocBackend.h" -#include "support/assert.h" +#include "support/lassert.h" #include "support/debug.h" #include "support/docstream.h" @@ -453,6 +453,188 @@ bool Cursor::posForward() } +bool Cursor::posVisRight(bool skip_inset) +{ + Cursor new_cur = *this; // where we will move to + pos_type left_pos; // position visually left of current cursor + pos_type right_pos; // position visually right of current cursor + bool new_pos_is_RTL; // is new position we're moving to RTL? + + getSurroundingPos(left_pos, right_pos); + + LYXERR(Debug::RTL, left_pos <<"|"<< right_pos << " (pos: "<< pos() <<")"); + + // Are we at an inset? + new_cur.pos() = right_pos; + new_cur.boundary(false); + if (!skip_inset && + text()->checkAndActivateInsetVisual(new_cur, right_pos >= pos(), false)) { + // we actually move the cursor at the end of this function, for now + // we just keep track of the new position in new_cur... + LYXERR(Debug::RTL, "entering inset at: " << new_cur.pos()); + } + + // Are we already at rightmost pos in row? + else if (text()->empty() || right_pos == -1) { + + new_cur = *this; + if (!new_cur.posVisToNewRow(false)) { + LYXERR(Debug::RTL, "not moving!"); + return false; + } + + // we actually move the cursor at the end of this function, for now + // just keep track of the new position in new_cur... + LYXERR(Debug::RTL, "right edge, moving: " << int(new_cur.pit()) << "," + << int(new_cur.pos()) << "," << (new_cur.boundary() ? 1 : 0)); + + } + // normal movement to the right + else { + new_cur = *this; + // Recall, if the cursor is at position 'x', that means *before* + // the character at position 'x'. In RTL, "before" means "to the + // right of", in LTR, "to the left of". So currently our situation + // is this: the position to our right is 'right_pos' (i.e., we're + // currently to the left of 'right_pos'). In order to move to the + // right, it depends whether or not the character at 'right_pos' is RTL. + new_pos_is_RTL = paragraph().getFontSettings( + bv().buffer().params(), right_pos).isVisibleRightToLeft(); + // If the character at 'right_pos' *is* LTR, then in order to move to + // the right of it, we need to be *after* 'right_pos', i.e., move to + // position 'right_pos' + 1. + if (!new_pos_is_RTL) { + new_cur.pos() = right_pos + 1; + // set the boundary to true in two situations: + if ( + // 1. if new_pos is now lastpos (which means that we're moving + // right to the end of an LTR chunk which is at the end of an + // RTL paragraph); + new_cur.pos() == lastpos() + // 2. if the position *after* right_pos is RTL (we want to be + // *after* right_pos, not before right_pos + 1!) + || paragraph().getFontSettings(bv().buffer().params(), + new_cur.pos()).isVisibleRightToLeft() + ) + new_cur.boundary(true); + else // set the boundary to false + new_cur.boundary(false); + } + // Otherwise (if the character at position 'right_pos' is RTL), then + // moving to the right of it is as easy as setting the new position + // to 'right_pos'. + else { + new_cur.pos() = right_pos; + new_cur.boundary(false); + } + + } + + bool moved = (new_cur.pos() != pos() + || new_cur.pit() != pit() + || new_cur.boundary() != boundary()); + + if (moved) { + LYXERR(Debug::RTL, "moving to: " << new_cur.pos() + << (new_cur.boundary() ? " (boundary)" : "")); + *this = new_cur; + } + + return moved; +} + + +bool Cursor::posVisLeft(bool skip_inset) +{ + Cursor new_cur = *this; // where we will move to + pos_type left_pos; // position visually left of current cursor + pos_type right_pos; // position visually right of current cursor + bool new_pos_is_RTL; // is new position we're moving to RTL? + + getSurroundingPos(left_pos, right_pos); + + LYXERR(Debug::RTL, left_pos <<"|"<< right_pos << " (pos: "<< pos() <<")"); + + // Are we at an inset? + new_cur.pos() = left_pos; + new_cur.boundary(false); + if (!skip_inset && + text()->checkAndActivateInsetVisual(new_cur, left_pos >= pos(), true)) { + // we actually move the cursor at the end of this function, for now + // we just keep track of the new position in new_cur... + LYXERR(Debug::RTL, "entering inset at: " << new_cur.pos()); + } + + // Are we already at leftmost pos in row? + else if (text()->empty() || left_pos == -1) { + + new_cur = *this; + if (!new_cur.posVisToNewRow(true)) { + LYXERR(Debug::RTL, "not moving!"); + return false; + } + + // we actually move the cursor at the end of this function, for now + // just keep track of the new position in new_cur... + LYXERR(Debug::RTL, "left edge, moving: " << int(new_cur.pit()) << "," + << int(new_cur.pos()) << "," << (new_cur.boundary() ? 1 : 0)); + + } + // normal movement to the left + else { + new_cur = *this; + // Recall, if the cursor is at position 'x', that means *before* + // the character at position 'x'. In RTL, "before" means "to the + // right of", in LTR, "to the left of". So currently our situation + // is this: the position to our left is 'left_pos' (i.e., we're + // currently to the right of 'left_pos'). In order to move to the + // left, it depends whether or not the character at 'left_pos' is RTL. + new_pos_is_RTL = paragraph().getFontSettings( + bv().buffer().params(), left_pos).isVisibleRightToLeft(); + // If the character at 'left_pos' *is* RTL, then in order to move to + // the left of it, we need to be *after* 'left_pos', i.e., move to + // position 'left_pos' + 1. + if (new_pos_is_RTL) { + new_cur.pos() = left_pos + 1; + // set the boundary to true in two situations: + if ( + // 1. if new_pos is now lastpos (which means that we're moving left + // to the end of an RTL chunk which is at the end of an LTR + // paragraph); + new_cur.pos() == lastpos() + // 2. if the position *after* left_pos is not RTL (we want to be + // *after* left_pos, not before left_pos + 1!) + || !paragraph().getFontSettings(bv().buffer().params(), + new_cur.pos()).isVisibleRightToLeft() + ) + new_cur.boundary(true); + else // set the boundary to false + new_cur.boundary(false); + } + // Otherwise (if the character at position 'left_pos' is LTR), then + // moving to the left of it is as easy as setting the new position + // to 'left_pos'. + else { + new_cur.pos() = left_pos; + new_cur.boundary(false); + } + + } + + bool moved = (new_cur.pos() != pos() + || new_cur.pit() != pit() + || new_cur.boundary() != boundary()); + + if (moved) { + LYXERR(Debug::RTL, "moving to: " << new_cur.pos() + << (new_cur.boundary() ? " (boundary)" : "")); + *this = new_cur; + } + + return moved; +} + + void Cursor::getSurroundingPos(pos_type & left_pos, pos_type & right_pos) { // preparing bidi tables @@ -786,7 +968,9 @@ void Cursor::setSelection() selection() = true; // A selection with no contents is not a selection // FIXME: doesnt look ok - if (pit() == anchor().pit() && pos() == anchor().pos()) + if (idx() == anchor().idx() && + pit() == anchor().pit() && + pos() == anchor().pos()) selection() = false; } @@ -1377,7 +1561,7 @@ void Cursor::normalize() << pos() << ' ' << lastpos() << " in idx: " << idx() << " in atom: '"; odocstringstream os; - WriteStream wi(os, false, true); + WriteStream wi(os, false, true, false); inset().asInsetMath()->write(wi); lyxerr << to_utf8(os.str()) << endl; pos() = lastpos(); @@ -1668,17 +1852,28 @@ void Cursor::errorMessage(docstring const & msg) const } -docstring Cursor::selectionAsString(bool label) const +docstring Cursor::selectionAsString(bool with_label) const { if (!selection()) return docstring(); + int const label = with_label + ? AS_STR_LABEL | AS_STR_INSETS : AS_STR_INSETS; + if (inTexted()) { + idx_type const startidx = selBegin().idx(); + idx_type const endidx = selEnd().idx(); + if (startidx != endidx) { + // multicell selection + InsetTabular * table = inset().asInsetTabular(); + LASSERT(table, return docstring()); + return table->asString(startidx, endidx); + } + ParagraphList const & pars = text()->paragraphs(); - // should be const ... - pit_type startpit = selBegin().pit(); - pit_type endpit = selEnd().pit(); + pit_type const startpit = selBegin().pit(); + pit_type const endpit = selEnd().pit(); size_t const startpos = selBegin().pos(); size_t const endpos = selEnd().pos(); @@ -1710,7 +1905,7 @@ docstring Cursor::selectionAsString(bool label) const } -docstring Cursor::currentState() +docstring Cursor::currentState() const { if (inMathed()) { odocstringstream os; @@ -1725,7 +1920,7 @@ docstring Cursor::currentState() } -docstring Cursor::getPossibleLabel() +docstring Cursor::getPossibleLabel() const { return inMathed() ? from_ascii("eq:") : text()->getPossibleLabel(*this); } @@ -1805,7 +2000,6 @@ bool Cursor::fixIfBroken() { if (DocIterator::fixIfBroken()) { clearSelection(); - resetAnchor(); return true; } return false; @@ -1897,8 +2091,7 @@ bool Cursor::textUndo() return false; // Set cursor setCursor(dit); - selection() = false; - resetAnchor(); + clearSelection(); fixIfBroken(); return true; } @@ -1912,50 +2105,61 @@ bool Cursor::textRedo() return false; // Set cursor setCursor(dit); - selection() = false; - resetAnchor(); + clearSelection(); fixIfBroken(); return true; } -void Cursor::finishUndo() +void Cursor::finishUndo() const { bv_->buffer().undo().finishUndo(); } -void Cursor::recordUndo(UndoKind kind, pit_type from, pit_type to) +void Cursor::beginUndoGroup() const +{ + bv_->buffer().undo().beginUndoGroup(); +} + + +void Cursor::endUndoGroup() const +{ + bv_->buffer().undo().endUndoGroup(); +} + + +void Cursor::recordUndo(UndoKind kind, pit_type from, pit_type to) const { bv_->buffer().undo().recordUndo(*this, kind, from, to); } -void Cursor::recordUndo(UndoKind kind, pit_type from) +void Cursor::recordUndo(UndoKind kind, pit_type from) const { bv_->buffer().undo().recordUndo(*this, kind, from); } -void Cursor::recordUndo(UndoKind kind) +void Cursor::recordUndo(UndoKind kind) const { bv_->buffer().undo().recordUndo(*this, kind); } -void Cursor::recordUndoInset(UndoKind kind) +void Cursor::recordUndoInset(UndoKind kind) const { bv_->buffer().undo().recordUndoInset(*this, kind); } -void Cursor::recordUndoFullDocument() +void Cursor::recordUndoFullDocument() const { bv_->buffer().undo().recordUndoFullDocument(*this); } -void Cursor::recordUndoSelection() +void Cursor::recordUndoSelection() const { if (inMathed()) { if (cap::multipleCellsSelected(*this))