X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fcursor.C;h=5d72bfff899f041ceae47652e21bfcecaca1b144;hb=52eb91c94fb70d58dceef430659c8781de2eccda;hp=69095b37ee3641bc0fc866f1d1f5f4c6185fd8e6;hpb=de6418f37765fe452f135f96dee6d49897bff215;p=lyx.git diff --git a/src/cursor.C b/src/cursor.C index 69095b37ee..5d72bfff89 100644 --- a/src/cursor.C +++ b/src/cursor.C @@ -13,6 +13,7 @@ #include #include "BufferView.h" +#include "bufferview_funcs.h" #include "buffer.h" #include "cursor.h" #include "coordcache.h" @@ -39,7 +40,6 @@ #include "mathed/InsetMath.h" #include "mathed/InsetMathScript.h" #include "mathed/MathMacroTable.h" -#include "mathed/MathParser.h" #include "support/limited_stack.h" @@ -49,6 +49,7 @@ #include #include +#include namespace lyx { @@ -96,7 +97,20 @@ namespace { int xo; int yo; InsetBase const * inset = &it.inset(); - Point o = c.bv().coordCache().getInsets().xy(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; + } + + Point o = I->second; inset->cursorPos(c.bv(), it.top(), c.boundary(), xo, yo); // Convert to absolute xo += o.x_; @@ -285,7 +299,7 @@ void LCursor::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(true); + disp_.update(Update::FitCursor | Update::Force); disp_.dispatched(true); inset().dispatch(*this, cmd); if (disp_.dispatched()) @@ -296,7 +310,7 @@ void LCursor::dispatch(FuncRequest const & cmd0) if (!disp_.dispatched()) { lyxerr[Debug::DEBUG] << "RESTORING OLD CURSOR!" << endl; operator=(safe); - disp_.update(false); + disp_.update(Update::None); disp_.dispatched(false); } } @@ -361,11 +375,12 @@ bool LCursor::popRight() { BOOST_ASSERT(!empty()); //lyxerr << "Leaving inset to the right" << endl; + const pos_type lp = (depth() > 1) ? (*this)[depth() - 2].lastpos() : 0; inset().notifyCursorLeaves(*this); if (depth() == 1) return false; pop(); - ++pos(); + pos() += lastpos() - lp + 1; return true; } @@ -390,6 +405,14 @@ void LCursor::getPos(int & x, int & y) const } +Row const & LCursor::textRow() const +{ + ParagraphMetrics const & pm = bv().parMetrics(text(), pit()); + BOOST_ASSERT(!pm.rows().empty()); + return pm.getRow(pos(), boundary()); +} + + void LCursor::resetAnchor() { anchor_ = *this; @@ -520,21 +543,27 @@ void LCursor::info(odocstream & os) const operator[](i).inset().infoize(os); os << " "; } - if (pos() != 0) - prevInset()->infoize2(os); + if (pos() != 0) { + InsetBase const * inset = prevInset(); + // prevInset() can return 0 in certain case. + if (inset) + prevInset()->infoize2(os); + } // overwite old message os << " "; } -void LCursor::selHandle(bool sel) +bool LCursor::selHandle(bool sel) { //lyxerr << "LCursor::selHandle" << endl; if (sel == selection()) - return; + return false; resetAnchor(); selection() = sel; + cap::saveSelection(*this); + return true; } @@ -573,7 +602,6 @@ std::ostream & operator<<(std::ostream & os, LCursor const & cur) #include "mathed/InsetMathScript.h" #include "mathed/InsetMathUnknown.h" #include "mathed/MathFactory.h" -#include "mathed/MathMacroArgument.h" #include "mathed/MathStream.h" #include "mathed/MathSupport.h" @@ -741,15 +769,27 @@ bool LCursor::backspace() autocorrect() = false; if (selection()) { - cap::selDel(*this); + cap::eraseSelection(*this); return true; } if (pos() == 0) { - if (inset().nargs() == 1 && depth() == 1 && lastpos() == 0) + // If empty cell, and not part of a big cell + if (lastpos() == 0 && inset().nargs() == 1) { + popLeft(); + // Directly delete empty cell: [|[]] => [|] + if (inMathed()) { + plainErase(); + resetAnchor(); + return true; + } + // [|], can not delete from inside return false; - pullArg(); - return true; + } else { + // move to left + popLeft(); + return true; + } } if (inMacroMode()) { @@ -781,7 +821,7 @@ bool LCursor::erase() return true; if (selection()) { - cap::selDel(*this); + cap::eraseSelection(*this); return true; } @@ -792,12 +832,19 @@ bool LCursor::erase() // special behaviour when in last position of cell if (pos() == lastpos()) { bool one_cell = inset().nargs() == 1; - if (one_cell && depth() == 1 && lastpos() == 0) + if (one_cell && lastpos() == 0) { + popLeft(); + // Directly delete empty cell: [|[]] => [|] + if (inMathed()) { + plainErase(); + resetAnchor(); + return true; + } + // [|], can not delete from inside return false; + } // remove markup - if (one_cell) - pullArg(); - else + if (!one_cell) inset().idxGlue(idx()); return true; } @@ -899,9 +946,6 @@ int LCursor::targetX() const void LCursor::setTargetX() { - // For now this is good enough. A better solution would be to - // avoid this rebreak by setting cursorX only after drawing - bottom().text()->redoParagraph(bottom().pit()); int x; int y; getPos(x, y); @@ -1159,24 +1203,24 @@ docstring LCursor::selectionAsString(bool label) const } -string LCursor::currentState() +docstring LCursor::currentState() { if (inMathed()) { odocstringstream os; info(os); - return to_utf8(os.str()); + return os.str(); } if (inTexted()) return text()->currentState(*this); - return string(); + return docstring(); } -string LCursor::getPossibleLabel() +docstring LCursor::getPossibleLabel() { - return inMathed() ? "eq:" : text()->getPossibleLabel(*this); + return inMathed() ? from_ascii("eq:") : text()->getPossibleLabel(*this); } @@ -1212,15 +1256,15 @@ void LCursor::dispatched() } -void LCursor::needsUpdate() +void LCursor::updateFlags(Update::flags f) { - disp_.update(true); + disp_.update(f); } void LCursor::noUpdate() { - disp_.update(false); + disp_.update(Update::None); }