X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fcursor.C;h=42a0c7cf1bfcc318e985ed8121705f6202d45f5e;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=69ba63b19533b118d1dd109d0311998487b4d8ba;hpb=52bd213992aeedde743ca8d794cddfe17a6893b9;p=lyx.git diff --git a/src/cursor.C b/src/cursor.C index 69ba63b195..42a0c7cf1b 100644 --- a/src/cursor.C +++ b/src/cursor.C @@ -50,11 +50,7 @@ #include #include -using lyx::char_type; -using lyx::CoordCache; -using lyx::docstring; -using lyx::pit_type; -using lyx::Point; +namespace lyx { using std::string; using std::vector; @@ -101,7 +97,7 @@ namespace { int yo; InsetBase const * inset = &it.inset(); Point o = c.bv().coordCache().getInsets().xy(inset); - inset->cursorPos(it.top(), c.boundary(), xo, yo); + inset->cursorPos(c.bv(), it.top(), c.boundary(), xo, yo); // Convert to absolute xo += o.x_; yo += o.y_; @@ -289,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()) @@ -300,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); } } @@ -481,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; @@ -517,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); @@ -530,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; } @@ -560,7 +558,7 @@ std::ostream & operator<<(std::ostream & os, LCursor const & cur) return os; } - +} // namespace lyx /////////////////////////////////////////////////////////////////// @@ -572,13 +570,16 @@ 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/MathMacroArgument.h" +#include "mathed/MathStream.h" +#include "mathed/MathSupport.h" + + +namespace lyx { //#define FILEDEBUG 1 @@ -657,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 @@ -670,7 +671,7 @@ void LCursor::insert(char_type c) //lyxerr << "LCursor::insert char '" << c << "'" << endl; BOOST_ASSERT(!empty()); if (inMathed()) { - lyx::cap::selClearOrDel(*this); + cap::selClearOrDel(*this); insert(new InsetMathChar(c)); } else { text()->insertChar(*this, c); @@ -682,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); } @@ -696,11 +697,10 @@ void LCursor::insert(InsetBase * inset) } -void LCursor::niceInsert(string const & t) +void LCursor::niceInsert(docstring const & t) { MathArray ar; - // FIXME UNICODE - asArray(lyx::from_utf8(t), ar); + asArray(t, ar); if (ar.size() == 1) niceInsert(ar[0]); else @@ -711,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()) { @@ -721,8 +721,7 @@ void LCursor::niceInsert(MathAtom const & t) pushLeft(*nextInset()); // We may not use niceInsert here (recursion) MathArray ar; - // FIXME UNICODE - asArray(lyx::from_utf8(safe), ar); + asArray(safe, ar); insert(ar); } } @@ -732,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(); } @@ -743,7 +742,7 @@ bool LCursor::backspace() autocorrect() = false; if (selection()) { - lyx::cap::selDel(*this); + cap::selDel(*this); return true; } @@ -783,7 +782,7 @@ bool LCursor::erase() return true; if (selection()) { - lyx::cap::selDel(*this); + cap::selDel(*this); return true; } @@ -847,7 +846,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,22 +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; InsetMathNest * const in = inset().asInsetMath()->asNestInset(); - if (in && in->interpret(*this, s)) + 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(); } @@ -881,8 +880,7 @@ void LCursor::handleNest(MathAtom const & a, int c) { //lyxerr << "LCursor::handleNest: " << c << endl; MathAtom t = a; - // FIXME UNICODE - asArray(lyx::from_utf8(lyx::cap::grabAndEraseSelection(*this)), t.nucleus()->cell(c)); + asArray(cap::grabAndEraseSelection(*this), t.nucleus()->cell(c)); insert(t); posLeft(); pushLeft(*nextInset()); @@ -902,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); @@ -970,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); + odocstringstream os; + WriteStream wi(os, false, true); inset().asInsetMath()->write(wi); - lyxerr << endl; + lyxerr << to_utf8(os.str()) << endl; pos() = lastpos(); } } @@ -1076,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) { @@ -1093,7 +1089,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(); @@ -1155,7 +1151,7 @@ docstring LCursor::selectionAsString(bool label) const } if (inMathed()) - return lyx::from_utf8(lyx::cap::grabSelection(*this)); + return cap::grabSelection(*this); return docstring(); } @@ -1164,9 +1160,9 @@ docstring LCursor::selectionAsString(bool label) const string LCursor::currentState() { if (inMathed()) { - std::ostringstream os; + odocstringstream os; info(os); - return os.str(); + return to_utf8(os.str()); } if (inTexted()) @@ -1176,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); } @@ -1214,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); } @@ -1282,3 +1278,6 @@ void LCursor::fixIfBroken() lyxerr << "correcting cursor to level " << depth() << endl; } } + + +} // namespace lyx