X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fcursor.C;h=5d72bfff899f041ceae47652e21bfcecaca1b144;hb=52eb91c94fb70d58dceef430659c8781de2eccda;hp=a6a357201f11a226e1b4e98955e1e6b63835c110;hpb=2c0d4b31ee7b27ba9273211d76c910d8420259f0;p=lyx.git diff --git a/src/cursor.C b/src/cursor.C index a6a357201f..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; @@ -514,27 +537,33 @@ void LCursor::clearTargetX() -void LCursor::info(std::ostream & os) const +void LCursor::info(odocstream & os) const { for (int i = 1, n = depth(); i < n; ++i) { 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; } @@ -569,13 +598,12 @@ std::ostream & operator<<(std::ostream & os, LCursor const & cur) /////////////////////////////////////////////////////////////////// #include "mathed/InsetMathChar.h" -#include "mathed/MathFactory.h" #include "mathed/InsetMathGrid.h" -#include "mathed/MathMacroArgument.h" -#include "mathed/MathMLStream.h" #include "mathed/InsetMathScript.h" -#include "mathed/MathSupport.h" #include "mathed/InsetMathUnknown.h" +#include "mathed/MathFactory.h" +#include "mathed/MathStream.h" +#include "mathed/MathSupport.h" namespace lyx { @@ -657,7 +685,7 @@ void LCursor::plainInsert(MathAtom const & t) } -void LCursor::insert(string const & str) +void LCursor::insert(docstring const & str) { for_each(str.begin(), str.end(), boost::bind(static_cast @@ -696,11 +724,10 @@ void LCursor::insert(InsetBase * inset) } -void LCursor::niceInsert(string const & t) +void LCursor::niceInsert(docstring const & t) { MathArray ar; - // FIXME UNICODE - asArray(from_utf8(t), ar); + asArray(t, ar); if (ar.size() == 1) niceInsert(ar[0]); else @@ -711,7 +738,7 @@ void LCursor::niceInsert(string const & t) void LCursor::niceInsert(MathAtom const & t) { macroModeClose(); - string const safe = cap::grabAndEraseSelection(*this); + docstring const safe = cap::grabAndEraseSelection(*this); plainInsert(t); // enter the new inset and move the contents of the selection if possible if (t->isActive()) { @@ -721,8 +748,7 @@ void LCursor::niceInsert(MathAtom const & t) pushLeft(*nextInset()); // We may not use niceInsert here (recursion) MathArray ar; - // FIXME UNICODE - asArray(from_utf8(safe), ar); + asArray(safe, ar); insert(ar); } } @@ -743,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()) { @@ -783,7 +821,7 @@ bool LCursor::erase() return true; if (selection()) { - cap::selDel(*this); + cap::eraseSelection(*this); return true; } @@ -794,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; } @@ -847,7 +892,7 @@ bool LCursor::macroModeClose() return false; InsetMathUnknown * p = activeMacro(); p->finalize(); - string const s = p->name(); + docstring const s = p->name(); --pos(); cell().erase(pos()); @@ -858,7 +903,7 @@ bool LCursor::macroModeClose() // prevent entering of recursive macros // FIXME: this is only a weak attempt... only prevents immediate // recursion - string const name = s.substr(1); + docstring const name = s.substr(1); InsetBase const * macro = innerInsetOfType(InsetBase::MATHMACRO_CODE); if (macro && macro->getInsetName() == name) lyxerr << "can't enter recursive macro" << endl; @@ -871,9 +916,9 @@ bool LCursor::macroModeClose() } -string LCursor::macroName() +docstring LCursor::macroName() { - return inMacroMode() ? activeMacro()->name() : string(); + return inMacroMode() ? activeMacro()->name() : docstring(); } @@ -881,8 +926,7 @@ void LCursor::handleNest(MathAtom const & a, int c) { //lyxerr << "LCursor::handleNest: " << c << endl; MathAtom t = a; - // FIXME UNICODE - asArray(from_utf8(cap::grabAndEraseSelection(*this)), t.nucleus()->cell(c)); + asArray(cap::grabAndEraseSelection(*this), t.nucleus()->cell(c)); insert(t); posLeft(); pushLeft(*nextInset()); @@ -902,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); @@ -1077,7 +1118,7 @@ bool LCursor::goUpDown(bool up) void LCursor::handleFont(string const & font) { lyxerr[Debug::DEBUG] << BOOST_CURRENT_FUNCTION << ": " << font << endl; - string safe; + docstring safe; if (selection()) { macroModeClose(); safe = cap::grabAndEraseSelection(*this); @@ -1094,7 +1135,7 @@ void LCursor::handleFont(string const & font) } else { // cursor in between. split cell MathArray::iterator bt = cell().begin(); - MathAtom at = createInsetMath(font); + MathAtom at = createInsetMath(from_utf8(font)); at.nucleus()->cell(0) = MathArray(bt, bt + pos()); cell().erase(bt, bt + pos()); popLeft(); @@ -1156,16 +1197,16 @@ docstring LCursor::selectionAsString(bool label) const } if (inMathed()) - return from_utf8(cap::grabSelection(*this)); + return cap::grabSelection(*this); return docstring(); } -string LCursor::currentState() +docstring LCursor::currentState() { if (inMathed()) { - std::ostringstream os; + odocstringstream os; info(os); return os.str(); } @@ -1173,13 +1214,13 @@ string LCursor::currentState() 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); } @@ -1215,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); }