X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCursor.cpp;h=7f8edc281ed0645b81ceadaee57240a145f30bc1;hb=3d4076b598deb18660e50ec9c327efc3b15f15d0;hp=92b9110ba7629b9b7215acae81e3296df281be48;hpb=1383629299e2b9ce8d4295d1267ce3ae0beaedd9;p=lyx.git diff --git a/src/Cursor.cpp b/src/Cursor.cpp index 92b9110ba7..7f8edc281e 100644 --- a/src/Cursor.cpp +++ b/src/Cursor.cpp @@ -6,7 +6,7 @@ * \author Alejandro Aguilar Sierra * \author Alfredo Braunstein * \author Dov Feldstern - * \author André Pönitz + * \author André Pönitz * \author Stefan Schimanski * * Full author contact details are available in file CREDITS. @@ -26,9 +26,9 @@ #include "FuncCode.h" #include "FuncRequest.h" #include "Language.h" -#include "LyXFunc.h" // only for setMessage() +#include "Layout.h" +#include "LyXAction.h" #include "LyXRC.h" -#include "paragraph_funcs.h" #include "Paragraph.h" #include "ParIterator.h" #include "Row.h" @@ -36,9 +36,11 @@ #include "TextMetrics.h" #include "TocBackend.h" -#include "support/lassert.h" #include "support/debug.h" #include "support/docstream.h" +#include "support/ExceptionMessage.h" +#include "support/gettext.h" +#include "support/lassert.h" #include "insets/InsetTabular.h" #include "insets/InsetText.h" @@ -50,11 +52,12 @@ #include "mathed/MathData.h" #include "mathed/MathMacro.h" -#include +#include "support/bind.h" #include #include #include +#include using namespace std; @@ -94,20 +97,18 @@ DocIterator bruteFind2(Cursor const & c, int x, int y) int xo; int yo; Inset const * inset = &it.inset(); - map const & data = - c.bv().coordCache().getInsets().getData(); - map::const_iterator I = data.find(inset); + CoordCache const & cache = c.bv().coordCache(); // FIXME: in the case where the inset is not in the cache, this // means that no part of it is visible on screen. In this case // we don't do elaborate search and we just return the forwarded // DocIterator at its beginning. - if (I == data.end()) { + if (!cache.getInsets().has(inset)) { it.top().pos() = 0; return it; } - Point o = I->second.pos; + Point const o = cache.getInsets().xy(inset); inset->cursorPos(c.bv(), it.top(), c.boundary(), xo, yo); // Convert to absolute xo += o.x_; @@ -153,7 +154,7 @@ bool bruteFind(Cursor & cursor, else ++et.pit(); - double best_dist = numeric_limits::max();; + double best_dist = numeric_limits::max(); DocIterator best_cursor = et; for ( ; it != et; it.forwardPos(true)) { @@ -186,7 +187,7 @@ bool bruteFind(Cursor & cursor, } */ - +/* /// moves position closest to (x, y) in given box bool bruteFind3(Cursor & cur, int x, int y, bool up) { @@ -205,10 +206,9 @@ bool bruteFind3(Cursor & cur, int x, int y, bool up) // << " xlow: " << xlow << " xhigh: " << xhigh // << " ylow: " << ylow << " yhigh: " << yhigh // << endl; - Inset & inset = bv.buffer().inset(); - DocIterator it = doc_iterator_begin(inset); + DocIterator it = doc_iterator_begin(cur.buffer()); it.pit() = from; - DocIterator et = doc_iterator_end(inset); + DocIterator et = doc_iterator_end(cur.buffer()); double best_dist = numeric_limits::max(); DocIterator best_cursor = et; @@ -216,8 +216,11 @@ bool bruteFind3(Cursor & cur, int x, int y, bool up) for ( ; it != et; it.forwardPos()) { // avoid invalid nesting when selecting if (bv.cursorStatus(it) == CUR_INSIDE - && (!cur.selection() || positionable(it, cur.anchor_))) { - Point p = bv.getPos(it, false); + && (!cur.selection() || positionable(it, cur.realAnchor()))) { + // If this function is ever used again, check + // whether this is the same as "bv.getPos(it, + // false)" with boundary = false. + Point p = bv.getPos(it); int xo = p.x_; int yo = p.y_; if (xlow <= xo && xo <= xhigh && ylow <= yo && yo <= yhigh) { @@ -246,36 +249,47 @@ bool bruteFind3(Cursor & cur, int x, int y, bool up) cur.setCursor(best_cursor); return true; } +*/ +} // namespace anon -docstring parbreak(Paragraph const & par) -{ - odocstringstream ods; - ods << '\n'; - // only add blank line if we're not in an ERT or Listings inset - if (par.ownerCode() != ERT_CODE - && par.ownerCode() != LISTINGS_CODE) - ods << '\n'; - return ods.str(); -} -} // namespace anon +CursorData::CursorData() + : DocIterator(), anchor_(), + selection_(false), mark_(false), word_selection_(false), + logicalpos_(false), current_font(inherit_font) +{} + + +CursorData::CursorData(Buffer * buffer) + : DocIterator(buffer), anchor_(), + selection_(false), mark_(false), word_selection_(false), + logicalpos_(false), current_font(inherit_font) +{} + + +CursorData::CursorData(DocIterator const & dit) + : DocIterator(dit), anchor_(), + selection_(false), mark_(false), word_selection_(false), + logicalpos_(false), current_font(inherit_font) +{} // be careful: this is called from the bv's constructor, too, so // bv functions are not yet available! Cursor::Cursor(BufferView & bv) - : DocIterator(), bv_(&bv), anchor_(), x_target_(-1), textTargetOffset_(0), - selection_(false), mark_(false), logicalpos_(false), - current_font(inherit_font) + : CursorData(&bv.buffer()), bv_(&bv), + x_target_(-1), textTargetOffset_(0) {} -void Cursor::reset(Inset & inset) +void Cursor::reset() { clear(); - push_back(CursorSlice(inset)); - anchor_ = doc_iterator_begin(inset); + push_back(CursorSlice(buffer()->inset())); + anchor_ = doc_iterator_begin(buffer()); anchor_.clear(); + new_word_ = doc_iterator_begin(buffer()); + new_word_.clear(); clearTargetX(); selection_ = false; mark_ = false; @@ -289,6 +303,69 @@ void Cursor::setCursor(DocIterator const & cur) } +void Cursor::setCursorToAnchor() +{ + if (selection()) { + DocIterator normal = anchor_; + while (depth() < normal.depth()) + normal.pop_back(); + if (depth() < anchor_.depth() && top() <= anchor_[depth() - 1]) + ++normal.pos(); + setCursor(normal); + } +} + + +void Cursor::setCursorData(CursorData const & data) +{ + CursorData::operator=(data); +} + + +bool Cursor::getStatus(FuncRequest const & cmd, FuncStatus & status) const +{ + Cursor cur = *this; + + // Try to fix cursor in case it is broken. + cur.fixIfBroken(); + + // Is this a function that acts on inset at point? + Inset * inset = cur.nextInset(); + if (lyxaction.funcHasFlag(cmd.action(), LyXAction::AtPoint) + && inset && inset->getStatus(cur, cmd, status)) + return true; + + // This is, of course, a mess. Better create a new doc iterator and use + // this in Inset::getStatus. This might require an additional + // BufferView * arg, though (which should be avoided) + //Cursor safe = *this; + bool res = false; + for ( ; cur.depth(); cur.pop()) { + //lyxerr << "\nCursor::getStatus: cmd: " << cmd << endl << *this << endl; + // LASSERT: Is it safe to continue here, or should we return? + LASSERT(cur.idx() <= cur.lastidx(), /**/); + LASSERT(cur.pit() <= cur.lastpit(), /**/); + LASSERT(cur.pos() <= cur.lastpos(), /**/); + + // The inset's getStatus() will return 'true' if it made + // a definitive decision on whether it want to handle the + // request or not. The result of this decision is put into + // the 'status' parameter. + if (cur.inset().getStatus(cur, cmd, status)) { + res = true; + break; + } + } + return res; +} + + +void Cursor::saveBeforeDispatchPosXY() +{ + getPos(beforeDispatchPosX_, beforeDispatchPosY_); +} + + void Cursor::dispatch(FuncRequest const & cmd0) { LYXERR(Debug::DEBUG, "cmd: " << cmd0 << '\n' << *this); @@ -298,12 +375,32 @@ void Cursor::dispatch(FuncRequest const & cmd0) fixIfBroken(); FuncRequest cmd = cmd0; Cursor safe = *this; - + Cursor old = *this; + disp_ = DispatchResult(); + + beginUndoGroup(); + + // Is this a function that acts on inset at point? + if (lyxaction.funcHasFlag(cmd.action(), LyXAction::AtPoint) + && nextInset()) { + disp_.dispatched(true); + disp_.screenUpdate(Update::FitCursor | Update::Force); + FuncRequest tmpcmd = cmd; + LYXERR(Debug::DEBUG, "Cursor::dispatch: (AtPoint) cmd: " + << cmd0 << endl << *this); + nextInset()->dispatch(*this, tmpcmd); + if (disp_.dispatched()) { + endUndoGroup(); + return; + } + } + // store some values to be used inside of the handlers beforeDispatchCursor_ = *this; for (; depth(); pop(), boundary(false)) { LYXERR(Debug::DEBUG, "Cursor::dispatch: cmd: " << cmd0 << endl << *this); + // LASSERT: Is it safe to continue here, or should we return? LASSERT(pos() <= lastpos(), /**/); LASSERT(idx() <= lastidx(), /**/); LASSERT(pit() <= lastpit(), /**/); @@ -311,7 +408,7 @@ void Cursor::dispatch(FuncRequest const & cmd0) // The common case is 'LFUN handled, need update', so make the // LFUN handler's life easier by assuming this as default value. // The handler can reset the update and val flags if necessary. - disp_.update(Update::FitCursor | Update::Force); + disp_.screenUpdate(Update::FitCursor | Update::Force); disp_.dispatched(true); inset().dispatch(*this, cmd); if (disp_.dispatched()) @@ -322,18 +419,40 @@ void Cursor::dispatch(FuncRequest const & cmd0) // object will be used again. if (!disp_.dispatched()) { LYXERR(Debug::DEBUG, "RESTORING OLD CURSOR!"); + // We might have invalidated the cursor when removing an empty + // paragraph while the cursor could not be moved out the inset + // while we initially thought we could. This might happen when + // a multiline inset becomes an inline inset when the second + // paragraph is removed. + if (safe.pit() > safe.lastpit()) { + safe.pit() = safe.lastpit(); + safe.pos() = safe.lastpos(); + } operator=(safe); - disp_.update(Update::None); + disp_.screenUpdate(Update::None); disp_.dispatched(false); } else { // restore the previous one because nested Cursor::dispatch calls // are possible which would change it beforeDispatchCursor_ = safe.beforeDispatchCursor_; } + endUndoGroup(); + + // notify insets we just left + if (*this != old) { + old.beginUndoGroup(); + old.fixIfBroken(); + bool badcursor = notifyCursorLeavesOrEnters(old, *this); + if (badcursor) { + fixIfBroken(); + bv().resetInlineCompletionPos(); + } + old.endUndoGroup(); + } } -DispatchResult Cursor::result() const +DispatchResult const & Cursor::result() const { return disp_; } @@ -341,21 +460,14 @@ DispatchResult Cursor::result() const BufferView & Cursor::bv() const { - LASSERT(bv_, /**/); + LBUFERR(bv_); return *bv_; } -Buffer & Cursor::buffer() const -{ - LASSERT(bv_, /**/); - return bv_->buffer(); -} - - void Cursor::pop() { - LASSERT(depth() >= 1, /**/); + LBUFERR(depth() >= 1); pop_back(); } @@ -363,13 +475,13 @@ void Cursor::pop() void Cursor::push(Inset & p) { push_back(CursorSlice(p)); - p.setBuffer(bv_->buffer()); + p.setBuffer(*buffer()); } void Cursor::pushBackward(Inset & p) { - LASSERT(!empty(), /**/); + LASSERT(!empty(), return); //lyxerr << "Entering inset " << t << " front" << endl; push(p); p.idxFirst(*this); @@ -378,7 +490,7 @@ void Cursor::pushBackward(Inset & p) bool Cursor::popBackward() { - LASSERT(!empty(), /**/); + LASSERT(!empty(), return false); if (depth() == 1) return false; pop(); @@ -388,7 +500,7 @@ bool Cursor::popBackward() bool Cursor::popForward() { - LASSERT(!empty(), /**/); + LASSERT(!empty(), return false); //lyxerr << "Leaving inset from in back" << endl; const pos_type lp = (depth() > 1) ? (*this)[depth() - 2].lastpos() : 0; if (depth() == 1) @@ -401,10 +513,13 @@ bool Cursor::popForward() int Cursor::currentMode() { - LASSERT(!empty(), /**/); + LASSERT(!empty(), return Inset::UNDECIDED_MODE); for (int i = depth() - 1; i >= 0; --i) { int res = operator[](i).inset().currentMode(); - if (res != Inset::UNDECIDED_MODE) + bool locked_mode = operator[](i).inset().lockedMode(); + // Also return UNDECIDED_MODE when the mode is locked, + // as in this case it is treated the same as TEXT_MODE + if (res != Inset::UNDECIDED_MODE || locked_mode) return res; } return Inset::TEXT_MODE; @@ -413,7 +528,7 @@ int Cursor::currentMode() void Cursor::getPos(int & x, int & y) const { - Point p = bv().getPos(*this, boundary()); + Point p = bv().getPos(*this); x = p.x_; y = p.y_; } @@ -423,7 +538,6 @@ Row const & Cursor::textRow() const { CursorSlice const & cs = innerTextSlice(); ParagraphMetrics const & pm = bv().parMetrics(cs.text(), cs.pit()); - LASSERT(!pm.rows().empty(), /**/); return pm.getRow(pos(), boundary()); } @@ -431,9 +545,70 @@ Row const & Cursor::textRow() const void Cursor::resetAnchor() { anchor_ = *this; + checkNewWordPosition(); +} + + +void Cursor::markNewWordPosition() +{ + if (lyxrc.spellcheck_continuously && inTexted() && new_word_.empty()) { + FontSpan nw = locateWord(WHOLE_WORD); + if (nw.size() == 1) { + LYXERR(Debug::DEBUG, "start new word: " + << " par: " << pit() + << " pos: " << nw.first); + new_word_ = *this; + } + } } +void Cursor::clearNewWordPosition() +{ + if (!new_word_.empty()) { + LYXERR(Debug::DEBUG, "clear new word: " + << " par: " << pit() + << " pos: " << pos()); + new_word_.resize(0); + } +} + + +void Cursor::checkNewWordPosition() +{ + if (!lyxrc.spellcheck_continuously || new_word_.empty()) + return ; + if (!inTexted()) + clearNewWordPosition(); + else { + // forget the position of the current new word if + // 1) the paragraph changes or + // 2) the count of nested insets changes or + // 3) the cursor pos is out of paragraph bound + if (pit() != new_word_.pit() || + depth() != new_word_.depth() || + new_word_.pos() > new_word_.lastpos()) { + clearNewWordPosition(); + } else if (new_word_.fixIfBroken()) + // 4) or the remembered position was "broken" + clearNewWordPosition(); + else { + FontSpan nw = locateWord(WHOLE_WORD); + if (!nw.empty()) { + FontSpan ow = new_word_.locateWord(WHOLE_WORD); + if (nw.intersect(ow).empty()) + clearNewWordPosition(); + else + LYXERR(Debug::DEBUG, "new word: " + << " par: " << pit() + << " pos: " << nw.first << ".." << nw.last); + } else { + clearNewWordPosition(); + } + } + } +} + bool Cursor::posBackward() { @@ -469,8 +644,9 @@ bool Cursor::posVisRight(bool skip_inset) 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... + // 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()); } @@ -483,8 +659,9 @@ bool Cursor::posVisRight(bool skip_inset) 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... + // 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)); @@ -492,37 +669,43 @@ bool Cursor::posVisRight(bool skip_inset) // 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. + // 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. + 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(), + // 1. if new_pos is now lastpos, and we're in + // an RTL paragraph (this 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() + && paragraph().isRTL(buffer()->params())) + // 2. if the position *after* right_pos is RTL + // (we want to be *after* right_pos, not + // before right_pos + 1!) + || paragraph().getFontSettings(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'. + // 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); @@ -532,7 +715,8 @@ bool Cursor::posVisRight(bool skip_inset) bool moved = (new_cur.pos() != pos() || new_cur.pit() != pit() - || new_cur.boundary() != boundary()); + || new_cur.boundary() != boundary() + || &new_cur.inset() != &inset()); if (moved) { LYXERR(Debug::RTL, "moving to: " << new_cur.pos() @@ -560,8 +744,9 @@ bool Cursor::posVisLeft(bool skip_inset) 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... + // 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()); } @@ -574,8 +759,9 @@ bool Cursor::posVisLeft(bool skip_inset) 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... + // 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)); @@ -583,37 +769,43 @@ bool Cursor::posVisLeft(bool skip_inset) // 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. + // 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. + 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(), + // 1. if new_pos is now lastpos and we're in + // an LTR paragraph (this 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() + && !paragraph().isRTL(buffer()->params())) + // 2. if the position *after* left_pos is not + // RTL (we want to be *after* left_pos, not + // before left_pos + 1!) + || !paragraph().getFontSettings(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'. + // 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); @@ -639,100 +831,107 @@ void Cursor::getSurroundingPos(pos_type & left_pos, pos_type & right_pos) { // preparing bidi tables Paragraph const & par = paragraph(); - Buffer const & buf = buffer(); + Buffer const & buf = *buffer(); Row const & row = textRow(); Bidi bidi; bidi.computeTables(par, buf, row); LYXERR(Debug::RTL, "bidi: " << row.pos() << "--" << row.endpos()); - // The cursor is painted *before* the character at pos(), or, if 'boundary' - // is true, *after* the character at (pos() - 1). So we already have one - // known position around the cursor: - pos_type known_pos = boundary() ? pos() - 1 : pos(); + // The cursor is painted *before* the character at pos(), or, + // if 'boundary' is true, *after* the character at (pos() - + // 1). So we already have one known position around the + // cursor: + pos_type const known_pos = boundary() && pos() > 0 ? pos() - 1 : pos(); - // edge case: if we're at the end of the paragraph, things are a little - // different (because lastpos is a position which does not really "exist" - // --- there's no character there yet). + // edge case: if we're at the end of the paragraph, things are + // a little different (because lastpos is a position which + // does not really "exist" --- there's no character there + // yet). if (known_pos == lastpos()) { if (par.isRTL(buf.params())) { left_pos = -1; right_pos = bidi.vis2log(row.pos()); - } - else { // LTR paragraph + } else { + // LTR paragraph right_pos = -1; left_pos = bidi.vis2log(row.endpos() - 1); } return; } - // Whether 'known_pos' is to the left or to the right of the cursor depends - // on whether it is an RTL or LTR character... + // Whether 'known_pos' is to the left or to the right of the + // cursor depends on whether it is an RTL or LTR character... bool const cur_is_RTL = par.getFontSettings(buf.params(), known_pos).isVisibleRightToLeft(); // ... in the following manner: - // For an RTL character, "before" means "to the right" and "after" means - // "to the left"; and for LTR, it's the reverse. So, 'known_pos' is to the - // right of the cursor if (RTL && boundary) or (!RTL && !boundary): - bool known_pos_on_right = (cur_is_RTL == boundary()); - - // So we now know one of the positions surrounding the cursor. Let's - // determine the other one: - + // For an RTL character, "before" + // means "to the right" and "after" means "to the left"; and + // for LTR, it's the reverse. So, 'known_pos' is to the right + // of the cursor if (RTL && boundary) or (!RTL && !boundary): + bool const known_pos_on_right = cur_is_RTL == boundary(); + + // So we now know one of the positions surrounding the cursor. + // Let's determine the other one: if (known_pos_on_right) { right_pos = known_pos; // *visual* position of 'left_pos': pos_type v_left_pos = bidi.log2vis(right_pos) - 1; - // If the position we just identified as 'left_pos' is a "skipped - // separator" (a separator which is at the logical end of a row, - // except for the last row in a paragraph; such separators are not - // painted, so they "are not really there"; note that in bidi text, - // such a separator could appear visually in the middle of a row), - // set 'left_pos' to the *next* position to the left. + // If the position we just identified as 'left_pos' is + // a "skipped separator" (a separator which is at the + // logical end of a row, except for the last row in a + // paragraph; such separators are not painted, so they + // "are not really there"; note that in bidi text, + // such a separator could appear visually in the + // middle of a row), set 'left_pos' to the *next* + // position to the left. if (bidi.inRange(v_left_pos) && bidi.vis2log(v_left_pos) + 1 == row.endpos() && row.endpos() < lastpos() - && par.isSeparator(bidi.vis2log(v_left_pos))) { + && par.isSeparator(bidi.vis2log(v_left_pos))) --v_left_pos; - } + // calculate the logical position of 'left_pos', if in row if (!bidi.inRange(v_left_pos)) left_pos = -1; else left_pos = bidi.vis2log(v_left_pos); - // If the position we identified as 'right_pos' is a "skipped - // separator", set 'right_pos' to the *next* position to the right. + // If the position we identified as 'right_pos' is a + // "skipped separator", set 'right_pos' to the *next* + // position to the right. if (right_pos + 1 == row.endpos() && row.endpos() < lastpos() && par.isSeparator(right_pos)) { - pos_type v_right_pos = bidi.log2vis(right_pos) + 1; + pos_type const v_right_pos = bidi.log2vis(right_pos) + 1; if (!bidi.inRange(v_right_pos)) right_pos = -1; else right_pos = bidi.vis2log(v_right_pos); } - } - else { // known_pos is on the left + } else { + // known_pos is on the left left_pos = known_pos; // *visual* position of 'right_pos' pos_type v_right_pos = bidi.log2vis(left_pos) + 1; - // If the position we just identified as 'right_pos' is a "skipped - // separator", set 'right_pos' to the *next* position to the right. + // If the position we just identified as 'right_pos' + // is a "skipped separator", set 'right_pos' to the + // *next* position to the right. if (bidi.inRange(v_right_pos) && bidi.vis2log(v_right_pos) + 1 == row.endpos() && row.endpos() < lastpos() - && par.isSeparator(bidi.vis2log(v_right_pos))) { + && par.isSeparator(bidi.vis2log(v_right_pos))) ++v_right_pos; - } + // calculate the logical position of 'right_pos', if in row if (!bidi.inRange(v_right_pos)) right_pos = -1; else right_pos = bidi.vis2log(v_right_pos); - // If the position we identified as 'left_pos' is a "skipped - // separator", set 'left_pos' to the *next* position to the left. + // If the position we identified as 'left_pos' is a + // "skipped separator", set 'left_pos' to the *next* + // position to the left. if (left_pos + 1 == row.endpos() && row.endpos() < lastpos() && par.isSeparator(left_pos)) { - pos_type v_left_pos = bidi.log2vis(left_pos) - 1; + pos_type const v_left_pos = bidi.log2vis(left_pos) - 1; if (!bidi.inRange(v_left_pos)) left_pos = -1; else @@ -746,20 +945,20 @@ void Cursor::getSurroundingPos(pos_type & left_pos, pos_type & right_pos) bool Cursor::posVisToNewRow(bool movingLeft) { Paragraph const & par = paragraph(); - Buffer const & buf = buffer(); + Buffer const & buf = *buffer(); Row const & row = textRow(); bool par_is_LTR = !par.isRTL(buf.params()); - // Inside a table, determining whether to move to the next or previous row - // should be done based on the table's direction. + // Inside a table, determining whether to move to the next or + // previous row should be done based on the table's direction. int s = depth() - 1; if (s >= 1 && (*this)[s].inset().asInsetTabular()) { par_is_LTR = !(*this)[s].inset().asInsetTabular()->isRightToLeft(*this); LYXERR(Debug::RTL, "Inside table! par_is_LTR=" << (par_is_LTR ? 1 : 0)); } - // if moving left in an LTR paragraph or moving right in an RTL one, - // move to previous row + // if moving left in an LTR paragraph or moving right in an + // RTL one, move to previous row if (par_is_LTR == movingLeft) { if (row.pos() == 0) { // we're at first row in paragraph if (pit() == 0) // no previous paragraph! don't move @@ -773,8 +972,8 @@ bool Cursor::posVisToNewRow(bool movingLeft) boundary(false); } } - // if moving left in an RTL paragraph or moving right in an LTR one, - // move to next row + // if moving left in an RTL paragraph or moving right in an + // LTR one, move to next row else { if (row.endpos() == lastpos()) { // we're at last row in paragraph if (pit() == lastpit()) // last paragraph! don't move @@ -800,7 +999,7 @@ void Cursor::posVisToRowExtremity(bool left) { // prepare bidi tables Paragraph const & par = paragraph(); - Buffer const & buf = buffer(); + Buffer const & buf = *buffer(); Row const & row = textRow(); Bidi bidi; bidi.computeTables(par, buf, row); @@ -816,89 +1015,113 @@ void Cursor::posVisToRowExtremity(bool left) else { pos() = bidi.vis2log(row.pos()); - // Moving to the leftmost position in the row, the cursor should - // normally be placed to the *left* of the leftmost position. - // A very common exception, though, is if the leftmost character - // also happens to be the separator at the (logical) end of the row - // --- in this case, the separator is positioned beyond the left - // margin, and we don't want to move the cursor there (moving to - // the left of the separator is equivalent to moving to the next - // line). So, in this case we actually want to place the cursor - // to the *right* of the leftmost position (the separator). - // Another exception is if we're moving to the logically last - // position in the row, which is *not* a separator: this means - // that the entire row has no separators (if there were any, the - // row would have been broken there); and therefore in this case - // we also move to the *right* of the last position (this indicates - // to the user that there is no space after this position, and is - // consistent with the behavior in the middle of a row --- moving - // right or left moves to the next/previous character; if we were - // to move to the *left* of this position, that would simulate - // a separator which is not really there!). - // Finally, there is an exception to the previous exception: if - // this non-separator-but-last-position-in-row is an inset, then - // we *do* want to stay to the left of it anyway: this is the + // Moving to the leftmost position in the row, + // the cursor should normally be placed to the + // *left* of the leftmost position. A very + // common exception, though, is if the + // leftmost character also happens to be the + // separator at the (logical) end of the row + // --- in this case, the separator is + // positioned beyond the left margin, and we + // don't want to move the cursor there (moving + // to the left of the separator is equivalent + // to moving to the next line). So, in this + // case we actually want to place the cursor + // to the *right* of the leftmost position + // (the separator). Another exception is if + // we're moving to the logically last position + // in the row, which is *not* a separator: + // this means that the entire row has no + // separators (if there were any, the row + // would have been broken there); and + // therefore in this case we also move to the + // *right* of the last position (this + // indicates to the user that there is no + // space after this position, and is + // consistent with the behavior in the middle + // of a row --- moving right or left moves to + // the next/previous character; if we were to + // move to the *left* of this position, that + // would simulate a separator which is not + // really there!). Finally, there is an + // exception to the previous exception: if + // this non-separator-but-last-position-in-row + // is an inset, then we *do* want to stay to + // the left of it anyway: this is the // "boundary" which we simulate at insets. - bool right_of_pos = false; // do we want to be to the right of pos? - + // Another exception is when row.endpos() is + // 0. + + // do we want to be to the right of pos? // as explained above, if at last pos in row, stay to the right - if ((pos() == row.endpos() - 1) && !par.isInset(pos())) - right_of_pos = true; + bool const right_of_pos = row.endpos() > 0 + && pos() == row.endpos() - 1 && !par.isInset(pos()); // Now we know if we want to be to the left or to the right of pos, // let's make sure we are where we want to be. - bool new_pos_is_RTL = + bool const new_pos_is_RTL = par.getFontSettings(buf.params(), pos()).isVisibleRightToLeft(); - if (new_pos_is_RTL == !right_of_pos) { + if (new_pos_is_RTL != right_of_pos) { ++pos(); boundary(true); } - } - } - else { // move to rightmost position + } else { + // move to rightmost position // if this is an LTR paragraph, and we're at the last row in the // paragraph, move to lastpos if (!par.isRTL(buf.params()) && row.endpos() == lastpos()) pos() = lastpos(); else { - pos() = bidi.vis2log(row.endpos() - 1); - - // Moving to the rightmost position in the row, the cursor should - // normally be placed to the *right* of the rightmost position. - // A very common exception, though, is if the rightmost character - // also happens to be the separator at the (logical) end of the row - // --- in this case, the separator is positioned beyond the right - // margin, and we don't want to move the cursor there (moving to - // the right of the separator is equivalent to moving to the next - // line). So, in this case we actually want to place the cursor - // to the *left* of the rightmost position (the separator). - // Another exception is if we're moving to the logically last - // position in the row, which is *not* a separator: this means - // that the entire row has no separators (if there were any, the - // row would have been broken there); and therefore in this case - // we also move to the *left* of the last position (this indicates - // to the user that there is no space after this position, and is - // consistent with the behavior in the middle of a row --- moving - // right or left moves to the next/previous character; if we were - // to move to the *right* of this position, that would simulate - // a separator which is not really there!). - // Finally, there is an exception to the previous exception: if - // this non-separator-but-last-position-in-row is an inset, then - // we *do* want to stay to the right of it anyway: this is the - // "boundary" which we simulate at insets. + pos() = row.endpos() > 0 ? bidi.vis2log(row.endpos() - 1) : 0; + + // Moving to the rightmost position in the + // row, the cursor should normally be placed + // to the *right* of the rightmost position. A + // very common exception, though, is if the + // rightmost character also happens to be the + // separator at the (logical) end of the row + // --- in this case, the separator is + // positioned beyond the right margin, and we + // don't want to move the cursor there (moving + // to the right of the separator is equivalent + // to moving to the next line). So, in this + // case we actually want to place the cursor + // to the *left* of the rightmost position + // (the separator). Another exception is if + // we're moving to the logically last position + // in the row, which is *not* a separator: + // this means that the entire row has no + // separators (if there were any, the row + // would have been broken there); and + // therefore in this case we also move to the + // *left* of the last position (this indicates + // to the user that there is no space after + // this position, and is consistent with the + // behavior in the middle of a row --- moving + // right or left moves to the next/previous + // character; if we were to move to the + // *right* of this position, that would + // simulate a separator which is not really + // there!). Finally, there is an exception to + // the previous exception: if this + // non-separator-but-last-position-in-row is + // an inset, then we *do* want to stay to the + // right of it anyway: this is the "boundary" + // which we simulate at insets. Another + // exception is when row.endpos() is 0. - bool left_of_pos = false; // do we want to be to the left of pos? - - // as explained above, if at last pos in row, stay to the left - if ((pos() == row.endpos() - 1) && !par.isInset(pos())) - left_of_pos = true; + // do we want to be to the left of pos? + // as explained above, if at last pos in row, stay to the left, + // unless the last position is the same as the first. + bool const left_of_pos = row.endpos() > 0 + && pos() == row.endpos() - 1 && !par.isInset(pos()); // Now we know if we want to be to the left or to the right of pos, // let's make sure we are where we want to be. - bool new_pos_is_RTL = + bool const new_pos_is_RTL = par.getFontSettings(buf.params(), pos()).isVisibleRightToLeft(); if (new_pos_is_RTL == left_of_pos) { @@ -912,9 +1135,16 @@ void Cursor::posVisToRowExtremity(bool left) } -CursorSlice Cursor::anchor() const +CursorSlice Cursor::normalAnchor() const { - LASSERT(anchor_.depth() >= depth(), /**/); + if (!selection()) + return top(); + // LASSERT: There have been several bugs around this code, that seem + // to involve failures to reset the anchor. We can at least not crash + // in release mode by resetting it ourselves. + LASSERT(anchor_.depth() >= depth(), + const_cast(anchor_) = *this); + CursorSlice normal = anchor_[depth() - 1]; if (depth() < anchor_.depth() && top() <= normal) { // anchor is behind cursor -> move anchor behind the inset @@ -924,11 +1154,17 @@ CursorSlice Cursor::anchor() const } +DocIterator & Cursor::realAnchor() +{ + return anchor_; +} + + CursorSlice Cursor::selBegin() const { if (!selection()) return top(); - return anchor() < top() ? anchor() : top(); + return normalAnchor() < top() ? normalAnchor() : top(); } @@ -936,7 +1172,7 @@ CursorSlice Cursor::selEnd() const { if (!selection()) return top(); - return anchor() > top() ? anchor() : top(); + return normalAnchor() > top() ? normalAnchor() : top(); } @@ -948,10 +1184,10 @@ DocIterator Cursor::selectionBegin() const DocIterator di; // FIXME: This is a work-around for the problem that // CursorSlice doesn't keep track of the boundary. - if (anchor() == top()) + if (normalAnchor() == top()) di = anchor_.boundary() > boundary() ? anchor_ : *this; else - di = anchor() < top() ? anchor_ : *this; + di = normalAnchor() < top() ? anchor_ : *this; di.resize(depth()); return di; } @@ -965,10 +1201,10 @@ DocIterator Cursor::selectionEnd() const DocIterator di; // FIXME: This is a work-around for the problem that // CursorSlice doesn't keep track of the boundary. - if (anchor() == top()) + if (normalAnchor() == top()) di = anchor_.boundary() < boundary() ? anchor_ : *this; else - di = anchor() > top() ? anchor_ : *this; + di = normalAnchor() > top() ? anchor_ : *this; if (di.depth() > depth()) { di.resize(depth()); @@ -980,20 +1216,20 @@ DocIterator Cursor::selectionEnd() const void Cursor::setSelection() { - selection() = true; + setSelection(true); // A selection with no contents is not a selection // FIXME: doesnt look ok - if (idx() == anchor().idx() && - pit() == anchor().pit() && - pos() == anchor().pos()) - selection() = false; + if (idx() == normalAnchor().idx() && + pit() == normalAnchor().pit() && + pos() == normalAnchor().pos()) + setSelection(false); } void Cursor::setSelection(DocIterator const & where, int n) { setCursor(where); - selection() = true; + setSelection(true); anchor_ = where; pos() += n; } @@ -1001,8 +1237,9 @@ void Cursor::setSelection(DocIterator const & where, int n) void Cursor::clearSelection() { - selection() = false; - mark() = false; + setSelection(false); + setWordSelection(false); + setMark(false); resetAnchor(); } @@ -1065,7 +1302,7 @@ bool Cursor::selHandle(bool sel) cap::saveSelection(*this); resetAnchor(); - selection() = sel; + setSelection(sel); return true; } @@ -1120,9 +1357,6 @@ LyXErr & operator<<(LyXErr & os, Cursor const & cur) namespace lyx { -//#define FILEDEBUG 1 - - bool Cursor::isInside(Inset const * p) const { for (size_t i = 0; i != depth(); ++i) @@ -1196,13 +1430,14 @@ void Cursor::plainInsert(MathAtom const & t) ++pos(); inset().setBuffer(bv_->buffer()); inset().initView(); + forceBufferUpdate(); } void Cursor::insert(docstring const & str) { for_each(str.begin(), str.end(), - boost::bind(static_cast + bind(static_cast (&Cursor::insert), this, _1)); } @@ -1210,7 +1445,7 @@ void Cursor::insert(docstring const & str) void Cursor::insert(char_type c) { //lyxerr << "Cursor::insert char '" << c << "'" << endl; - LASSERT(!empty(), /**/); + LASSERT(!empty(), return); if (inMathed()) { cap::selClearOrDel(*this); insert(new InsetMathChar(c)); @@ -1231,25 +1466,28 @@ void Cursor::insert(MathAtom const & t) void Cursor::insert(Inset * inset0) { - LASSERT(inset0, /**/); + LASSERT(inset0, return); if (inMathed()) - insert(MathAtom(inset0)); + insert(MathAtom(inset0->asInsetMath())); else { text()->insertInset(*this, inset0); inset0->setBuffer(bv_->buffer()); inset0->initView(); + if (inset0->isLabeled()) + forceBufferUpdate(); } } -void Cursor::niceInsert(docstring const & t) +int Cursor::niceInsert(docstring const & t, Parse::flags f, bool enter) { - MathData ar; - asArray(t, ar); - if (ar.size() == 1) + MathData ar(buffer()); + asArray(t, ar, f); + if (ar.size() == 1 && (enter || selection())) niceInsert(ar[0]); else insert(ar); + return ar.size(); } @@ -1258,16 +1496,25 @@ void Cursor::niceInsert(MathAtom const & t) macroModeClose(); docstring const safe = cap::grabAndEraseSelection(*this); plainInsert(t); - // enter the new inset and move the contents of the selection if possible + // If possible, enter the new inset and move the contents of the selection if (t->isActive()) { posBackward(); // be careful here: don't use 'pushBackward(t)' as this we need to // push the clone, not the original pushBackward(*nextInset()); // We may not use niceInsert here (recursion) - MathData ar; + MathData ar(buffer()); asArray(safe, ar); insert(ar); + } else if (t->asMacro() && !safe.empty()) { + MathData ar(buffer()); + asArray(safe, ar); + docstring const name = t->asMacro()->name(); + MacroData const * data = buffer()->getMacro(name); + if (data && data->numargs() - data->optionals() > 0) { + plainInsert(MathAtom(new InsetMathBrace(ar))); + posBackward(); + } } } @@ -1279,13 +1526,13 @@ void Cursor::insert(MathData const & ar) cap::eraseSelection(*this); cell().insert(pos(), ar); pos() += ar.size(); + // FIXME audit setBuffer calls + inset().setBuffer(bv_->buffer()); } bool Cursor::backspace() { - autocorrect() = false; - if (selection()) { cap::eraseSelection(*this); return true; @@ -1324,7 +1571,7 @@ bool Cursor::backspace() // let's require two backspaces for 'big stuff' and // highlight on the first resetAnchor(); - selection() = true; + setSelection(true); --pos(); } else { --pos(); @@ -1336,7 +1583,6 @@ bool Cursor::backspace() bool Cursor::erase() { - autocorrect() = false; if (inMacroMode()) return true; @@ -1372,7 +1618,7 @@ bool Cursor::erase() // 'clever' UI hack: only erase large items if previously slected if (pos() != lastpos() && nextAtom()->nargs() > 0) { resetAnchor(); - selection() = true; + setSelection(true); ++pos(); } else { plainErase(); @@ -1391,7 +1637,6 @@ bool Cursor::up() if (disp_.dispatched()) return true; setCursor(save); - autocorrect() = false; return false; } @@ -1405,7 +1650,6 @@ bool Cursor::down() if (disp_.dispatched()) return true; setCursor(save); - autocorrect() = false; return false; } @@ -1416,7 +1660,7 @@ bool Cursor::macroModeClose() return false; InsetMathUnknown * p = activeMacro(); p->finalize(); - MathData selection; + MathData selection(buffer()); asArray(p->selection(), selection); docstring const s = p->name(); --pos(); @@ -1428,13 +1672,14 @@ bool Cursor::macroModeClose() // trigger updates of macros, at least, if no full // updates take place anyway - updateFlags(Update::Force); + screenUpdateFlags(Update::Force); docstring const name = s.substr(1); InsetMathNest * const in = inset().asInsetMath()->asNestInset(); if (in && in->interpretString(*this, s)) return true; - MathAtom atom = createInsetMath(name); + MathAtom atom = buffer()->getMacro(name, *this, false) ? + MathAtom(new MathMacro(buffer(), name)) : createInsetMath(name, buffer()); // try to put argument into macro, if we just inserted a macro bool macroArg = false; @@ -1443,8 +1688,8 @@ bool Cursor::macroModeClose() // macros here are still unfolded (in init mode in fact). So // we have to resolve the macro here manually and check its arity // to put the selection behind it if arity > 0. - MacroData const * data = buffer().getMacro(atomAsMacro->name()); - if (selection.size() > 0 && data && data->numargs() - data->optionals() > 0) { + MacroData const * data = buffer()->getMacro(atomAsMacro->name()); + if (!selection.empty() && data && data->numargs() - data->optionals() > 0) { macroArg = true; atomAsMacro->setDisplayMode(MathMacro::DISPLAY_INTERACTIVE_INIT, 1); } else @@ -1460,7 +1705,7 @@ bool Cursor::macroModeClose() // finally put the macro argument behind, if needed if (macroArg) { - if (selection.size() > 1) + if (selection.size() > 1 || selection[0]->asScriptInset()) plainInsert(MathAtom(new InsetMathBrace(selection))); else insert(selection); @@ -1517,7 +1762,7 @@ bool Cursor::inMacroMode() const { if (!inMathed()) return false; - if (pos() == 0) + if (pos() == 0 || cell().empty()) return false; InsetMathUnknown const * p = prevAtom()->asUnknownInset(); return p && !p->final(); @@ -1576,7 +1821,7 @@ void Cursor::normalize() << pos() << ' ' << lastpos() << " in idx: " << idx() << " in atom: '"; odocstringstream os; - WriteStream wi(os, false, true, false); + WriteStream wi(os, false, true, WriteStream::wsDefault); inset().asInsetMath()->write(wi); lyxerr << to_utf8(os.str()) << endl; pos() = lastpos(); @@ -1593,8 +1838,8 @@ bool Cursor::upDownInMath(bool up) int xo = 0; int yo = 0; getPos(xo, yo); - xo = theLyXFunc().cursorBeforeDispatchX(); - + xo = beforeDispatchPosX_; + // check if we had something else in mind, if not, this is the future // target if (x_target_ == -1) @@ -1643,7 +1888,7 @@ bool Cursor::upDownInMath(bool up) int x; int y; getPos(x, y); - int oy = theLyXFunc().cursorBeforeDispatchY(); + int oy = beforeDispatchPosY_; if ((!up && y <= oy) || (up && y >= oy)) operator=(old); @@ -1664,7 +1909,7 @@ bool Cursor::upDownInMath(bool up) int x; int y; getPos(x, y); - int oy = theLyXFunc().cursorBeforeDispatchY(); + int oy = beforeDispatchPosY_; if ((!up && y <= oy) || (up && y >= oy)) operator=(old); @@ -1688,7 +1933,7 @@ bool Cursor::upDownInMath(bool up) //lyxerr << "updown: popBackward succeeded" << endl; int xnew; int ynew; - int yold = theLyXFunc().cursorBeforeDispatchY(); + int yold = beforeDispatchPosY_; getPos(xnew, ynew); if (up ? ynew < yold : ynew > yold) return true; @@ -1700,15 +1945,38 @@ bool Cursor::upDownInMath(bool up) } +bool Cursor::atFirstOrLastRow(bool up) +{ + TextMetrics const & tm = bv_->textMetrics(text()); + ParagraphMetrics const & pm = tm.parMetrics(pit()); + + int row; + if (pos() && boundary()) + row = pm.pos2row(pos() - 1); + else + row = pm.pos2row(pos()); + + if (up) { + if (pit() == 0 && row == 0) + return true; + } else { + if (pit() + 1 >= int(text()->paragraphs().size()) && + row + 1 >= int(pm.rows().size())) + return true; + } + return false; +} + + bool Cursor::upDownInText(bool up, bool & updateNeeded) { - LASSERT(text(), /**/); + LASSERT(text(), return false); // where are we? int xo = 0; int yo = 0; getPos(xo, yo); - xo = theLyXFunc().cursorBeforeDispatchX(); + xo = beforeDispatchPosX_; // update the targetX - this is here before the "return false" // to set a new target which can be used by InsetTexts above @@ -1717,14 +1985,16 @@ bool Cursor::upDownInText(bool up, bool & updateNeeded) setTargetX(xo); else if (xo - textTargetOffset() != x_target() && depth() == beforeDispatchCursor_.depth()) { - // In text mode inside the line (not left or right) possibly set a new target_x, - // but only if we are somewhere else than the previous target-offset. + // In text mode inside the line (not left or right) + // possibly set a new target_x, but only if we are + // somewhere else than the previous target-offset. - // We want to keep the x-target on subsequent up/down movements - // that cross beyond the end of short lines. Thus a special - // handling when the cursor is at the end of line: Use the new - // x-target only if the old one was before the end of line - // or the old one was after the beginning of the line + // We want to keep the x-target on subsequent up/down + // movements that cross beyond the end of short lines. + // Thus a special handling when the cursor is at the + // end of line: Use the new x-target only if the old + // one was before the end of line or the old one was + // after the beginning of the line bool inRTL = isWithinRtlParagraph(*this); bool left; bool right; @@ -1753,19 +2023,44 @@ bool Cursor::upDownInText(bool up, bool & updateNeeded) else row = pm.pos2row(pos()); - // are we not at the start or end? - if (up) { - if (pit() == 0 && row == 0) - return false; - } else { - if (pit() + 1 >= int(text()->paragraphs().size()) && - row + 1 >= int(pm.rows().size())) - return false; + if (atFirstOrLastRow(up)) { + // Is there a place for the cursor to go ? If yes, we + // can execute the DEPM, otherwise we should keep the + // paragraph to host the cursor. + Cursor dummy = *this; + bool valid_destination = false; + for(; dummy.depth(); dummy.pop()) + if (!dummy.atFirstOrLastRow(up)) { + valid_destination = true; + break; + } + + // will a next dispatch follow and if there is a new + // dispatch will it move the cursor out ? + if (depth() > 1 && valid_destination) { + // The cursor hasn't changed yet. This happens when + // you e.g. move out of an inset. And to give the + // DEPM the possibility of doing something we must + // provide it with two different cursors. (Lgb, vfr) + dummy = *this; + dummy.pos() = dummy.pos() == 0 ? dummy.lastpos() : 0; + dummy.pit() = dummy.pit() == 0 ? dummy.lastpit() : 0; + + updateNeeded |= bv().checkDepm(dummy, *this); + updateTextTargetOffset(); + if (updateNeeded) { + forceBufferUpdate(); + // DEPM may have requested a screen update + this->screenUpdateFlags( + this->screenUpdate() | dummy.screenUpdate()); + } + } + return false; } // with and without selection are handled differently if (!selection()) { - int yo = bv().getPos(*this, boundary()).y_; + int yo = bv().getPos(*this).y_; Cursor old = *this; // To next/previous row if (up) @@ -1774,47 +2069,63 @@ bool Cursor::upDownInText(bool up, bool & updateNeeded) tm.editXY(*this, xo, yo + textRow().descent() + 1); clearSelection(); - // This happens when you move out of an inset. - // And to give the DEPM the possibility of doing - // something we must provide it with two different - // cursors. (Lgb) + // This happens when you move out of an inset. + // And to give the DEPM the possibility of doing + // something we must provide it with two different + // cursors. (Lgb) Cursor dummy = *this; if (dummy == old) ++dummy.pos(); if (bv().checkDepm(dummy, old)) { updateNeeded = true; - // Make sure that cur gets back whatever happened to dummy(Lgb) + // Make sure that cur gets back whatever happened to dummy (Lgb) + // This will include any screen update requested by DEPM operator=(dummy); } } else { - // if there is a selection, we stay out of any inset, and just jump to the right position: + // if there is a selection, we stay out of any inset, + // and just jump to the right position: Cursor old = *this; + int next_row = row; if (up) { if (row > 0) { - top().pos() = min(tm.x2pos(pit(), row - 1, xo), top().lastpos()); + --next_row; } else if (pit() > 0) { --pit(); TextMetrics & tm = bv_->textMetrics(text()); if (!tm.contains(pit())) tm.newParMetricsUp(); ParagraphMetrics const & pmcur = tm.parMetrics(pit()); - top().pos() = min(tm.x2pos(pit(), pmcur.rows().size() - 1, xo), top().lastpos()); + next_row = pmcur.rows().size() - 1; } } else { if (row + 1 < int(pm.rows().size())) { - top().pos() = min(tm.x2pos(pit(), row + 1, xo), top().lastpos()); + ++next_row; } else if (pit() + 1 < int(text()->paragraphs().size())) { ++pit(); TextMetrics & tm = bv_->textMetrics(text()); if (!tm.contains(pit())) tm.newParMetricsDown(); - top().pos() = min(tm.x2pos(pit(), 0, xo), top().lastpos()); + next_row = 0; } } + top().pos() = min(tm.x2pos(pit(), next_row, xo), top().lastpos()); + + int const xpos = tm.x2pos(pit(), next_row, xo); + bool const at_end_row = xpos == tm.x2pos(pit(), next_row, tm.width()); + bool const at_beg_row = xpos == tm.x2pos(pit(), next_row, 0); + + if (at_end_row && at_beg_row) + // make sure the cursor ends up on this row + boundary(false); + else + boundary(at_end_row); updateNeeded |= bv().checkDepm(*this, old); } + if (updateNeeded) + forceBufferUpdate(); updateTextTargetOffset(); return true; } @@ -1842,8 +2153,8 @@ void Cursor::handleFont(string const & font) } else { // cursor in between. split cell MathData::iterator bt = cell().begin(); - MathAtom at = createInsetMath(from_utf8(font)); - at.nucleus()->cell(0) = MathData(bt, bt + pos()); + MathAtom at = createInsetMath(from_utf8(font), buffer()); + at.nucleus()->cell(0) = MathData(buffer(), bt, bt + pos()); cell().erase(bt, bt + pos()); popBackward(); plainInsert(at); @@ -1860,13 +2171,30 @@ void Cursor::handleFont(string const & font) void Cursor::message(docstring const & msg) const { - theLyXFunc().setMessage(msg); + disp_.setMessage(msg); } void Cursor::errorMessage(docstring const & msg) const { - theLyXFunc().setErrorMessage(msg); + disp_.setMessage(msg); + disp_.setError(true); +} + + +namespace { + +docstring parbreak(Cursor const * cur) +{ + odocstringstream os; + os << '\n'; + // only add blank line if we're not in a ParbreakIsNewline situation + if (!cur->inset().getLayout().parbreakIsNewline() + && !cur->paragraph().layout().parbreak_is_newline) + os << '\n'; + return os.str(); +} + } @@ -1875,51 +2203,47 @@ docstring Cursor::selectionAsString(bool with_label) const if (!selection()) return docstring(); + if (inMathed()) + return cap::grabSelection(*this); + 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(); - - pit_type const startpit = selBegin().pit(); - pit_type const endpit = selEnd().pit(); - size_t const startpos = selBegin().pos(); - size_t const endpos = selEnd().pos(); - - if (startpit == endpit) - return pars[startpit].asString(startpos, endpos, label); - - // First paragraph in selection - docstring result = pars[startpit]. - asString(startpos, pars[startpit].size(), label) - + parbreak(pars[startpit]); - - // The paragraphs in between (if any) - for (pit_type pit = startpit + 1; pit != endpit; ++pit) { - Paragraph const & par = pars[pit]; - result += par.asString(0, par.size(), label) - + parbreak(pars[pit]); - } + 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(); - // Last paragraph in selection - result += pars[endpit].asString(0, endpos, label); + pit_type const startpit = selBegin().pit(); + pit_type const endpit = selEnd().pit(); + size_t const startpos = selBegin().pos(); + size_t const endpos = selEnd().pos(); - return result; + if (startpit == endpit) + return pars[startpit].asString(startpos, endpos, label); + + // First paragraph in selection + docstring result = pars[startpit]. + asString(startpos, pars[startpit].size(), label) + + parbreak(this); + + // The paragraphs in between (if any) + for (pit_type pit = startpit + 1; pit != endpit; ++pit) { + Paragraph const & par = pars[pit]; + result += par.asString(0, par.size(), label) + + parbreak(this); } - if (inMathed()) - return cap::grabSelection(*this); + // Last paragraph in selection + result += pars[endpit].asString(0, endpos, label); - return docstring(); + return result; } @@ -1951,40 +2275,58 @@ Encoding const * Cursor::getEncoding() const CursorSlice const & sl = innerTextSlice(); Text const & text = *sl.text(); Font font = text.getPar(sl.pit()).getFont( - bv().buffer().params(), sl.pos(), outerFont(sl.pit(), text.paragraphs())); + bv().buffer().params(), sl.pos(), text.outerFont(sl.pit())); return font.language()->encoding(); } -void Cursor::undispatched() +void Cursor::undispatched() const { disp_.dispatched(false); } -void Cursor::dispatched() +void Cursor::dispatched() const { disp_.dispatched(true); } -void Cursor::updateFlags(Update::flags f) +void Cursor::screenUpdateFlags(Update::flags f) const +{ + disp_.screenUpdate(f); +} + + +void Cursor::forceBufferUpdate() const +{ + disp_.forceBufferUpdate(); +} + + +void Cursor::clearBufferUpdate() const { - disp_.update(f); + disp_.clearBufferUpdate(); } -void Cursor::noUpdate() +bool Cursor::needBufferUpdate() const { - disp_.update(Update::None); + return disp_.needBufferUpdate(); +} + + +void Cursor::noScreenUpdate() const +{ + disp_.screenUpdate(Update::None); } Font Cursor::getFont() const { - // The logic here should more or less match to the Cursor::setCurrentFont - // logic, i.e. the cursor height should give a hint what will happen - // if a character is entered. + // The logic here should more or less match to the + // Cursor::setCurrentFont logic, i.e. the cursor height should + // give a hint what will happen if a character is entered. // HACK. far from being perfect... @@ -2007,8 +2349,8 @@ Font Cursor::getFont() const } // get font at the position - Font font = par.getFont(bv().buffer().params(), pos, - outerFont(sl.pit(), text.paragraphs())); + Font font = par.getFont(buffer()->params(), pos, + text.outerFont(sl.pit())); return font; } @@ -2016,15 +2358,27 @@ Font Cursor::getFont() const bool Cursor::fixIfBroken() { - if (DocIterator::fixIfBroken()) { - clearSelection(); - return true; + bool const broken_cursor = DocIterator::fixIfBroken(); + bool const broken_anchor = anchor_.fixIfBroken(); + + if (broken_cursor || broken_anchor) { + clearNewWordPosition(); + clearSelection(); + return true; } return false; } -bool notifyCursorLeaves(Cursor const & old, Cursor & cur) +void Cursor::sanitize() +{ + setBuffer(&bv_->buffer()); + DocIterator::sanitize(); + anchor_.sanitize(); +} + + +bool notifyCursorLeavesOrEnters(Cursor const & old, Cursor & cur) { // find inset in common size_type i; @@ -2035,19 +2389,25 @@ bool notifyCursorLeaves(Cursor const & old, Cursor & cur) // update words if we just moved to another paragraph if (i == old.depth() && i == cur.depth() - && !cur.buffer().isClean() + && !cur.buffer()->isClean() && cur.inTexted() && old.inTexted() && cur.pit() != old.pit()) { - old.paragraph().updateWords(old.top()); - return false; + old.paragraph().updateWords(); } - + // notify everything on top of the common part in old cursor, // but stop if the inset claims the cursor to be invalid now - for (; i < old.depth(); ++i) { - Cursor insetPos = old; - insetPos.cutOff(i); - if (old[i].inset().notifyCursorLeaves(insetPos, cur)) + for (size_type j = i; j < old.depth(); ++j) { + Cursor inset_pos = old; + inset_pos.cutOff(j); + if (old[j].inset().notifyCursorLeaves(inset_pos, cur)) + return true; + } + + // notify everything on top of the common part in new cursor, + // but stop if the inset claims the cursor to be invalid now + for (; i < cur.depth(); ++i) { + if (cur[i].inset().notifyCursorEnters(cur)) return true; } @@ -2084,7 +2444,7 @@ void Cursor::setCurrentFont() } // get font - BufferParams const & bufparams = buffer().params(); + BufferParams const & bufparams = buffer()->params(); current_font = par.getFontSettings(bufparams, cpos); real_current_font = tm.displayFont(cpit, cpos); @@ -2103,77 +2463,67 @@ void Cursor::setCurrentFont() bool Cursor::textUndo() { - DocIterator dit = *this; - // Undo::textUndo() will modify dit. - if (!bv_->buffer().undo().textUndo(dit)) + if (!buffer()->undo().textUndo(*this)) return false; - // Set cursor - setCursor(dit); - clearSelection(); - fixIfBroken(); + sanitize(); return true; } bool Cursor::textRedo() { - DocIterator dit = *this; - // Undo::textRedo() will modify dit. - if (!bv_->buffer().undo().textRedo(dit)) + if (!buffer()->undo().textRedo(*this)) return false; - // Set cursor - setCursor(dit); - clearSelection(); - fixIfBroken(); + sanitize(); return true; } void Cursor::finishUndo() const { - bv_->buffer().undo().finishUndo(); + buffer()->undo().finishUndo(); } void Cursor::beginUndoGroup() const { - bv_->buffer().undo().beginUndoGroup(); + buffer()->undo().beginUndoGroup(); } void Cursor::endUndoGroup() const { - bv_->buffer().undo().endUndoGroup(); + buffer()->undo().endUndoGroup(*this); } void Cursor::recordUndo(UndoKind kind, pit_type from, pit_type to) const { - bv_->buffer().undo().recordUndo(*this, kind, from, to); + buffer()->undo().recordUndo(*this, kind, from, to); } void Cursor::recordUndo(UndoKind kind, pit_type from) const { - bv_->buffer().undo().recordUndo(*this, kind, from); + buffer()->undo().recordUndo(*this, kind, from); } void Cursor::recordUndo(UndoKind kind) const { - bv_->buffer().undo().recordUndo(*this, kind); + buffer()->undo().recordUndo(*this, kind); } -void Cursor::recordUndoInset(UndoKind kind) const +void Cursor::recordUndoInset(UndoKind kind, Inset const * inset) const { - bv_->buffer().undo().recordUndoInset(*this, kind); + buffer()->undo().recordUndoInset(*this, kind, inset); } void Cursor::recordUndoFullDocument() const { - bv_->buffer().undo().recordUndoFullDocument(*this); + buffer()->undo().recordUndoFullDocument(*this); } @@ -2184,19 +2534,21 @@ void Cursor::recordUndoSelection() const recordUndoInset(); else recordUndo(); - } else - bv_->buffer().undo().recordUndo(*this, ATOMIC_UNDO, + } else { + buffer()->undo().recordUndo(*this, ATOMIC_UNDO, selBegin().pit(), selEnd().pit()); + } } void Cursor::checkBufferStructure() { - if (paragraph().layout().toclevel == Layout::NOT_IN_TOC) - return; - Buffer const * master = buffer().masterBuffer(); - master->tocBackend().updateItem(ParConstIterator(*this)); - master->structureChanged(); + Buffer const * master = buffer()->masterBuffer(); + master->tocBackend().updateItem(*this); + if (master != buffer() && !master->hasGuiDelegate()) + // In case the master has no gui associated with it, + // the TocItem is not updated (part of bug 5699). + buffer()->tocBackend().updateItem(*this); }