X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fcursor.C;h=42a0c7cf1bfcc318e985ed8121705f6202d45f5e;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=0ca25c2d20af868b2824c792038cd73367919867;hpb=618ca28af6c651d992c6d1d64e07e07cd4458010;p=lyx.git diff --git a/src/cursor.C b/src/cursor.C index 0ca25c2d20..42a0c7cf1b 100644 --- a/src/cursor.C +++ b/src/cursor.C @@ -35,16 +35,14 @@ #include "insets/insettabular.h" #include "insets/insettext.h" -#include "mathed/math_data.h" -#include "mathed/math_inset.h" -#include "mathed/math_scriptinset.h" -#include "mathed/math_macrotable.h" +#include "mathed/MathData.h" +#include "mathed/InsetMath.h" +#include "mathed/InsetMathScript.h" +#include "mathed/MathMacroTable.h" +#include "mathed/MathParser.h" #include "support/limited_stack.h" -#include "frontends/LyXView.h" -#include "frontends/font_metrics.h" - #include #include #include @@ -52,8 +50,7 @@ #include #include -using lyx::char_type; -using lyx::pit_type; +namespace lyx { using std::string; using std::vector; @@ -62,7 +59,7 @@ using std::endl; using std::isalpha; #endif using std::min; -using std::swap; +using std::for_each; namespace { @@ -94,13 +91,13 @@ namespace { DocIterator it = c; it.top().pos() = 0; DocIterator et = c; - et.top().pos() = et.top().asMathInset()->cell(et.top().idx()).size(); + et.top().pos() = et.top().asInsetMath()->cell(et.top().idx()).size(); for (size_t i = 0; ; ++i) { int xo; int yo; InsetBase const * inset = &it.inset(); - Point o = theCoords.getInsets().xy(inset); - inset->cursorPos(it.top(), c.boundary(), xo, yo); + Point o = c.bv().coordCache().getInsets().xy(inset); + inset->cursorPos(c.bv(), it.top(), c.boundary(), xo, yo); // Convert to absolute xo += o.x_; yo += o.y_; @@ -127,8 +124,10 @@ namespace { { BOOST_ASSERT(!cursor.empty()); InsetBase & inset = cursor[0].inset(); + BufferView & bv = cursor.bv(); - CoordCache::InnerParPosCache const & cache = theCoords.getParPos().find(cursor.bottom().text())->second; + 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)); @@ -148,7 +147,7 @@ namespace { for ( ; it != et; it.forwardPos(true)) { // avoid invalid nesting when selecting if (!cursor.selection() || positionable(it, cursor.anchor_)) { - Point p = bv_funcs::getPos(it, false); + Point p = bv_funcs::getPos(bv, it, false); int xo = p.x_; int yo = p.y_; if (xlow <= xo && xo <= xhigh && ylow <= yo && yo <= yhigh) { @@ -205,7 +204,7 @@ namespace { // avoid invalid nesting when selecting if (bv_funcs::status(&bv, it) == bv_funcs::CUR_INSIDE && (!cur.selection() || positionable(it, cur.anchor_))) { - Point p = bv_funcs::getPos(it, false); + Point p = bv_funcs::getPos(bv, it, false); int xo = p.x_; int yo = p.y_; if (xlow <= xo && xo <= xhigh && ylow <= yo && yo <= yhigh) { @@ -286,7 +285,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()) @@ -297,6 +296,7 @@ void LCursor::dispatch(FuncRequest const & cmd0) if (!disp_.dispatched()) { lyxerr[Debug::DEBUG] << "RESTORING OLD CURSOR!" << endl; operator=(safe); + disp_.update(Update::None); disp_.dispatched(false); } } @@ -384,7 +384,7 @@ int LCursor::currentMode() void LCursor::getPos(int & x, int & y) const { - Point p = bv_funcs::getPos(*this, boundary()); + Point p = bv_funcs::getPos(bv(), *this, boundary()); x = p.x_; y = p.y_; } @@ -478,7 +478,7 @@ void LCursor::setSelection() } -void LCursor::setSelection(DocIterator const & where, size_t n) +void LCursor::setSelection(DocIterator const & where, int n) { setCursor(where); selection() = true; @@ -492,7 +492,6 @@ void LCursor::clearSelection() selection() = false; mark() = false; resetAnchor(); - bv().unsetXSel(); } @@ -515,7 +514,7 @@ 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); @@ -528,14 +527,15 @@ void LCursor::info(std::ostream & os) const } -void LCursor::selHandle(bool sel) +bool LCursor::selHandle(bool sel) { //lyxerr << "LCursor::selHandle" << endl; if (sel == selection()) - return; + return false; resetAnchor(); selection() = sel; + return true; } @@ -558,25 +558,28 @@ std::ostream & operator<<(std::ostream & os, LCursor const & cur) return os; } - +} // namespace lyx /////////////////////////////////////////////////////////////////// // // 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 MathNestInset). +// back to mathed (in most cases to InsetMathNest). // /////////////////////////////////////////////////////////////////// -#include "mathed/math_charinset.h" -#include "mathed/math_factory.h" -#include "mathed/math_gridinset.h" -#include "mathed/math_macroarg.h" -#include "mathed/math_mathmlstream.h" -#include "mathed/math_scriptinset.h" -#include "mathed/math_support.h" -#include "mathed/math_unknowninset.h" +#include "mathed/InsetMathChar.h" +#include "mathed/InsetMathGrid.h" +#include "mathed/InsetMathScript.h" +#include "mathed/InsetMathUnknown.h" +#include "mathed/MathFactory.h" +#include "mathed/MathMacroArgument.h" +#include "mathed/MathStream.h" +#include "mathed/MathSupport.h" + + +namespace lyx { //#define FILEDEBUG 1 @@ -655,7 +658,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 @@ -668,8 +671,8 @@ void LCursor::insert(char_type c) //lyxerr << "LCursor::insert char '" << c << "'" << endl; BOOST_ASSERT(!empty()); if (inMathed()) { - lyx::cap::selClearOrDel(*this); - insert(new MathCharInset(c)); + cap::selClearOrDel(*this); + insert(new InsetMathChar(c)); } else { text()->insertChar(*this, c); } @@ -680,7 +683,7 @@ void LCursor::insert(MathAtom const & t) { //lyxerr << "LCursor::insert MathAtom '" << t << "'" << endl; macroModeClose(); - lyx::cap::selClearOrDel(*this); + cap::selClearOrDel(*this); plainInsert(t); } @@ -694,7 +697,7 @@ void LCursor::insert(InsetBase * inset) } -void LCursor::niceInsert(string const & t) +void LCursor::niceInsert(docstring const & t) { MathArray ar; asArray(t, ar); @@ -708,7 +711,7 @@ void LCursor::niceInsert(string const & t) void LCursor::niceInsert(MathAtom const & t) { macroModeClose(); - string const safe = lyx::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()) { @@ -728,7 +731,7 @@ void LCursor::insert(MathArray const & ar) { macroModeClose(); if (selection()) - lyx::cap::eraseSelection(*this); + cap::eraseSelection(*this); cell().insert(pos(), ar); pos() += ar.size(); } @@ -739,7 +742,7 @@ bool LCursor::backspace() autocorrect() = false; if (selection()) { - lyx::cap::selDel(*this); + cap::selDel(*this); return true; } @@ -751,7 +754,7 @@ bool LCursor::backspace() } if (inMacroMode()) { - MathUnknownInset * p = activeMacro(); + InsetMathUnknown * p = activeMacro(); if (p->name().size() > 1) { p->setName(p->name().substr(0, p->name().size() - 1)); return true; @@ -779,7 +782,7 @@ bool LCursor::erase() return true; if (selection()) { - lyx::cap::selDel(*this); + cap::selDel(*this); return true; } @@ -841,9 +844,9 @@ bool LCursor::macroModeClose() { if (!inMacroMode()) return false; - MathUnknownInset * p = activeMacro(); + InsetMathUnknown * p = activeMacro(); p->finalize(); - string const s = p->name(); + docstring const s = p->name(); --pos(); cell().erase(pos()); @@ -854,19 +857,22 @@ 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; - plainInsert(createMathInset(name)); + InsetMathNest * const in = inset().asInsetMath()->asNestInset(); + if (in && in->interpretString(*this, s)) + return true; + plainInsert(createInsetMath(name)); return true; } -string LCursor::macroName() +docstring LCursor::macroName() { - return inMacroMode() ? activeMacro()->name() : string(); + return inMacroMode() ? activeMacro()->name() : docstring(); } @@ -874,7 +880,7 @@ void LCursor::handleNest(MathAtom const & a, int c) { //lyxerr << "LCursor::handleNest: " << c << endl; MathAtom t = a; - asArray(lyx::cap::grabAndEraseSelection(*this), t.nucleus()->cell(c)); + asArray(cap::grabAndEraseSelection(*this), t.nucleus()->cell(c)); insert(t); posLeft(); pushLeft(*nextInset()); @@ -894,9 +900,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); @@ -908,12 +911,12 @@ bool LCursor::inMacroMode() const { if (pos() == 0) return false; - MathUnknownInset const * p = prevAtom()->asUnknownInset(); + InsetMathUnknown const * p = prevAtom()->asUnknownInset(); return p && !p->final(); } -MathUnknownInset * LCursor::activeMacro() +InsetMathUnknown * LCursor::activeMacro() { return inMacroMode() ? prevAtom().nucleus()->asUnknownInset() : 0; } @@ -962,9 +965,10 @@ void LCursor::normalize() lyxerr << "this should not really happen - 2: " << pos() << ' ' << lastpos() << " in idx: " << idx() << " in atom: '"; - WriteStream wi(lyxerr, false, true); - inset().asMathInset()->write(wi); - lyxerr << endl; + odocstringstream os; + WriteStream wi(os, false, true); + inset().asInsetMath()->write(wi); + lyxerr << to_utf8(os.str()) << endl; pos() = lastpos(); } } @@ -981,7 +985,8 @@ bool LCursor::goUpDown(bool up) int yo = 0; getPos(xo, yo); - // check if we had something else in mind, if not, this is the future goal + // check if we had something else in mind, if not, this is the future + // target if (x_target() == -1) x_target() = xo; else @@ -991,10 +996,10 @@ bool LCursor::goUpDown(bool up) if (!selection()) { // try left if (pos() != 0) { - MathScriptInset const * p = prevAtom()->asScriptInset(); + InsetMathScript const * p = prevAtom()->asScriptInset(); if (p && p->has(up)) { --pos(); - push(*const_cast(p)); + push(*const_cast(p)); idx() = p->idxOfScript(up); pos() = lastpos(); return true; @@ -1003,9 +1008,9 @@ bool LCursor::goUpDown(bool up) // try right if (pos() != lastpos()) { - MathScriptInset const * p = nextAtom()->asScriptInset(); + InsetMathScript const * p = nextAtom()->asScriptInset(); if (p && p->has(up)) { - push(*const_cast(p)); + push(*const_cast(p)); idx() = p->idxOfScript(up); pos() = 0; return true; @@ -1067,10 +1072,10 @@ 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 = lyx::cap::grabAndEraseSelection(*this); + safe = cap::grabAndEraseSelection(*this); } if (lastpos() != 0) { @@ -1084,7 +1089,7 @@ void LCursor::handleFont(string const & font) } else { // cursor in between. split cell MathArray::iterator bt = cell().begin(); - MathAtom at = createMathInset(font); + MathAtom at = createInsetMath(from_utf8(font)); at.nucleus()->cell(0) = MathArray(bt, bt + pos()); cell().erase(bt, bt + pos()); popLeft(); @@ -1099,22 +1104,22 @@ void LCursor::handleFont(string const & font) } -void LCursor::message(string const & msg) const +void LCursor::message(docstring const & msg) const { - bv().owner()->getLyXFunc().setMessage(msg); + theLyXFunc().setMessage(msg); } -void LCursor::errorMessage(string const & msg) const +void LCursor::errorMessage(docstring const & msg) const { - bv().owner()->getLyXFunc().setErrorMessage(msg); + theLyXFunc().setErrorMessage(msg); } -string LCursor::selectionAsString(bool label) const +docstring LCursor::selectionAsString(bool label) const { if (!selection()) - return string(); + return docstring(); if (inTexted()) { Buffer const & buffer = *bv().buffer(); @@ -1130,7 +1135,7 @@ string LCursor::selectionAsString(bool label) const return pars[startpit].asString(buffer, startpos, endpos, label); // First paragraph in selection - string result = pars[startpit]. + docstring result = pars[startpit]. asString(buffer, startpos, pars[startpit].size(), label) + "\n\n"; // The paragraphs in between (if any) @@ -1146,18 +1151,18 @@ string LCursor::selectionAsString(bool label) const } if (inMathed()) - return lyx::cap::grabSelection(*this); + return cap::grabSelection(*this); - return string(); + return docstring(); } string LCursor::currentState() { if (inMathed()) { - std::ostringstream os; + odocstringstream os; info(os); - return os.str(); + return to_utf8(os.str()); } if (inTexted()) @@ -1167,9 +1172,9 @@ string LCursor::currentState() } -string LCursor::getPossibleLabel() +docstring LCursor::getPossibleLabel() { - return inMathed() ? "eq:" : text()->getPossibleLabel(*this); + return inMathed() ? from_ascii("eq:") : text()->getPossibleLabel(*this); } @@ -1205,15 +1210,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); } @@ -1273,3 +1278,6 @@ void LCursor::fixIfBroken() lyxerr << "correcting cursor to level " << depth() << endl; } } + + +} // namespace lyx