X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCursor.cpp;h=0017e1ae149576b29cdc42ccf9475156691dc127;hb=acc5af9912533261c37795971af269f77317f14f;hp=54a3b8bb7e43974900ba6d97e4534f0ee276de57;hpb=5ddc612b735317d5b22553a63aad7879503e3950;p=lyx.git diff --git a/src/Cursor.cpp b/src/Cursor.cpp index 54a3b8bb7e..0017e1ae14 100644 --- a/src/Cursor.cpp +++ b/src/Cursor.cpp @@ -5,7 +5,8 @@ * * \author Alejandro Aguilar Sierra * \author Alfredo Braunstein - * \author André Pönitz + * \author Dov Feldstern + * \author André Pönitz * \author Stefan Schimanski * * Full author contact details are available in file CREDITS. @@ -14,250 +15,236 @@ #include #include "Bidi.h" -#include "BufferView.h" #include "Buffer.h" -#include "Cursor.h" +#include "BufferView.h" #include "CoordCache.h" +#include "Cursor.h" #include "CutAndPaste.h" -#include "debug.h" #include "DispatchResult.h" #include "Encoding.h" +#include "Font.h" +#include "FuncCode.h" #include "FuncRequest.h" #include "Language.h" -#include "lfuns.h" -#include "Font.h" +#include "LyXAction.h" #include "LyXFunc.h" // only for setMessage() #include "LyXRC.h" -#include "Row.h" -#include "Text.h" #include "Paragraph.h" -#include "paragraph_funcs.h" #include "ParIterator.h" +#include "Row.h" +#include "Text.h" #include "TextMetrics.h" +#include "TocBackend.h" + +#include "support/lassert.h" +#include "support/debug.h" +#include "support/docstream.h" #include "insets/InsetTabular.h" #include "insets/InsetText.h" -#include "mathed/MathData.h" #include "mathed/InsetMath.h" +#include "mathed/InsetMathBrace.h" #include "mathed/InsetMathScript.h" #include "mathed/MacroTable.h" +#include "mathed/MathData.h" +#include "mathed/MathMacro.h" -#include #include -#include #include #include #include -using std::string; -using std::vector; -using std::endl; -using std::min; -using std::for_each; - +using namespace std; namespace lyx { namespace { - bool - positionable(DocIterator const & cursor, DocIterator const & anchor) - { - // avoid deeper nested insets when selecting - if (cursor.depth() > anchor.depth()) +bool positionable(DocIterator const & cursor, DocIterator const & anchor) +{ + // avoid deeper nested insets when selecting + if (cursor.depth() > anchor.depth()) + return false; + + // anchor might be deeper, should have same path then + for (size_t i = 0; i < cursor.depth(); ++i) + if (&cursor[i].inset() != &anchor[i].inset()) return false; - // anchor might be deeper, should have same path then - for (size_t i = 0; i < cursor.depth(); ++i) - if (&cursor[i].inset() != &anchor[i].inset()) - return false; + // position should be ok. + return true; +} - // position should be ok. - return true; - } +// Find position closest to (x, y) in cell given by iter. +// Used only in mathed +DocIterator bruteFind2(Cursor const & c, int x, int y) +{ + double best_dist = numeric_limits::max(); - // Find position closest to (x, y) in cell given by iter. - // Used only in mathed - DocIterator bruteFind2(Cursor const & c, int x, int y) - { - double best_dist = std::numeric_limits::max(); - - DocIterator result; - - DocIterator it = c; - it.top().pos() = 0; - DocIterator et = c; - et.top().pos() = et.top().asInsetMath()->cell(et.top().idx()).size(); - for (size_t i = 0;; ++i) { - int xo; - int yo; - Inset const * inset = &it.inset(); - std::map const & data = - c.bv().coordCache().getInsets().getData(); - std::map::const_iterator I = data.find(inset); - - // 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()) { - it.top().pos() = 0; - return it; - } + DocIterator result; - Point o = I->second.pos; - inset->cursorPos(c.bv(), it.top(), c.boundary(), xo, yo); - // Convert to absolute - xo += o.x_; - yo += o.y_; - double d = (x - xo) * (x - xo) + (y - yo) * (y - yo); - // '<=' in order to take the last possible position - // this is important for clicking behind \sum in e.g. '\sum_i a' - LYXERR(Debug::DEBUG) << "i: " << i << " d: " << d - << " best: " << best_dist << endl; - if (d <= best_dist) { - best_dist = d; - result = it; - } - if (it == et) - break; - it.forwardPos(); + DocIterator it = c; + it.top().pos() = 0; + DocIterator et = c; + et.top().pos() = et.top().asInsetMath()->cell(et.top().idx()).size(); + for (size_t i = 0;; ++i) { + int xo; + int yo; + Inset const * inset = &it.inset(); + map const & data = + c.bv().coordCache().getInsets().getData(); + map::const_iterator I = data.find(inset); + + // 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()) { + it.top().pos() = 0; + return it; } - return result; - } - - - /* - /// moves position closest to (x, y) in given box - bool bruteFind(Cursor & cursor, - int x, int y, int xlow, int xhigh, int ylow, int yhigh) - { - BOOST_ASSERT(!cursor.empty()); - Inset & inset = cursor[0].inset(); - BufferView & bv = cursor.bv(); - - CoordCache::InnerParPosCache const & cache = - bv.coordCache().getParPos().find(cursor.bottom().text())->second; - // Get an iterator on the first paragraph in the cache - DocIterator it(inset); - it.push_back(CursorSlice(inset)); - it.pit() = cache.begin()->first; - // Get an iterator after the last paragraph in the cache - DocIterator et(inset); - et.push_back(CursorSlice(inset)); - et.pit() = boost::prior(cache.end())->first; - if (et.pit() >= et.lastpit()) - et = doc_iterator_end(inset); - else - ++et.pit(); - - double best_dist = std::numeric_limits::max();; - DocIterator best_cursor = et; - - for ( ; it != et; it.forwardPos(true)) { - // avoid invalid nesting when selecting - if (!cursor.selection() || positionable(it, cursor.anchor_)) { - Point p = bv.getPos(it, false); - int xo = p.x_; - int yo = p.y_; - if (xlow <= xo && xo <= xhigh && ylow <= yo && yo <= yhigh) { - double const dx = xo - x; - double const dy = yo - y; - double const d = dx * dx + dy * dy; - // '<=' in order to take the last possible position - // this is important for clicking behind \sum in e.g. '\sum_i a' - if (d <= best_dist) { - // lyxerr << "*" << endl; - best_dist = d; - best_cursor = it; - } + + Point o = I->second.pos; + inset->cursorPos(c.bv(), it.top(), c.boundary(), xo, yo); + // Convert to absolute + xo += o.x_; + yo += o.y_; + double d = (x - xo) * (x - xo) + (y - yo) * (y - yo); + // '<=' in order to take the last possible position + // this is important for clicking behind \sum in e.g. '\sum_i a' + LYXERR(Debug::DEBUG, "i: " << i << " d: " << d + << " best: " << best_dist); + if (d <= best_dist) { + best_dist = d; + result = it; + } + if (it == et) + break; + it.forwardPos(); + } + return result; +} + + +/* +/// moves position closest to (x, y) in given box +bool bruteFind(Cursor & cursor, + int x, int y, int xlow, int xhigh, int ylow, int yhigh) +{ + LASSERT(!cursor.empty(), return false); + Inset & inset = cursor[0].inset(); + BufferView & bv = cursor.bv(); + + CoordCache::InnerParPosCache const & cache = + bv.coordCache().getParPos().find(cursor.bottom().text())->second; + // Get an iterator on the first paragraph in the cache + DocIterator it(inset); + it.push_back(CursorSlice(inset)); + it.pit() = cache.begin()->first; + // Get an iterator after the last paragraph in the cache + DocIterator et(inset); + et.push_back(CursorSlice(inset)); + et.pit() = boost::prior(cache.end())->first; + if (et.pit() >= et.lastpit()) + et = doc_iterator_end(inset); + else + ++et.pit(); + + double best_dist = numeric_limits::max();; + DocIterator best_cursor = et; + + for ( ; it != et; it.forwardPos(true)) { + // avoid invalid nesting when selecting + if (!cursor.selection() || positionable(it, cursor.anchor_)) { + Point p = bv.getPos(it, false); + int xo = p.x_; + int yo = p.y_; + if (xlow <= xo && xo <= xhigh && ylow <= yo && yo <= yhigh) { + double const dx = xo - x; + double const dy = yo - y; + double const d = dx * dx + dy * dy; + // '<=' in order to take the last possible position + // this is important for clicking behind \sum in e.g. '\sum_i a' + if (d <= best_dist) { + // lyxerr << "*" << endl; + best_dist = d; + best_cursor = it; } } } + } - if (best_cursor != et) { - cursor.setCursor(best_cursor); - return true; - } - - return false; + if (best_cursor != et) { + cursor.setCursor(best_cursor); + return true; } - */ + + return false; +} +*/ - /// moves position closest to (x, y) in given box - bool bruteFind3(Cursor & cur, int x, int y, bool up) - { - BufferView & bv = cur.bv(); - int ylow = up ? 0 : y + 1; - int yhigh = up ? y - 1 : bv.workHeight(); - int xlow = 0; - int xhigh = bv.workWidth(); +/// moves position closest to (x, y) in given box +bool bruteFind3(Cursor & cur, int x, int y, bool up) +{ + BufferView & bv = cur.bv(); + int ylow = up ? 0 : y + 1; + int yhigh = up ? y - 1 : bv.workHeight(); + int xlow = 0; + int xhigh = bv.workWidth(); // FIXME: bit more work needed to get 'from' and 'to' right. - pit_type from = cur.bottom().pit(); - //pit_type to = cur.bottom().pit(); - //lyxerr << "Pit start: " << from << endl; - - //lyxerr << "bruteFind3: x: " << x << " y: " << y - // << " xlow: " << xlow << " xhigh: " << xhigh - // << " ylow: " << ylow << " yhigh: " << yhigh - // << endl; - Inset & inset = bv.buffer().inset(); - DocIterator it = doc_iterator_begin(inset); - it.pit() = from; - DocIterator et = doc_iterator_end(inset); - - double best_dist = std::numeric_limits::max(); - DocIterator best_cursor = et; - - 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); - int xo = p.x_; - int yo = p.y_; - if (xlow <= xo && xo <= xhigh && ylow <= yo && yo <= yhigh) { - double const dx = xo - x; - double const dy = yo - y; - double const d = dx * dx + dy * dy; - //lyxerr << "itx: " << xo << " ity: " << yo << " d: " << d - // << " dx: " << dx << " dy: " << dy - // << " idx: " << it.idx() << " pos: " << it.pos() - // << " it:\n" << it - // << endl; - // '<=' in order to take the last possible position - // this is important for clicking behind \sum in e.g. '\sum_i a' - if (d <= best_dist) { - //lyxerr << "*" << endl; - best_dist = d; - best_cursor = it; - } + pit_type from = cur.bottom().pit(); + //pit_type to = cur.bottom().pit(); + //lyxerr << "Pit start: " << from << endl; + + //lyxerr << "bruteFind3: x: " << x << " y: " << y + // << " xlow: " << xlow << " xhigh: " << xhigh + // << " ylow: " << ylow << " yhigh: " << yhigh + // << endl; + DocIterator it = doc_iterator_begin(cur.buffer()); + it.pit() = from; + DocIterator et = doc_iterator_end(cur.buffer()); + + double best_dist = numeric_limits::max(); + DocIterator best_cursor = et; + + 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); + int xo = p.x_; + int yo = p.y_; + if (xlow <= xo && xo <= xhigh && ylow <= yo && yo <= yhigh) { + double const dx = xo - x; + double const dy = yo - y; + double const d = dx * dx + dy * dy; + //lyxerr << "itx: " << xo << " ity: " << yo << " d: " << d + // << " dx: " << dx << " dy: " << dy + // << " idx: " << it.idx() << " pos: " << it.pos() + // << " it:\n" << it + // << endl; + // '<=' in order to take the last possible position + // this is important for clicking behind \sum in e.g. '\sum_i a' + if (d <= best_dist) { + //lyxerr << "*" << endl; + best_dist = d; + best_cursor = it; } } } - - //lyxerr << "best_dist: " << best_dist << " cur:\n" << best_cursor << endl; - if (best_cursor == et) - return false; - cur.setCursor(best_cursor); - return true; } - 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(); - } + //lyxerr << "best_dist: " << best_dist << " cur:\n" << best_cursor << endl; + if (best_cursor == et) + return false; + cur.setCursor(best_cursor); + return true; +} } // namespace anon @@ -265,17 +252,19 @@ namespace { // 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) + : DocIterator(&bv.buffer()), bv_(&bv), anchor_(), + x_target_(-1), textTargetOffset_(0), + selection_(false), mark_(false), word_selection_(false), + logicalpos_(false), current_font(inherit_font) {} -void Cursor::reset(Inset & inset) +void Cursor::reset() { clear(); - push_back(CursorSlice(inset)); - anchor_ = DocIterator(inset); + push_back(CursorSlice(buffer()->inset())); + anchor_ = doc_iterator_begin(buffer()); + anchor_.clear(); clearTargetX(); selection_ = false; mark_ = false; @@ -289,27 +278,76 @@ void Cursor::setCursor(DocIterator const & cur) } +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(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::dispatch(FuncRequest const & cmd0) { - LYXERR(Debug::DEBUG) << BOOST_CURRENT_FUNCTION - << " cmd: " << cmd0 << '\n' - << *this << endl; + LYXERR(Debug::DEBUG, "cmd: " << cmd0 << '\n' << *this); if (empty()) return; fixIfBroken(); FuncRequest cmd = cmd0; Cursor safe = *this; + + buffer()->undo().beginUndoGroup(); + // Is this a function that acts on inset at point? + if (lyxaction.funcHasFlag(cmd.action, LyXAction::AtPoint) + && nextInset()) { + result().dispatched(true); + result().update(Update::FitCursor | Update::Force); + FuncRequest tmpcmd = cmd; + LYXERR(Debug::DEBUG, "Cursor::dispatch: (AtPoint) cmd: " + << cmd0 << endl << *this); + nextInset()->dispatch(*this, tmpcmd); + if (result().dispatched()) + return; + } + // store some values to be used inside of the handlers - getPos(beforeDispX_, beforeDispY_); beforeDispatchCursor_ = *this; - for (; depth(); pop()) { - LYXERR(Debug::DEBUG) << "Cursor::dispatch: cmd: " - << cmd0 << endl << *this << endl; - BOOST_ASSERT(pos() <= lastpos()); - BOOST_ASSERT(idx() <= lastidx()); - BOOST_ASSERT(pit() <= lastpit()); + for (; depth(); pop(), boundary(false)) { + LYXERR(Debug::DEBUG, "Cursor::dispatch: cmd: " + << cmd0 << endl << *this); + LASSERT(pos() <= lastpos(), /**/); + LASSERT(idx() <= lastidx(), /**/); + LASSERT(pit() <= lastpit(), /**/); // The common case is 'LFUN handled, need update', so make the // LFUN handler's life easier by assuming this as default value. @@ -324,7 +362,16 @@ void Cursor::dispatch(FuncRequest const & cmd0) // it completely to get a 'bomb early' behaviour in case this // object will be used again. if (!disp_.dispatched()) { - LYXERR(Debug::DEBUG) << "RESTORING OLD CURSOR!" << endl; + 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_.dispatched(false); @@ -333,6 +380,7 @@ void Cursor::dispatch(FuncRequest const & cmd0) // are possible which would change it beforeDispatchCursor_ = safe.beforeDispatchCursor_; } + buffer()->undo().endUndoGroup(); } @@ -344,21 +392,14 @@ DispatchResult Cursor::result() const BufferView & Cursor::bv() const { - BOOST_ASSERT(bv_); + LASSERT(bv_, /**/); return *bv_; } -Buffer & Cursor::buffer() const -{ - BOOST_ASSERT(bv_); - return bv_->buffer(); -} - - void Cursor::pop() { - BOOST_ASSERT(depth() >= 1); + LASSERT(depth() >= 1, /**/); pop_back(); } @@ -366,23 +407,22 @@ void Cursor::pop() void Cursor::push(Inset & p) { push_back(CursorSlice(p)); + p.setBuffer(*buffer()); } -void Cursor::pushLeft(Inset & p) +void Cursor::pushBackward(Inset & p) { - BOOST_ASSERT(!empty()); - //lyxerr << "Entering inset " << t << " left" << endl; + LASSERT(!empty(), return); + //lyxerr << "Entering inset " << t << " front" << endl; push(p); p.idxFirst(*this); } -bool Cursor::popLeft() +bool Cursor::popBackward() { - BOOST_ASSERT(!empty()); - //lyxerr << "Leaving inset to the left" << endl; - inset().notifyCursorLeaves(*this); + LASSERT(!empty(), return false); if (depth() == 1) return false; pop(); @@ -390,12 +430,11 @@ bool Cursor::popLeft() } -bool Cursor::popRight() +bool Cursor::popForward() { - BOOST_ASSERT(!empty()); - //lyxerr << "Leaving inset to the right" << endl; + LASSERT(!empty(), return false); + //lyxerr << "Leaving inset from in back" << endl; const pos_type lp = (depth() > 1) ? (*this)[depth() - 2].lastpos() : 0; - inset().notifyCursorLeaves(*this); if (depth() == 1) return false; pop(); @@ -406,10 +445,13 @@ bool Cursor::popRight() int Cursor::currentMode() { - BOOST_ASSERT(!empty()); + LASSERT(!empty(), /**/); 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; @@ -426,8 +468,9 @@ void Cursor::getPos(int & x, int & y) const Row const & Cursor::textRow() const { - ParagraphMetrics const & pm = bv().parMetrics(text(), pit()); - BOOST_ASSERT(!pm.rows().empty()); + CursorSlice const & cs = innerTextSlice(); + ParagraphMetrics const & pm = bv().parMetrics(cs.text(), cs.pit()); + LASSERT(!pm.rows().empty(), /**/); return pm.getRow(pos(), boundary()); } @@ -438,8 +481,20 @@ void Cursor::resetAnchor() } +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); + } +} -bool Cursor::posLeft() + +bool Cursor::posBackward() { if (pos() == 0) return false; @@ -448,7 +503,7 @@ bool Cursor::posLeft() } -bool Cursor::posRight() +bool Cursor::posForward() { if (pos() == lastpos()) return false; @@ -457,9 +512,472 @@ bool Cursor::posRight() } +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( + 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, 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'. + else { + new_cur.pos() = right_pos; + new_cur.boundary(false); + } + + } + + bool moved = (new_cur.pos() != pos() + || new_cur.pit() != pit() + || new_cur.boundary() != boundary() + || &new_cur.inset() != &inset()); + + 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( + 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 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'. + 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 + Paragraph const & par = paragraph(); + 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 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). + if (known_pos == lastpos()) { + if (par.isRTL(buf.params())) { + left_pos = -1; + right_pos = bidi.vis2log(row.pos()); + } 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... + 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 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 (bidi.inRange(v_left_pos) + && bidi.vis2log(v_left_pos) + 1 == row.endpos() + && row.endpos() < lastpos() + && 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 (right_pos + 1 == row.endpos() && row.endpos() < lastpos() + && par.isSeparator(right_pos)) { + 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 + 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 (bidi.inRange(v_right_pos) + && bidi.vis2log(v_right_pos) + 1 == row.endpos() + && row.endpos() < lastpos() + && 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 (left_pos + 1 == row.endpos() && row.endpos() < lastpos() + && par.isSeparator(left_pos)) { + pos_type const v_left_pos = bidi.log2vis(left_pos) - 1; + if (!bidi.inRange(v_left_pos)) + left_pos = -1; + else + left_pos = bidi.vis2log(v_left_pos); + } + } + return; +} + + +bool Cursor::posVisToNewRow(bool movingLeft) +{ + Paragraph const & par = paragraph(); + 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. + 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 (par_is_LTR == movingLeft) { + if (row.pos() == 0) { // we're at first row in paragraph + if (pit() == 0) // no previous paragraph! don't move + return false; + // move to last pos in previous par + --pit(); + pos() = lastpos(); + boundary(false); + } else { // move to previous row in this par + pos() = row.pos() - 1; // this is guaranteed to be in previous row + boundary(false); + } + } + // 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 + return false; + // move to first row in next par + ++pit(); + pos() = 0; + boundary(false); + } else { // move to next row in this par + pos() = row.endpos(); + boundary(false); + } + } + + // make sure we're at left-/right-most pos in new row + posVisToRowExtremity(!movingLeft); + + return true; +} + + +void Cursor::posVisToRowExtremity(bool left) +{ + // prepare bidi tables + Paragraph const & par = paragraph(); + Buffer const & buf = *buffer(); + Row const & row = textRow(); + Bidi bidi; + bidi.computeTables(par, buf, row); + + LYXERR(Debug::RTL, "entering extremity: " << pit() << "," << pos() << "," + << (boundary() ? 1 : 0)); + + if (left) { // move to leftmost position + // if this is an RTL 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.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 + // "boundary" which we simulate at insets. + // 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 + 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 const new_pos_is_RTL = + par.getFontSettings(buf.params(), pos()).isVisibleRightToLeft(); + + if (new_pos_is_RTL != right_of_pos) { + ++pos(); + boundary(true); + } + } + } 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() = 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. + + // 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 const new_pos_is_RTL = + par.getFontSettings(buf.params(), pos()).isVisibleRightToLeft(); + + if (new_pos_is_RTL == left_of_pos) { + ++pos(); + boundary(true); + } + } + } + LYXERR(Debug::RTL, "leaving extremity: " << pit() << "," << pos() << "," + << (boundary() ? 1 : 0)); +} + + CursorSlice Cursor::anchor() const { - BOOST_ASSERT(anchor_.depth() >= depth()); + if (!selection()) + return top(); + LASSERT(anchor_.depth() >= depth(), /**/); CursorSlice normal = anchor_[depth() - 1]; if (depth() < anchor_.depth() && top() <= normal) { // anchor is behind cursor -> move anchor behind the inset @@ -489,7 +1007,14 @@ DocIterator Cursor::selectionBegin() const { if (!selection()) return *this; - DocIterator di = (anchor() < top() ? anchor_ : *this); + + DocIterator di; + // FIXME: This is a work-around for the problem that + // CursorSlice doesn't keep track of the boundary. + if (anchor() == top()) + di = anchor_.boundary() > boundary() ? anchor_ : *this; + else + di = anchor() < top() ? anchor_ : *this; di.resize(depth()); return di; } @@ -499,7 +1024,15 @@ DocIterator Cursor::selectionEnd() const { if (!selection()) return *this; - DocIterator di = (anchor() > top() ? anchor_ : *this); + + DocIterator di; + // FIXME: This is a work-around for the problem that + // CursorSlice doesn't keep track of the boundary. + if (anchor() == top()) + di = anchor_.boundary() < boundary() ? anchor_ : *this; + else + di = anchor() > top() ? anchor_ : *this; + if (di.depth() > depth()) { di.resize(depth()); ++di.pos(); @@ -510,18 +1043,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 (pit() == anchor().pit() && pos() == anchor().pos()) - selection() = false; + if (idx() == anchor().idx() && + pit() == anchor().pit() && + pos() == anchor().pos()) + setSelection(false); } void Cursor::setSelection(DocIterator const & where, int n) { setCursor(where); - selection() = true; + setSelection(true); anchor_ = where; pos() += n; } @@ -529,8 +1064,9 @@ void Cursor::setSelection(DocIterator const & where, int n) void Cursor::clearSelection() { - selection() = false; - mark() = false; + setSelection(false); + setWordSelection(false); + setMark(false); resetAnchor(); } @@ -584,6 +1120,8 @@ void Cursor::info(odocstream & os) const bool Cursor::selHandle(bool sel) { //lyxerr << "Cursor::selHandle" << endl; + if (mark()) + sel = true; if (sel == selection()) return false; @@ -591,12 +1129,12 @@ bool Cursor::selHandle(bool sel) cap::saveSelection(*this); resetAnchor(); - selection() = sel; + setSelection(sel); return true; } -std::ostream & operator<<(std::ostream & os, Cursor const & cur) +ostream & operator<<(ostream & os, Cursor const & cur) { os << "\n cursor: | anchor:\n"; for (size_t i = 0, n = cur.depth(); i != n; ++i) { @@ -615,11 +1153,20 @@ std::ostream & operator<<(std::ostream & os, Cursor const & cur) return os; } + +LyXErr & operator<<(LyXErr & os, Cursor const & cur) +{ + os.stream() << cur; + return os; +} + + } // namespace lyx /////////////////////////////////////////////////////////////////// // +// FIXME: Look here // The part below is the non-integrated rest of the original math // cursor. This should be either generalized for texted or moved // back to mathed (in most cases to InsetMathNest). @@ -640,7 +1187,7 @@ namespace lyx { //#define FILEDEBUG 1 -bool Cursor::isInside(Inset const * p) +bool Cursor::isInside(Inset const * p) const { for (size_t i = 0; i != depth(); ++i) if (&operator[](i).inset() == p) @@ -674,7 +1221,7 @@ bool Cursor::openable(MathAtom const & t) const // we can't move into anything new during selection if (depth() >= anchor_.depth()) return false; - if (!ptr_cmp(t.nucleus(), &anchor_[depth()].inset())) + if (t.nucleus() != &anchor_[depth()].inset()) return false; return true; @@ -711,6 +1258,8 @@ void Cursor::plainInsert(MathAtom const & t) { cell().insert(pos(), t); ++pos(); + inset().setBuffer(bv_->buffer()); + inset().initView(); } @@ -725,7 +1274,7 @@ void Cursor::insert(docstring const & str) void Cursor::insert(char_type c) { //lyxerr << "Cursor::insert char '" << c << "'" << endl; - BOOST_ASSERT(!empty()); + LASSERT(!empty(), /**/); if (inMathed()) { cap::selClearOrDel(*this); insert(new InsetMathChar(c)); @@ -744,20 +1293,24 @@ void Cursor::insert(MathAtom const & t) } -void Cursor::insert(Inset * inset) +void Cursor::insert(Inset * inset0) { + LASSERT(inset0, /**/); if (inMathed()) - insert(MathAtom(inset)); - else - text()->insertInset(*this, inset); + insert(MathAtom(inset0)); + else { + text()->insertInset(*this, inset0); + inset0->setBuffer(bv_->buffer()); + inset0->initView(); + } } -void Cursor::niceInsert(docstring const & t) +void 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); @@ -769,14 +1322,14 @@ 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()) { - posLeft(); - // be careful here: don't use 'pushLeft(t)' as this we need to + posBackward(); + // be careful here: don't use 'pushBackward(t)' as this we need to // push the clone, not the original - pushLeft(*nextInset()); + pushBackward(*nextInset()); // We may not use niceInsert here (recursion) - MathData ar; + MathData ar(buffer()); asArray(safe, ar); insert(ar); } @@ -805,7 +1358,7 @@ bool Cursor::backspace() if (pos() == 0) { // If empty cell, and not part of a big cell if (lastpos() == 0 && inset().nargs() == 1) { - popLeft(); + popBackward(); // Directly delete empty cell: [|[]] => [|] if (inMathed()) { plainErase(); @@ -818,7 +1371,7 @@ bool Cursor::backspace() if (inMathed()) pullArg(); else - popLeft(); + popBackward(); return true; } } @@ -835,7 +1388,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(); @@ -864,7 +1417,7 @@ bool Cursor::erase() if (pos() == lastpos()) { bool one_cell = inset().nargs() == 1; if (one_cell && lastpos() == 0) { - popLeft(); + popBackward(); // Directly delete empty cell: [|[]] => [|] if (inMathed()) { plainErase(); @@ -883,7 +1436,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(); @@ -927,6 +1480,8 @@ bool Cursor::macroModeClose() return false; InsetMathUnknown * p = activeMacro(); p->finalize(); + MathData selection(buffer()); + asArray(p->selection(), selection); docstring const s = p->name(); --pos(); cell().erase(pos()); @@ -943,7 +1498,39 @@ bool Cursor::macroModeClose() InsetMathNest * const in = inset().asInsetMath()->asNestInset(); if (in && in->interpretString(*this, s)) return true; - plainInsert(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; + MathMacro * atomAsMacro = atom.nucleus()->asMacro(); + if (atomAsMacro) { + // 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) { + macroArg = true; + atomAsMacro->setDisplayMode(MathMacro::DISPLAY_INTERACTIVE_INIT, 1); + } else + // non-greedy case. Do not touch the arguments behind + atomAsMacro->setDisplayMode(MathMacro::DISPLAY_INTERACTIVE_INIT, 0); + } + + // insert remembered selection into first argument of a non-macro + else if (atom.nucleus()->nargs() > 0) + atom.nucleus()->cell(0).append(selection); + + plainInsert(atom); + + // finally put the macro argument behind, if needed + if (macroArg) { + if (selection.size() > 1 || selection[0]->asScriptInset()) + plainInsert(MathAtom(new InsetMathBrace(selection))); + else + insert(selection); + } + return true; } @@ -960,8 +1547,8 @@ void Cursor::handleNest(MathAtom const & a, int c) MathAtom t = a; asArray(cap::grabAndEraseSelection(*this), t.nucleus()->cell(c)); insert(t); - posLeft(); - pushLeft(*nextInset()); + posBackward(); + pushBackward(*nextInset()); } @@ -1008,11 +1595,17 @@ InsetMathUnknown * Cursor::activeMacro() } +InsetMathUnknown const * Cursor::activeMacro() const +{ + return inMacroMode() ? prevAtom().nucleus()->asUnknownInset() : 0; +} + + void Cursor::pullArg() { // FIXME: Look here MathData ar = cell(); - if (popLeft() && inMathed()) { + if (popBackward() && inMathed()) { plainErase(); cell().insert(pos(), ar); resetAnchor(); @@ -1048,7 +1641,7 @@ void Cursor::normalize() << pos() << ' ' << lastpos() << " in idx: " << idx() << " in atom: '"; odocstringstream os; - WriteStream wi(os, false, true); + WriteStream wi(os, false, true, WriteStream::wsDefault); inset().asInsetMath()->write(wi); lyxerr << to_utf8(os.str()) << endl; pos() = lastpos(); @@ -1065,13 +1658,13 @@ bool Cursor::upDownInMath(bool up) int xo = 0; int yo = 0; getPos(xo, yo); - xo = beforeDispX_; - + xo = theLyXFunc().cursorBeforeDispatchX(); + // check if we had something else in mind, if not, this is the future // target if (x_target_ == -1) setTargetX(xo); - else if (inset().asTextInset() && xo - textTargetOffset() != x_target()) { + else if (inset().asInsetText() && xo - textTargetOffset() != x_target()) { // 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. @@ -1115,8 +1708,9 @@ bool Cursor::upDownInMath(bool up) int x; int y; getPos(x, y); - if ((!up && y <= beforeDispY_) || - (up && y >= beforeDispY_)) + int oy = theLyXFunc().cursorBeforeDispatchY(); + if ((!up && y <= oy) || + (up && y >= oy)) operator=(old); else return true; @@ -1135,8 +1729,9 @@ bool Cursor::upDownInMath(bool up) int x; int y; getPos(x, y); - if ((!up && y <= beforeDispY_) || - (up && y >= beforeDispY_)) + int oy = theLyXFunc().cursorBeforeDispatchY(); + if ((!up && y <= oy) || + (up && y >= oy)) operator=(old); else return true; @@ -1154,12 +1749,13 @@ bool Cursor::upDownInMath(bool up) } // any improvement going just out of inset? - if (popLeft() && inMathed()) { - //lyxerr << "updown: popLeft succeeded" << endl; + if (popBackward() && inMathed()) { + //lyxerr << "updown: popBackward succeeded" << endl; int xnew; int ynew; + int yold = theLyXFunc().cursorBeforeDispatchY(); getPos(xnew, ynew); - if (up ? ynew < beforeDispY_ : ynew > beforeDispY_) + if (up ? ynew < yold : ynew > yold) return true; } @@ -1169,16 +1765,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) { - BOOST_ASSERT(text()); + LASSERT(text(), /**/); // where are we? int xo = 0; int yo = 0; getPos(xo, yo); - xo = beforeDispX_; - + xo = theLyXFunc().cursorBeforeDispatchX(); + // update the targetX - this is here before the "return false" // to set a new target which can be used by InsetTexts above // if we cannot move up/down inside this inset anymore @@ -1222,15 +1840,34 @@ 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(); + } + return false; + } // with and without selection are handled differently if (!selection()) { @@ -1243,37 +1880,56 @@ 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) 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() = std::min(tm.x2pos(pit(), row - 1, xo), top().lastpos()); + --next_row; } else if (pit() > 0) { --pit(); - ParagraphMetrics const & pmcur = bv_->parMetrics(text(), pit()); - top().pos() = std::min(tm.x2pos(pit(), pmcur.rows().size() - 1, xo), top().lastpos()); + TextMetrics & tm = bv_->textMetrics(text()); + if (!tm.contains(pit())) + tm.newParMetricsUp(); + ParagraphMetrics const & pmcur = tm.parMetrics(pit()); + next_row = pmcur.rows().size() - 1; } } else { if (row + 1 < int(pm.rows().size())) { - top().pos() = std::min(tm.x2pos(pit(), row + 1, xo), top().lastpos()); + ++next_row; } else if (pit() + 1 < int(text()->paragraphs().size())) { ++pit(); - top().pos() = std::min(tm.x2pos(pit(), 0, xo), top().lastpos()); + TextMetrics & tm = bv_->textMetrics(text()); + if (!tm.contains(pit())) + tm.newParMetricsDown(); + 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); } @@ -1285,34 +1941,37 @@ bool Cursor::upDownInText(bool up, bool & updateNeeded) void Cursor::handleFont(string const & font) { - LYXERR(Debug::DEBUG) << BOOST_CURRENT_FUNCTION << ": " << font << endl; + LYXERR(Debug::DEBUG, font); docstring safe; if (selection()) { macroModeClose(); safe = cap::grabAndEraseSelection(*this); } + recordUndoInset(); + if (lastpos() != 0) { // something left in the cell if (pos() == 0) { // cursor in first position - popLeft(); + popBackward(); } else if (pos() == lastpos()) { // cursor in last position - popRight(); + popForward(); } 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()); - popLeft(); + popBackward(); plainInsert(at); } } else { // nothing left in the cell - pullArg(); + popBackward(); plainErase(); + resetAnchor(); } insert(safe); } @@ -1330,50 +1989,67 @@ void Cursor::errorMessage(docstring const & msg) const } -docstring Cursor::selectionAsString(bool label) const +static docstring parbreak(InsetCode code) +{ + odocstringstream os; + os << '\n'; + // only add blank line if we're not in an ERT or Listings inset + if (code != ERT_CODE && code != LISTINGS_CODE) + os << '\n'; + return os.str(); +} + + +docstring Cursor::selectionAsString(bool with_label) const { if (!selection()) return docstring(); - if (inTexted()) { - Buffer const & buffer = bv().buffer(); - ParagraphList const & pars = text()->paragraphs(); - - // should be const ... - pit_type startpit = selBegin().pit(); - pit_type endpit = selEnd().pit(); - size_t const startpos = selBegin().pos(); - size_t const endpos = selEnd().pos(); - - if (startpit == endpit) - return pars[startpit].asString(buffer, startpos, endpos, label); - - // First paragraph in selection - docstring result = pars[startpit]. - asString(buffer, 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(buffer, 0, par.size(), label) - + parbreak(pars[pit]); - } + if (inMathed()) + return cap::grabSelection(*this); - // Last paragraph in selection - result += pars[endpit].asString(buffer, 0, endpos, label); + int const label = with_label + ? AS_STR_LABEL | AS_STR_INSETS : AS_STR_INSETS; - return result; + 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); } - if (inMathed()) - return cap::grabSelection(*this); + ParagraphList const & pars = text()->paragraphs(); - return docstring(); + 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(inset().lyxCode()); + + // 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(inset().lyxCode()); + } + + // Last paragraph in selection + result += pars[endpit].asString(0, endpos, label); + + return result; } -docstring Cursor::currentState() +docstring Cursor::currentState() const { if (inMathed()) { odocstringstream os; @@ -1388,7 +2064,7 @@ docstring Cursor::currentState() } -docstring Cursor::getPossibleLabel() +docstring Cursor::getPossibleLabel() const { return inMathed() ? from_ascii("eq:") : text()->getPossibleLabel(*this); } @@ -1398,16 +2074,10 @@ Encoding const * Cursor::getEncoding() const { if (empty()) return 0; - int s = 0; - // go up until first non-0 text is hit - // (innermost text is 0 in mathed) - for (s = depth() - 1; s >= 0; --s) - if (operator[](s).text()) - break; - CursorSlice const & sl = operator[](s); + 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(); } @@ -1443,13 +2113,8 @@ Font Cursor::getFont() const // if a character is entered. // HACK. far from being perfect... - // go up until first non-0 text is hit - // (innermost text is 0 in mathed) - int s = 0; - for (s = depth() - 1; s >= 0; --s) - if (operator[](s).text()) - break; - CursorSlice const & sl = operator[](s); + + CursorSlice const & sl = innerTextSlice(); Text const & text = *sl.text(); Paragraph const & par = text.getPar(sl.pit()); @@ -1468,8 +2133,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; } @@ -1479,26 +2144,42 @@ bool Cursor::fixIfBroken() { if (DocIterator::fixIfBroken()) { clearSelection(); - resetAnchor(); return true; } return false; } -bool notifyCursorLeaves(DocIterator const & old, Cursor & cur) +bool notifyCursorLeavesOrEnters(Cursor const & old, Cursor & cur) { // find inset in common size_type i; for (i = 0; i < old.depth() && i < cur.depth(); ++i) { - if (&old.inset() != &cur.inset()) + if (&old[i].inset() != &cur[i].inset()) break; } - + + // update words if we just moved to another paragraph + if (i == old.depth() && i == cur.depth() + && !cur.buffer()->isClean() + && cur.inTexted() && old.inTexted() + && cur.pit() != old.pit()) { + 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) { - if (old[i].inset().notifyCursorLeaves(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; } @@ -1535,9 +2216,9 @@ 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.getDisplayFont(cpit, cpos); + real_current_font = tm.displayFont(cpit, cpos); // special case for paragraph end if (cs.pos() == lastpos() @@ -1556,12 +2237,11 @@ bool Cursor::textUndo() { DocIterator dit = *this; // Undo::textUndo() will modify dit. - if (!bv_->buffer().undo().textUndo(dit)) + if (!buffer()->undo().textUndo(dit)) return false; // Set cursor setCursor(dit); - selection() = false; - resetAnchor(); + clearSelection(); fixIfBroken(); return true; } @@ -1571,57 +2251,86 @@ bool Cursor::textRedo() { DocIterator dit = *this; // Undo::textRedo() will modify dit. - if (!bv_->buffer().undo().textRedo(dit)) + if (!buffer()->undo().textRedo(dit)) return false; // Set cursor setCursor(dit); - selection() = false; - resetAnchor(); + clearSelection(); fixIfBroken(); return true; } -void Cursor::finishUndo() +void Cursor::finishUndo() const +{ + buffer()->undo().finishUndo(); +} + + +void Cursor::beginUndoGroup() const +{ + buffer()->undo().beginUndoGroup(); +} + + +void Cursor::endUndoGroup() const { - bv_->buffer().undo().finishUndo(); + buffer()->undo().endUndoGroup(); } -void Cursor::recordUndo(UndoKind kind, pit_type from, pit_type to) +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) +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) +void Cursor::recordUndo(UndoKind kind) const { - bv_->buffer().undo().recordUndo(*this, kind); + buffer()->undo().recordUndo(*this, kind); } -void Cursor::recordUndoInset(UndoKind kind) +void Cursor::recordUndoInset(UndoKind kind) const { - bv_->buffer().undo().recordUndoInset(*this, kind); + buffer()->undo().recordUndoInset(*this, kind); } -void Cursor::recordUndoFullDocument() +void Cursor::recordUndoFullDocument() const { - bv_->buffer().undo().recordUndoFullDocument(*this); + buffer()->undo().recordUndoFullDocument(*this); +} + + +void Cursor::recordUndoSelection() const +{ + if (inMathed()) { + if (cap::multipleCellsSelected(*this)) + recordUndoInset(); + else + recordUndo(); + } else { + buffer()->undo().recordUndo(*this, ATOMIC_UNDO, + selBegin().pit(), selEnd().pit()); + } } -void Cursor::recordUndoSelection() +void Cursor::checkBufferStructure() { - bv_->buffer().undo().recordUndo(*this, ATOMIC_UNDO, - selBegin().pit(), selEnd().pit()); + 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); }